From c1f817bfd152796b153511ed2b23f74fe6027b0f Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Fri, 21 Jun 2024 11:36:12 -0300 Subject: [PATCH 001/938] apply eslint recommendations --- .../password-strength-bar.component.ts.ejs | 2 +- .../configuration/configuration.model.ts.ejs | 12 +++--------- .../webapp/app/admin/health/health.model.ts.ejs | 2 +- .../main/webapp/app/admin/logs/log.model.ts.ejs | 2 +- .../blocks/jvm-memory/jvm-memory.component.ts.ejs | 2 +- .../metrics-cache/metrics-cache.component.ts.ejs | 2 +- .../webapp/app/admin/metrics/metrics.model.ts.ejs | 15 ++++++++------- .../service/user-management.service.ts.ejs | 2 +- .../src/main/webapp/app/app.config.ts.ejs | 2 +- .../webapp/app/core/util/alert.service.ts.ejs | 12 ++++++------ .../main/webapp/app/core/util/operators.ts.ejs | 2 +- .../app/core/util/parse-links.service.ts.ejs | 8 ++++---- .../list/_entityFile_.component.ts.ejs | 4 ++-- .../webapp/app/layouts/main/main.component.ts.ejs | 4 ++-- .../app/shared/alert/alert-error.component.ts.ejs | 4 ++-- .../app/shared/alert/alert-error.model.ts.ejs | 2 +- .../app/shared/alert/alert.component.ts.ejs | 2 +- .../webapp/app/shared/filter/filter.model.ts.ejs | 5 ++--- .../language/find-language-from-key.pipe.ts.ejs | 2 +- .../shared/language/translate.directive.ts.ejs | 2 +- .../templates/src/main/webapp/bootstrap.ts.ejs | 2 +- .../angular/templates/src/main/webapp/main.ts.ejs | 2 +- .../angular/templates/webpack/environment.js.ejs | 2 +- .../webpack/webpack.microfrontend.js.ejs | 2 +- 24 files changed, 45 insertions(+), 51 deletions(-) diff --git a/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs index 91db00f57b40..ce474caed7c6 100644 --- a/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs @@ -42,7 +42,7 @@ export default class PasswordStrengthBarComponent { const symbols = regex.test(p); const flags = [lowerLetters, upperLetters, numbers, symbols]; - const passedMatches = flags.filter((isMatchedFlag: boolean) => isMatchedFlag === true).length; + const passedMatches = flags.filter((isMatchedFlag: boolean) => isMatchedFlag).length; force += 2 * p.length + (p.length >= 10 ? 1 : 0); force += passedMatches * 10; diff --git a/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.model.ts.ejs index e88181838a45..1adc30dc05b3 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.model.ts.ejs @@ -20,18 +20,14 @@ export interface ConfigProps { contexts: Contexts; } -export interface Contexts { - [key: string]: Context; -} +export type Contexts = Record; export interface Context { beans: Beans; parentId?: any; } -export interface Beans { - [key: string]: Bean; -} +export type Beans = Record; export interface Bean { prefix: string; @@ -48,9 +44,7 @@ export interface PropertySource { properties: Properties; } -export interface Properties { - [key: string]: Property; -} +export type Properties = Record; export interface Property { value: string; diff --git a/generators/angular/templates/src/main/webapp/app/admin/health/health.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/health/health.model.ts.ejs index d26c7acde3a6..e9e3b6fd6027 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/health/health.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/health/health.model.ts.ejs @@ -63,5 +63,5 @@ export interface Health { export interface HealthDetails { status: HealthStatus; - details?: { [key: string]: unknown }; + details?: Record; } diff --git a/generators/angular/templates/src/main/webapp/app/admin/logs/log.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/logs/log.model.ts.ejs index 873b5db2982e..533390efd4b8 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/logs/log.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/logs/log.model.ts.ejs @@ -25,7 +25,7 @@ export interface Logger { export interface LoggersResponse { levels: Level[]; - loggers: { [key: string]: Logger }; + loggers: Record; } export class Log { diff --git a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs index 5209cf859e66..ddb7d233c8e3 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs @@ -31,7 +31,7 @@ export class JvmMemoryComponent { /** * object containing all jvm memory metrics */ - jvmMemoryMetrics = input<{ [key: string]: JvmMetrics }>(); + jvmMemoryMetrics = input>(); /** * boolean field saying if the metrics are in the process of being updated diff --git a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs index d88412c0859d..f9d78f8378bc 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs @@ -33,7 +33,7 @@ export class MetricsCacheComponent { /** * object containing all cache related metrics */ - cacheMetrics = input<{ [key: string]: CacheMetrics }>(); + cacheMetrics = input>(); /** * boolean field saying if the metrics are in the process of being updated diff --git a/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.model.ts.ejs index bfba0712d3c8..fe726a74df07 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.model.ts.ejs @@ -17,10 +17,10 @@ limitations under the License. -%> export interface Metrics { - jvm: { [key: string]: JvmMetrics }; + jvm: Record; databases: Databases; 'http.server.requests': HttpServerRequests; - cache: { [key: string]: CacheMetrics }; + cache: Record; garbageCollector: GarbageCollector; services: Services; processMetrics: ProcessMetrics; @@ -65,7 +65,7 @@ export interface HttpServerRequests { all: { count: number; }; - percode: { [key: string]: MaxMeanCount }; + percode: Record; } export interface MaxMeanCount { @@ -92,11 +92,12 @@ export interface GarbageCollector { classesUnloaded: number; } -export interface Services { - [key: string]: { +export type Services = Record< + string, + { [key in HttpMethod]?: MaxMeanCount; - }; -} + } +>; export enum HttpMethod { Post = 'POST', diff --git a/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.ts.ejs index 5157587dac86..6e7071c72f26 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.ts.ejs @@ -62,7 +62,7 @@ export class UserManagementService { authorities(): Observable { <%_ if (generateBuiltInAuthorityEntity) { _%> return this.http - .get>(this.applicationConfigService.getEndpointFor('api/authorities')) + .get<{ name: string }[]>(this.applicationConfigService.getEndpointFor('api/authorities')) .pipe(map(authorities => authorities.map(a => a.name))); <%_ } else { _%> return of([Authority.ADMIN, Authority.USER]); diff --git a/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs b/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs index c818ec74cf74..3c6895468ac4 100644 --- a/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs @@ -36,7 +36,7 @@ import routes from './app.routes'; import { NgbDateDayjsAdapter } from './config/datepicker-adapter'; import { AppPageTitleStrategy } from './app-page-title-strategy'; -const routerFeatures: Array = [ +const routerFeatures: RouterFeatures[] = [ withComponentInputBinding(), withNavigationErrorHandler((e: NavigationError) => { const router = inject(Router); diff --git a/generators/angular/templates/src/main/webapp/app/core/util/alert.service.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/util/alert.service.ts.ejs index 3496bb4363bd..b8e0c616a808 100644 --- a/generators/angular/templates/src/main/webapp/app/core/util/alert.service.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/util/alert.service.ts.ejs @@ -27,12 +27,12 @@ import { translationNotFoundMessage } from 'app/config/translation.config'; export type AlertType = 'success' | 'danger' | 'warning' | 'info'; export interface Alert { - id?: number; + id: number; type: AlertType; message?: string; <%_ if (enableTranslation) { _%> translationKey?: string; - translationParams?: { [key: string]: unknown }; + translationParams?: Record; <%_ } _%> timeout?: number; toast?: boolean; @@ -75,8 +75,8 @@ export class AlertService { * Else adding `alert` to `extAlerts`. * @returns Added alert */ - addAlert(alert: Alert, extAlerts?: Alert[]): Alert { - alert.id = this.alertId++; + addAlert(alertToAdd: Omit, extAlerts?: Alert[]): Alert { + const alert: Alert = { ...alertToAdd, id: this.alertId++ }; <%_ if (enableTranslation) { _%> if (alert.translationKey) { @@ -94,13 +94,13 @@ export class AlertService { alert.timeout = alert.timeout ?? this.timeout; alert.toast = alert.toast ?? this.toast; alert.position = alert.position ?? this.position; - alert.close = (alertsArray: Alert[]) => this.closeAlert(alert.id!, alertsArray); + alert.close = (alertsArray: Alert[]) => this.closeAlert(alert.id, alertsArray); (extAlerts ?? this.alerts).push(alert); if (alert.timeout > 0) { setTimeout(() => { - this.closeAlert(alert.id!, extAlerts ?? this.alerts); + this.closeAlert(alert.id, extAlerts ?? this.alerts); }, alert.timeout); } diff --git a/generators/angular/templates/src/main/webapp/app/core/util/operators.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/util/operators.ts.ejs index e6095754fff9..ffc2eb8ffbac 100644 --- a/generators/angular/templates/src/main/webapp/app/core/util/operators.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/util/operators.ts.ejs @@ -20,7 +20,7 @@ * Function used to workaround https://github.com/microsoft/TypeScript/issues/16069 * es2019 alternative `const filteredArr = myArr.flatMap((x) => x ? x : []);` */ -export function isPresent(t: T | undefined | null | void): t is T { +export function isPresent(t: T | undefined | null): t is T { return t !== undefined && t !== null; } diff --git a/generators/angular/templates/src/main/webapp/app/core/util/parse-links.service.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/util/parse-links.service.ts.ejs index 74ee8f6784ff..92c410e4a181 100644 --- a/generators/angular/templates/src/main/webapp/app/core/util/parse-links.service.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/util/parse-links.service.ts.ejs @@ -28,7 +28,7 @@ export class ParseLinks { /** * Method to parse the links */ - parseAll(header: string): { [key: string]: { [key: string]: string | undefined } | undefined } { + parseAll(header: string): Record | undefined> { if (header.length === 0) { throw new Error('input must not be of zero length'); } @@ -46,7 +46,7 @@ export class ParseLinks { } const url: string = section[0].replace(/<(.*)>/, '$1').trim(); // NOSONAR - const queryString: { [key: string]: string } = {}; + const queryString: Record = {}; url.replace(/([^?=&]+)(=([^&]*))?/g, (_$0: string, $1: string | undefined, _$2: string | undefined, $3: string | undefined) => { if ($1 !== undefined && $3 !== undefined) { @@ -64,9 +64,9 @@ export class ParseLinks { /** * Method to parse the links */ - parse(header: string): { [key: string]: number } { + parse(header: string): Record { const sections = this.parseAll(header); - const links: { [key: string]: number } = {}; + const links: Record = {}; for (const [name, queryParams] of Object.entries(sections)) { if (queryParams?.page !== undefined) { links[name] = parseInt(queryParams.page, 10); diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs index 181dff2d5f9d..df9cc6783555 100644 --- a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs @@ -132,7 +132,7 @@ export class <%= componentName %> implements OnInit { <%- include('pagination-template'); -%> <%_ } else if (paginationInfiniteScroll) { _%> itemsPerPage = ITEMS_PER_PAGE; - links: WritableSignal<{ [key: string]: undefined | { [key: string]: string | undefined } }> = signal({}); + links: WritableSignal>> = signal({}); hasMorePage = computed(() => !!this.links().next); isFirstFetch = computed(() => Object.keys(this.links()).length === 0); <%_ } _%> @@ -302,7 +302,7 @@ export class <%= componentName %> implements OnInit { if (data) { for (const d of data) { <%_ if (primaryKey) { _%> - if (<%= entityInstancePlural %>New.map(op => op.<%= primaryKey.name %>).indexOf(d.<%= primaryKey.name %>) === -1) { + if (<%= entityInstancePlural %>New.some(op => op.<%= primaryKey.name %> === d.<%= primaryKey.name %>)) { <%_ } _%> <%= entityInstancePlural %>New.push(d); <%_ if (primaryKey) { _%> diff --git a/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.ts.ejs index efbc28b6aa6f..eed93fb3b81f 100644 --- a/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.ts.ejs @@ -53,12 +53,12 @@ export default class MainComponent implements OnInit { private translateService = inject(TranslateService); private rootRenderer = inject(RendererFactory2); <%_ } _%> +<%_ if (enableTranslation) { _%> constructor() { -<%_ if (enableTranslation) { _%> this.renderer = this.rootRenderer.createRenderer(document.querySelector('html'), null); -<%_ } _%> } +<%_ } _%> ngOnInit(): void { // try to log in automatically diff --git a/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs index 3625db8db419..c1cc87e9f88a 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs @@ -57,7 +57,7 @@ export class AlertErrorComponent implements OnDestroy { }); } - setClasses(alert: Alert): { [key: string]: boolean } { + setClasses(alert: Alert): Record { const classes = { 'jhi-toast': Boolean(alert.toast) }; if (alert.position) { return { ...classes, [alert.position]: true }; @@ -74,7 +74,7 @@ export class AlertErrorComponent implements OnDestroy { alert.close?.(this.alerts()); } - private addErrorAlert(message?: string<% if (enableTranslation) { %>, translationKey?: string, translationParams?: { [key: string]: unknown }<% } %>): void { + private addErrorAlert(message?: string<% if (enableTranslation) { %>, translationKey?: string, translationParams?: Record<% } %>): void { this.alertService.addAlert({ type: 'danger', message<% if (enableTranslation) { %>, translationKey, translationParams<% } %> }, this.alerts()); } diff --git a/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.model.ts.ejs index 1ee73d99eb50..18e1415dc287 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.model.ts.ejs @@ -21,7 +21,7 @@ export class AlertError { public message: string, <%_ if (enableTranslation) { _%> public key?: string, - public params?: { [key: string]: unknown } + public params?: Record <%_ } _%> ) {} } diff --git a/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.ts.ejs index 910bb025ef6d..efe5cbd3883f 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.ts.ejs @@ -37,7 +37,7 @@ export class AlertComponent implements OnInit, OnDestroy { this.alerts.set(this.alertService.get()); } - setClasses(alert: Alert): { [key: string]: boolean } { + setClasses(alert: Alert): Record { const classes = { 'jhi-toast': Boolean(alert.toast) }; if (alert.position) { return { ...classes, [alert.position]: true }; diff --git a/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs index 794a0c096724..fad713d02817 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs @@ -67,7 +67,7 @@ export class FilterOption implements IFilterOption { } export class FilterOptions implements IFilterOptions { - readonly filterChanges: Subject = new Subject(); + readonly filterChanges = new Subject(); private _filterOptions: FilterOption[]; constructor(filterOptions: FilterOption[] = []) { @@ -146,8 +146,7 @@ export class FilterOptions implements IFilterOptions { } protected getFilterOptionByName(name: string, add: true): FilterOption; - protected getFilterOptionByName(name: string, add: false): FilterOption | null; - protected getFilterOptionByName(name: string): FilterOption | null; + protected getFilterOptionByName(name: string, add?: false): FilterOption | null; protected getFilterOptionByName(name: string, add = false): FilterOption | null { const addOption = (option: FilterOption): FilterOption => { this._filterOptions.push(option); diff --git a/generators/angular/templates/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts.ejs index f5889aaa620e..df041844366c 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts.ejs @@ -23,7 +23,7 @@ import { Pipe, PipeTransform } from '@angular/core'; name: 'findLanguageFromKey', }) export default class FindLanguageFromKeyPipe implements PipeTransform { - private readonly languages: { [key: string]: { name: string; rtl?: boolean } } = { + private readonly languages: Record = { // jhipster-needle-i18n-language-key-pipe - JHipster will add/remove languages in this object }; diff --git a/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.ts.ejs index 1929b205b604..7d8478cb282f 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.ts.ejs @@ -32,7 +32,7 @@ import { translationNotFoundMessage } from 'app/config/translation.config'; }) export default class TranslateDirective implements OnChanges, OnInit, OnDestroy { @Input() <%= jhiPrefix %>Translate!: string; - @Input() translateValues?: { [key: string]: unknown }; + @Input() translateValues?: Record; private readonly directiveDestroyed = new Subject(); diff --git a/generators/angular/templates/src/main/webapp/bootstrap.ts.ejs b/generators/angular/templates/src/main/webapp/bootstrap.ts.ejs index e0ad4c857ef8..ca38b57dba3a 100644 --- a/generators/angular/templates/src/main/webapp/bootstrap.ts.ejs +++ b/generators/angular/templates/src/main/webapp/bootstrap.ts.ejs @@ -31,4 +31,4 @@ if (!DEBUG_INFO_ENABLED) { bootstrapApplication(AppComponent, appConfig) // eslint-disable-next-line no-console .then(() => console.log('Application started')) - .catch(err => console.error(err)); + .catch((err: unknown) => console.error(err)); diff --git a/generators/angular/templates/src/main/webapp/main.ts.ejs b/generators/angular/templates/src/main/webapp/main.ts.ejs index 9f14222e4993..596014f3fbd1 100644 --- a/generators/angular/templates/src/main/webapp/main.ts.ejs +++ b/generators/angular/templates/src/main/webapp/main.ts.ejs @@ -16,4 +16,4 @@ See the License for the specific language governing permissions and limitations under the License. -%> -import('./bootstrap').catch(err => console.error(err)); +import('./bootstrap').catch((err: unknown) => console.error(err)); diff --git a/generators/angular/templates/webpack/environment.js.ejs b/generators/angular/templates/webpack/environment.js.ejs index d02117767c3e..6536851cb965 100644 --- a/generators/angular/templates/webpack/environment.js.ejs +++ b/generators/angular/templates/webpack/environment.js.ejs @@ -1,6 +1,6 @@ module.exports = { I18N_HASH: 'generated_hash', SERVER_API_URL: '', - __VERSION__: process.env.hasOwnProperty('APP_VERSION') ? process.env.APP_VERSION : 'DEV', + __VERSION__: process.env.APP_VERSION || 'DEV', __DEBUG_INFO_ENABLED__: false, }; diff --git a/generators/angular/templates/webpack/webpack.microfrontend.js.ejs b/generators/angular/templates/webpack/webpack.microfrontend.js.ejs index 58dbf512ecf7..6e552d9d5702 100644 --- a/generators/angular/templates/webpack/webpack.microfrontend.js.ejs +++ b/generators/angular/templates/webpack/webpack.microfrontend.js.ejs @@ -22,7 +22,6 @@ const packageJson = require('../package.json'); const apiVersion = '0.0.1'; const sharedDefaults = { singleton: true, strictVersion: true, requiredVersion: apiVersion }; -const shareAllDefaults = { ...sharedDefaults, requiredVersion: 'auto' } const shareMappings = (...mappings) => Object.fromEntries(mappings.map(map => [map, { ...sharedDefaults, version: apiVersion }])); const shareDependencies = ({ skipList = [] } = {}) => @@ -39,6 +38,7 @@ sharedDependencies = { 'rxjs/operators': sharedDependencies.rxjs, }; +// eslint-disable-next-line no-unused-vars module.exports = (config, options, targetOptions) => { return withModuleFederationPlugin({ name: '<%= lowercaseBaseName %>', From 23b1034f6482871f726bfc7dd1ac935bbf9d48f7 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Thu, 20 Jun 2024 17:27:13 -0300 Subject: [PATCH 002/938] migrate to eslint flat config --- .github/dependabot.yml | 3 - .../__snapshots__/generator.spec.ts.snap | 57 +++---- generators/angular/files-angular.js | 2 +- generators/angular/generator.ts | 23 ++- generators/angular/resources/package.json | 6 +- .../angular/templates/.eslintrc.json.ejs | 123 --------------- .../eslint.config.js.jhi.angular.ejs | 143 ++++++++++++++++++ generators/angular/templates/package.json.ejs | 9 +- .../templates/webpack/webpack.custom.js.ejs | 7 +- .../app/__snapshots__/generator.spec.ts.snap | 12 ++ generators/client/files-common.js | 2 +- generators/workspaces/generator.js | 2 +- 12 files changed, 208 insertions(+), 181 deletions(-) delete mode 100644 generators/angular/templates/.eslintrc.json.ejs create mode 100644 generators/angular/templates/eslint.config.js.jhi.angular.ejs diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6a033ebc710f..bc82c55cb9d4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -83,9 +83,6 @@ updates: - 'ngx-infinite-scroll' - 'typescript' - 'zone.js' - angular-eslint: - patterns: - - '@angular-eslint/*' fortawesome: patterns: - '@fortawesome/fontawesome-svg-core' diff --git a/generators/angular/__snapshots__/generator.spec.ts.snap b/generators/angular/__snapshots__/generator.spec.ts.snap index bd1f351ff540..6ccf39207182 100644 --- a/generators/angular/__snapshots__/generator.spec.ts.snap +++ b/generators/angular/__snapshots__/generator.spec.ts.snap @@ -17,13 +17,10 @@ exports[`generator - angular gateway-jwt-skipUserManagement(true)-withAdminUi(fa ".yo-rc.json": { "stateCleared": "modified", }, - "clientRoot/.eslintignore": { + "clientRoot/angular.json": { "stateCleared": "modified", }, - "clientRoot/.eslintrc.json": { - "stateCleared": "modified", - }, - "clientRoot/angular.json": { + "clientRoot/eslint.config.mjs": { "stateCleared": "modified", }, "clientRoot/jest.conf.js": { @@ -700,13 +697,10 @@ exports[`generator - angular gateway-oauth2-withAdminUi(true)-skipJhipsterDepend ".yo-rc.json": { "stateCleared": "modified", }, - "clientRoot/.eslintignore": { - "stateCleared": "modified", - }, - "clientRoot/.eslintrc.json": { + "clientRoot/angular.json": { "stateCleared": "modified", }, - "clientRoot/angular.json": { + "clientRoot/eslint.config.mjs": { "stateCleared": "modified", }, "clientRoot/jest.conf.js": { @@ -1605,13 +1599,10 @@ exports[`generator - angular microservice-jwt-skipUserManagement(false)-withAdmi ".yo-rc.json": { "stateCleared": "modified", }, - "clientRoot/.eslintignore": { - "stateCleared": "modified", - }, - "clientRoot/.eslintrc.json": { + "clientRoot/angular.json": { "stateCleared": "modified", }, - "clientRoot/angular.json": { + "clientRoot/eslint.config.mjs": { "stateCleared": "modified", }, "clientRoot/jest.conf.js": { @@ -2252,12 +2243,6 @@ exports[`generator - angular microservice-jwt-skipUserManagement(false)-withAdmi exports[`generator - angular microservice-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(false) should match generated files snapshot 1`] = ` { - ".eslintignore": { - "stateCleared": "modified", - }, - ".eslintrc.json": { - "stateCleared": "modified", - }, ".jhipster/EntityWithCustomId.json": { "stateCleared": "modified", }, @@ -2276,6 +2261,9 @@ exports[`generator - angular microservice-oauth2-withAdminUi(true)-skipJhipsterD "angular.json": { "stateCleared": "modified", }, + "eslint.config.mjs": { + "stateCleared": "modified", + }, "jest.conf.js": { "stateCleared": "modified", }, @@ -2923,12 +2911,6 @@ exports[`generator - angular microservice-oauth2-withAdminUi(true)-skipJhipsterD exports[`generator - angular monolith-jwt-skipUserManagement(false)-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(true) should match generated files snapshot 1`] = ` { - ".eslintignore": { - "stateCleared": "modified", - }, - ".eslintrc.json": { - "stateCleared": "modified", - }, ".jhipster/EntityWithCustomId.json": { "stateCleared": "modified", }, @@ -2947,6 +2929,9 @@ exports[`generator - angular monolith-jwt-skipUserManagement(false)-withAdminUi( "angular.json": { "stateCleared": "modified", }, + "eslint.config.mjs": { + "stateCleared": "modified", + }, "jest.conf.js": { "stateCleared": "modified", }, @@ -3999,12 +3984,6 @@ exports[`generator - angular monolith-jwt-skipUserManagement(false)-withAdminUi( exports[`generator - angular monolith-oauth2-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-websocket(false) should match generated files snapshot 1`] = ` { - ".eslintignore": { - "stateCleared": "modified", - }, - ".eslintrc.json": { - "stateCleared": "modified", - }, ".jhipster/EntityWithCustomId.json": { "stateCleared": "modified", }, @@ -4023,6 +4002,9 @@ exports[`generator - angular monolith-oauth2-withAdminUi(false)-skipJhipsterDepe "angular.json": { "stateCleared": "modified", }, + "eslint.config.mjs": { + "stateCleared": "modified", + }, "jest.conf.js": { "stateCleared": "modified", }, @@ -4655,12 +4637,6 @@ exports[`generator - angular monolith-oauth2-withAdminUi(false)-skipJhipsterDepe exports[`generator - angular monolith-session-skipUserManagement(true)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-websocket(true) should match generated files snapshot 1`] = ` { - ".eslintignore": { - "stateCleared": "modified", - }, - ".eslintrc.json": { - "stateCleared": "modified", - }, ".jhipster/EntityWithCustomId.json": { "stateCleared": "modified", }, @@ -4679,6 +4655,9 @@ exports[`generator - angular monolith-session-skipUserManagement(true)-withAdmin "angular.json": { "stateCleared": "modified", }, + "eslint.config.mjs": { + "stateCleared": "modified", + }, "jest.conf.js": { "stateCleared": "modified", }, diff --git a/generators/angular/files-angular.js b/generators/angular/files-angular.js index 838a4d2dfb4d..cd979262ec08 100644 --- a/generators/angular/files-angular.js +++ b/generators/angular/files-angular.js @@ -28,8 +28,8 @@ export const files = { common: [ clientRootTemplatesBlock({ templates: [ - '.eslintrc.json', 'angular.json', + { sourceFile: 'eslint.config.js.jhi.angular', destinationFile: ctx => `${ctx.eslintConfigFile}.jhi.angular` }, 'ngsw-config.json', 'package.json', 'tsconfig.json', diff --git a/generators/angular/generator.ts b/generators/angular/generator.ts index e29716bd8075..ddf2fdd3c917 100644 --- a/generators/angular/generator.ts +++ b/generators/angular/generator.ts @@ -33,6 +33,7 @@ import { } from '../client/support/index.js'; import type { CommonClientServerApplication } from '../base-application/types.js'; import { createNeedleCallback, mutateData } from '../base/support/index.js'; +import { writeEslintClientRootConfigFile } from '../javascript/generators/eslint/support/tasks.js'; import { writeEntitiesFiles, postWriteEntitiesFiles, cleanupEntitiesFiles } from './entity-files-angular.js'; import { writeFiles } from './files-angular.js'; import cleanupOldFilesTask from './cleanup.js'; @@ -72,6 +73,12 @@ export default class AngularGenerator extends BaseApplicationGenerator { this.fetchFromInstalledJHipster(GENERATOR_ANGULAR, 'resources', 'package.json'), ); }, + applicationDefauts({ applicationDefaults }) { + applicationDefaults({ + __override__: true, + typescriptEslint: true, + }); + }, }); } @@ -81,9 +88,13 @@ export default class AngularGenerator extends BaseApplicationGenerator { get preparing() { return this.asPreparingTaskGroup({ - prepareForTemplates({ application }) { - application.webappEnumerationsDir = `${application.clientSrcDir}app/entities/enumerations/`; - application.angularLocaleId = application.nativeLanguageDefinition.angularLocale ?? defaultLanguage.angularLocale!; + applicationDefauts({ applicationDefaults }) { + applicationDefaults({ + __override__: true, + eslintConfigFile: app => `eslint.config.${app.packageJsonType === 'module' ? 'js' : 'mjs'}`, + webappEnumerationsDir: app => `${app.clientSrcDir}app/entities/enumerations/`, + angularLocaleId: app => app.nativeLanguageDefinition.angularLocale ?? defaultLanguage.angularLocale, + }); }, addNeedles({ source, application }) { source.addEntitiesToClient = param => { @@ -222,7 +233,13 @@ export default class AngularGenerator extends BaseApplicationGenerator { get writing() { return this.asWritingTaskGroup({ + cleanup({ control }) { + control.cleanupFiles({ + '8.6.1': ['.eslintrc.json', '.eslintignore'], + }); + }, cleanupOldFilesTask, + writeEslintClientRootConfigFile, writeFiles, }); } diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 8ecfd707a92f..62dbb1d74734 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -29,14 +29,17 @@ "@types/node": "20.11.25", "@types/sockjs-client": "1.5.4", "@typescript-eslint/eslint-plugin": "7.16.1", + "angular-eslint": "18.1.0", "browser-sync": "3.0.2", "browser-sync-webpack-plugin": "2.3.0", "buffer": "6.0.3", "copy-webpack-plugin": "12.0.2", - "eslint": "8.57.0", + "eslint": "9.7.0", "eslint-config-prettier": "9.1.0", + "eslint-plugin-prettier": "5.2.1", "eslint-webpack-plugin": "4.2.0", "folder-hash": "4.0.4", + "globals": "15.8.0", "jest": "29.7.0", "jest-date-mock": "1.0.10", "jest-junit": "16.0.0", @@ -47,6 +50,7 @@ "rimraf": "5.0.8", "ts-jest": "29.2.2", "typescript": "5.4.5", + "typescript-eslint": "8.0.0-alpha.44", "webpack": "5.93.0", "webpack-bundle-analyzer": "4.10.2", "webpack-merge": "6.0.1", diff --git a/generators/angular/templates/.eslintrc.json.ejs b/generators/angular/templates/.eslintrc.json.ejs deleted file mode 100644 index 26c41af20842..000000000000 --- a/generators/angular/templates/.eslintrc.json.ejs +++ /dev/null @@ -1,123 +0,0 @@ -<%# - Copyright 2013-2024 the original author or authors from the JHipster project. - - This file is part of the JHipster project, see https://www.jhipster.tech/ - for more information. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. --%> -{ - "parser": "@typescript-eslint/parser", - "plugins": ["@angular-eslint/eslint-plugin", "@typescript-eslint"], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@typescript-eslint/recommended-requiring-type-checking", - "plugin:@angular-eslint/recommended", - "prettier", - "eslint-config-prettier" - ], - "env": { - "browser": true, - "es6": true, - "commonjs": true - }, - "parserOptions": { - "ecmaVersion": 2018, - "sourceType": "module", - "project": [ - "./tsconfig.app.json", -<%_ if (cypressTests) { _%> - "./<%= this.relativeDir(clientRootDir, cypressDir) %>tsconfig.json", -<%_ } _%> - "./tsconfig.spec.json" - ] - }, - "rules": { - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "<%= jhiPrefixDashed %>", - "style": "kebab-case" - } - ], - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "<%= jhiPrefix %>", - "style": "camelCase" - } - ], - "@angular-eslint/relative-url-prefix": "error", - "@typescript-eslint/ban-types": [ - "error", - { - "extendDefaults": true, - "types": { - "{}": false - } - } - ], - "@typescript-eslint/explicit-function-return-type": ["error", { "allowExpressions": true }], - "@typescript-eslint/explicit-module-boundary-types": "off", - "@typescript-eslint/member-ordering": [ - "error", - { - "default": [ - "public-static-field", - "protected-static-field", - "private-static-field", - "public-instance-field", - "protected-instance-field", - "private-instance-field", - "constructor", - "public-static-method", - "protected-static-method", - "private-static-method", - "public-instance-method", - "protected-instance-method", - "private-instance-method" - ] - } - ], - "@typescript-eslint/no-explicit-any": "off", - "@typescript-eslint/no-floating-promises": "off", - "@typescript-eslint/no-non-null-assertion": "off", - "@typescript-eslint/no-shadow": ["error"], - "@typescript-eslint/no-unnecessary-condition": "error", - "@typescript-eslint/no-unsafe-argument": "off", - "@typescript-eslint/no-unsafe-assignment": "off", - "@typescript-eslint/no-unsafe-call": "off", - "@typescript-eslint/no-unsafe-member-access": "off", - "@typescript-eslint/no-unused-vars": "off", - "@typescript-eslint/prefer-nullish-coalescing": "error", - "@typescript-eslint/prefer-optional-chain": "error", - "@typescript-eslint/unbound-method": "off", - "arrow-body-style": "error", - "curly": "error", - "eqeqeq": ["error", "always", { "null": "ignore" }], - "guard-for-in": "error", - "no-bitwise": "error", - "no-caller": "error", - "no-console": ["error", { "allow": ["warn", "error"] }], - "no-eval": "error", - "no-labels": "error", - "no-new": "error", - "no-new-wrappers": "error", - "object-shorthand": ["error", "always", { "avoidExplicitReturnArrows": true }], - "radix": "error", - "spaced-comment": ["warn", "always"] - } -} diff --git a/generators/angular/templates/eslint.config.js.jhi.angular.ejs b/generators/angular/templates/eslint.config.js.jhi.angular.ejs new file mode 100644 index 000000000000..d2b94cdbae34 --- /dev/null +++ b/generators/angular/templates/eslint.config.js.jhi.angular.ejs @@ -0,0 +1,143 @@ +<%# + Copyright 2013-2024 the original author or authors from the JHipster project. + + This file is part of the JHipster project, see https://www.jhipster.tech/ + for more information. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> +<&_ if (fragment.importsSection) { -&> +import eslint from '@eslint/js'; +// For a detailed explanation, visit: https://github.com/angular-eslint/angular-eslint/blob/main/docs/CONFIGURING_FLAT_CONFIG.md +import angular from 'angular-eslint'; +<&_ } -&> +<&_ if (fragment.configSection) { -&> + { ignores: ['<%- this.relativeDir(clientRootDir, clientDistDir) %>', '<%- temporaryDir %>'] }, + eslint.configs.recommended, + { + files: ['**/*.{js,cjs,mjs}'], + rules: { + 'no-unused-vars': ['error', { argsIgnorePattern: '^_' }], + }, + }, + { + files: ['<%- this.relativeDir(clientRootDir, clientSrcDir) %>**/*.ts'], + extends: [...tseslint.configs.strictTypeChecked, ...tseslint.configs.stylistic, ...angular.configs.tsRecommended], + languageOptions: { + globals: { + ...globals.browser, + }, + parserOptions: { + project: ['./tsconfig.app.json', './tsconfig.spec.json'], + }, + }, + processor: angular.processInlineTemplates, + rules: { + '@angular-eslint/component-selector': [ + 'error', + { + type: 'element', + prefix: '<%= jhiPrefixDashed %>', + style: 'kebab-case', + }, + ], + '@angular-eslint/directive-selector': [ + 'error', + { + type: 'attribute', + prefix: '<%= jhiPrefix %>', + style: 'camelCase', + }, + ], + '@angular-eslint/relative-url-prefix': 'error', + '@typescript-eslint/ban-types': [ + 'error', + { + extendDefaults: true, + types: { + '{}': false, + }, + }, + ], + '@typescript-eslint/consistent-type-definitions': 'off', + '@typescript-eslint/explicit-function-return-type': ['error', { allowExpressions: true }], + '@typescript-eslint/explicit-module-boundary-types': 'off', + '@typescript-eslint/member-ordering': [ + 'error', + { + default: [ + 'public-static-field', + 'protected-static-field', + 'private-static-field', + 'public-instance-field', + 'protected-instance-field', + 'private-instance-field', + 'constructor', + 'public-static-method', + 'protected-static-method', + 'private-static-method', + 'public-instance-method', + 'protected-instance-method', + 'private-instance-method', + ], + }, + ], + '@typescript-eslint/no-confusing-void-expression': 'off', + '@typescript-eslint/no-explicit-any': 'off', + '@typescript-eslint/no-extraneous-class': 'off', + '@typescript-eslint/no-floating-promises': 'off', + '@typescript-eslint/no-non-null-assertion': 'off', + '@typescript-eslint/no-shadow': ['error'], + '@typescript-eslint/no-unnecessary-condition': 'error', + '@typescript-eslint/no-unsafe-argument': 'off', + '@typescript-eslint/no-unsafe-assignment': 'off', + '@typescript-eslint/no-unsafe-call': 'off', + '@typescript-eslint/no-unsafe-member-access': 'off', + '@typescript-eslint/no-unused-vars': 'off', + '@typescript-eslint/prefer-nullish-coalescing': 'error', + '@typescript-eslint/prefer-optional-chain': 'error', + '@typescript-eslint/restrict-template-expressions': ['error', { allowNumber: true }], + '@typescript-eslint/unbound-method': 'off', + 'arrow-body-style': 'error', + curly: 'error', + eqeqeq: ['error', 'always', { null: 'ignore' }], + 'guard-for-in': 'error', + 'no-bitwise': 'error', + 'no-caller': 'error', + 'no-console': ['error', { allow: ['warn', 'error'] }], + 'no-eval': 'error', + 'no-labels': 'error', + 'no-new': 'error', + 'no-new-wrappers': 'error', + 'object-shorthand': ['error', 'always', { avoidExplicitReturnArrows: true }], + radix: 'error', + 'spaced-comment': ['warn', 'always'], + }, + }, + { + files: ['<%- this.relativeDir(clientRootDir, clientSrcDir) %>**/*.spec.ts'], + rules: { + '@typescript-eslint/no-empty-function': 'off', + }, + }, + { + files: ['**/*.html'], + extends: [...angular.configs.templateRecommended, ...angular.configs.templateAccessibility], + rules: {}, + }, + { + // Html templates requires some work + ignores: ['**/*.html'], + extends: [prettier], + }, +<&_ } -&> diff --git a/generators/angular/templates/package.json.ejs b/generators/angular/templates/package.json.ejs index 1af61a7c84a2..e18b8ae8aa3c 100644 --- a/generators/angular/templates/package.json.ejs +++ b/generators/angular/templates/package.json.ejs @@ -77,18 +77,18 @@ "@angular-builders/custom-webpack": "<%= nodeDependencies['@angular-builders/custom-webpack'] %>", "@angular-builders/jest": "<%= nodeDependencies['@angular-builders/jest'] %>", "@angular-devkit/build-angular": "<%= nodeDependencies['@angular/cli'] %>", - "@angular-eslint/eslint-plugin": "<%= nodeDependencies['@angular-eslint/eslint-plugin'] %>", "@types/jest": "<%= nodeDependencies['@types/jest'] %>", "@types/node": "<%= nodeDependencies['@types/node'] %>", - "@typescript-eslint/eslint-plugin": "<%= nodeDependencies['@typescript-eslint/eslint-plugin'] %>", - "@typescript-eslint/parser": "<%= nodeDependencies['@typescript-eslint/eslint-plugin'] %>", + "angular-eslint": "<%= nodeDependencies['angular-eslint'] %>", "browser-sync": "<%= nodeDependencies['browser-sync'] %>", "browser-sync-webpack-plugin": "<%= nodeDependencies['browser-sync-webpack-plugin'] %>", "buffer": "<%= nodeDependencies['buffer'] %>", "copy-webpack-plugin": "<%= nodeDependencies['copy-webpack-plugin'] %>", "eslint": "<%= nodeDependencies['eslint'] %>", "eslint-config-prettier": "<%= nodeDependencies['eslint-config-prettier'] %>", + "eslint-plugin-prettier": "<%= nodeDependencies['eslint-plugin-prettier'] %>", "eslint-webpack-plugin": "<%= nodeDependencies['eslint-webpack-plugin'] %>", + "globals": "<%= nodeDependencies.globals %>", "jest": "<%= nodeDependencies['jest'] %>", "jest-environment-jsdom": "<%= nodeDependencies['jest'] %>", "jest-preset-angular": "<%= nodeDependencies['jest-preset-angular'] %>", @@ -102,6 +102,7 @@ "swagger-ui-dist": "<%= nodeDependencies['swagger-ui-dist'] %>", "ts-jest": "<%= nodeDependencies['ts-jest'] %>", "typescript": "<%= nodeDependencies['typescript'] %>", + "typescript-eslint": "<%= nodeDependencies['typescript-eslint'] %>", "webpack-bundle-analyzer": "<%= nodeDependencies['webpack-bundle-analyzer'] %>", "webpack-merge": "<%= nodeDependencies['webpack-merge'] %>", "webpack-notifier": "<%= nodeDependencies['webpack-notifier'] %>" @@ -119,7 +120,7 @@ "scripts": { "prettier:check": "prettier --check \"{,src/**/,webpack/,.blueprint/**/}*.{<%= prettierExtensions %>}\"", "prettier:format": "prettier --write \"{,src/**/,webpack/,.blueprint/**/}*.{<%= prettierExtensions %>}\"", - "lint": "eslint . --ext .js,.ts", + "lint": "eslint .", "lint:fix": "<%= clientPackageManager %> run lint -- --fix", "cleanup": "rimraf <%= this.relativeDir(clientRootDir, temporaryDir) %>", "clean-www": "rimraf <%= this.relativeDir(clientRootDir, clientDistDir) %>", diff --git a/generators/angular/templates/webpack/webpack.custom.js.ejs b/generators/angular/templates/webpack/webpack.custom.js.ejs index a8051fa7f65a..61ba77fc332c 100644 --- a/generators/angular/templates/webpack/webpack.custom.js.ejs +++ b/generators/angular/templates/webpack/webpack.custom.js.ejs @@ -48,11 +48,8 @@ module.exports = async (config, options, targetOptions) => { if (config.mode === 'development') { config.plugins.push( new ESLintPlugin({ - baseConfig: { - parserOptions: { - project: ['../tsconfig.app.json'], - }, - }, + configType: 'flat', + extensions: ['ts', 'js', 'html'], }), new WebpackNotifierPlugin({ title: '<%= humanizedBaseName %>', diff --git a/generators/app/__snapshots__/generator.spec.ts.snap b/generators/app/__snapshots__/generator.spec.ts.snap index f97a4a996e3f..441f998a49e0 100644 --- a/generators/app/__snapshots__/generator.spec.ts.snap +++ b/generators/app/__snapshots__/generator.spec.ts.snap @@ -450,6 +450,7 @@ exports[`generator - app with default config should match snapshot 1`] = ` "com.mycompany.myapp", ], "entitySuffix": "", + "eslintConfigFile": "eslint.config.mjs", "fakerSeed": undefined, "feignClient": undefined, "fromInit": undefined, @@ -627,6 +628,7 @@ exports[`generator - app with default config should match snapshot 1`] = ` "@types/node": "TYPES_NODE_VERSION", "@types/sockjs-client": "TYPES_SOCKJS_CLIENT_VERSION", "@typescript-eslint/eslint-plugin": "TYPESCRIPT_ESLINT_ESLINT_PLUGIN_VERSION", + "angular-eslint": "ANGULAR_ESLINT_VERSION", "babel-loader": "BABEL_LOADER_VERSION", "babel-plugin-istanbul": "BABEL_PLUGIN_ISTANBUL_VERSION", "bootstrap": "BOOTSTRAP_VERSION", @@ -642,8 +644,10 @@ exports[`generator - app with default config should match snapshot 1`] = ` "eslint": "ESLINT_VERSION", "eslint-config-prettier": "ESLINT_CONFIG_PRETTIER_VERSION", "eslint-plugin-cypress": "ESLINT_PLUGIN_CYPRESS_VERSION", + "eslint-plugin-prettier": "ESLINT_PLUGIN_PRETTIER_VERSION", "eslint-webpack-plugin": "ESLINT_WEBPACK_PLUGIN_VERSION", "folder-hash": "FOLDER_HASH_VERSION", + "globals": "GLOBALS_VERSION", "husky": "HUSKY_VERSION", "jest": "JEST_VERSION", "jest-date-mock": "JEST_DATE_MOCK_VERSION", @@ -668,6 +672,7 @@ exports[`generator - app with default config should match snapshot 1`] = ` "ts-jest": "TS_JEST_VERSION", "tslib": "TSLIB_VERSION", "typescript": "TYPESCRIPT_VERSION", + "typescript-eslint": "TYPESCRIPT_ESLINT_VERSION", "wait-on": "WAIT_ON_VERSION", "webpack": "WEBPACK_VERSION", "webpack-bundle-analyzer": "WEBPACK_BUNDLE_ANALYZER_VERSION", @@ -786,6 +791,7 @@ exports[`generator - app with default config should match snapshot 1`] = ` "testJavaDir": "src/test/java/", "testJavaPackageDir": "src/test/java/com/mycompany/myapp/", "testResourceDir": "src/test/resources/", + "typescriptEslint": true, "upperFirstCamelCaseBaseName": "Jhipster", "useNpmWrapper": true, "user": Any, @@ -1060,6 +1066,7 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "com.mycompany.myapp", ], "entitySuffix": "", + "eslintConfigFile": "eslint.config.mjs", "fakerSeed": undefined, "feignClient": undefined, "fromInit": undefined, @@ -1231,6 +1238,7 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "@types/node": "TYPES_NODE_VERSION", "@types/sockjs-client": "TYPES_SOCKJS_CLIENT_VERSION", "@typescript-eslint/eslint-plugin": "TYPESCRIPT_ESLINT_ESLINT_PLUGIN_VERSION", + "angular-eslint": "ANGULAR_ESLINT_VERSION", "babel-loader": "BABEL_LOADER_VERSION", "babel-plugin-istanbul": "BABEL_PLUGIN_ISTANBUL_VERSION", "bootstrap": "BOOTSTRAP_VERSION", @@ -1246,8 +1254,10 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "eslint": "ESLINT_VERSION", "eslint-config-prettier": "ESLINT_CONFIG_PRETTIER_VERSION", "eslint-plugin-cypress": "ESLINT_PLUGIN_CYPRESS_VERSION", + "eslint-plugin-prettier": "ESLINT_PLUGIN_PRETTIER_VERSION", "eslint-webpack-plugin": "ESLINT_WEBPACK_PLUGIN_VERSION", "folder-hash": "FOLDER_HASH_VERSION", + "globals": "GLOBALS_VERSION", "husky": "HUSKY_VERSION", "jest": "JEST_VERSION", "jest-date-mock": "JEST_DATE_MOCK_VERSION", @@ -1272,6 +1282,7 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "ts-jest": "TS_JEST_VERSION", "tslib": "TSLIB_VERSION", "typescript": "TYPESCRIPT_VERSION", + "typescript-eslint": "TYPESCRIPT_ESLINT_VERSION", "wait-on": "WAIT_ON_VERSION", "webpack": "WEBPACK_VERSION", "webpack-bundle-analyzer": "WEBPACK_BUNDLE_ANALYZER_VERSION", @@ -1392,6 +1403,7 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "testJavaDir": "src/test/java/", "testJavaPackageDir": "src/test/java/com/mycompany/myapp/", "testResourceDir": "src/test/resources/", + "typescriptEslint": true, "upperFirstCamelCaseBaseName": "Jhipster", "useNpmWrapper": true, "user": Any, diff --git a/generators/client/files-common.js b/generators/client/files-common.js index c11c3840d31d..28b65e0d90bc 100644 --- a/generators/client/files-common.js +++ b/generators/client/files-common.js @@ -27,7 +27,7 @@ export const files = { templates: ['README.md.jhi.client', '.prettierignore.jhi.client'], }, clientRootTemplatesBlock({ - condition: ctx => !ctx.clientFrameworkReact, + condition: ctx => !ctx.clientFrameworkReact && !ctx.clientFrameworkAngular, templates: ['.eslintignore'], }), clientRootTemplatesBlock({ diff --git a/generators/workspaces/generator.js b/generators/workspaces/generator.js index 10f307d070e1..6603417aab56 100644 --- a/generators/workspaces/generator.js +++ b/generators/workspaces/generator.js @@ -200,8 +200,8 @@ export default class WorkspacesGenerator extends BaseWorkspacesGenerator { rxjs, // Set version to workaround https://github.com/npm/cli/issues/4437 }, overrides: { - webpack: webpackVersion, 'browser-sync': browserSyncVersion, + webpack: webpackVersion, }, }); } From f0c5504b46623ccd446a885b93007d0f1a9805cb Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 18 Jul 2024 13:16:48 -0300 Subject: [PATCH 003/938] workaround processInlineTemplates processor issue --- .../angular/templates/eslint.config.js.jhi.angular.ejs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/generators/angular/templates/eslint.config.js.jhi.angular.ejs b/generators/angular/templates/eslint.config.js.jhi.angular.ejs index d2b94cdbae34..2dd8e3da6fb8 100644 --- a/generators/angular/templates/eslint.config.js.jhi.angular.ejs +++ b/generators/angular/templates/eslint.config.js.jhi.angular.ejs @@ -41,7 +41,13 @@ import angular from 'angular-eslint'; project: ['./tsconfig.app.json', './tsconfig.spec.json'], }, }, - processor: angular.processInlineTemplates, + processor: { + // https://github.com/angular-eslint/angular-eslint/issues/1917 + meta:{ + name:'extract-inline-html', + }, + ...angular.processInlineTemplates, + }, rules: { '@angular-eslint/component-selector': [ 'error', From dfc16d5dee13bcafd66b1aceff1acb39870deb66 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 18 Jul 2024 13:17:01 -0300 Subject: [PATCH 004/938] drop ban-types rule and disable no-empty-object-type rule --- .../angular/templates/eslint.config.js.jhi.angular.ejs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/generators/angular/templates/eslint.config.js.jhi.angular.ejs b/generators/angular/templates/eslint.config.js.jhi.angular.ejs index 2dd8e3da6fb8..a8040493294f 100644 --- a/generators/angular/templates/eslint.config.js.jhi.angular.ejs +++ b/generators/angular/templates/eslint.config.js.jhi.angular.ejs @@ -66,15 +66,6 @@ import angular from 'angular-eslint'; }, ], '@angular-eslint/relative-url-prefix': 'error', - '@typescript-eslint/ban-types': [ - 'error', - { - extendDefaults: true, - types: { - '{}': false, - }, - }, - ], '@typescript-eslint/consistent-type-definitions': 'off', '@typescript-eslint/explicit-function-return-type': ['error', { allowExpressions: true }], '@typescript-eslint/explicit-module-boundary-types': 'off', @@ -99,6 +90,7 @@ import angular from 'angular-eslint'; }, ], '@typescript-eslint/no-confusing-void-expression': 'off', + '@typescript-eslint/no-empty-object-type': 'off', '@typescript-eslint/no-explicit-any': 'off', '@typescript-eslint/no-extraneous-class': 'off', '@typescript-eslint/no-floating-promises': 'off', From c5697aaa07aabcd2c9e05bd726d424b75959d1de Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 18 Jul 2024 14:47:59 -0300 Subject: [PATCH 005/938] fix eslint in docker folder --- generators/docker/templates/eslint.config.js.jhi.docker.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/docker/templates/eslint.config.js.jhi.docker.ejs b/generators/docker/templates/eslint.config.js.jhi.docker.ejs index 29c527bc5d0c..2ff48d70bd5c 100644 --- a/generators/docker/templates/eslint.config.js.jhi.docker.ejs +++ b/generators/docker/templates/eslint.config.js.jhi.docker.ejs @@ -17,5 +17,5 @@ limitations under the License. -%> <&_ if (fragment.configSection) { -&> - { files: ['**/*.js'], ignores: ['<%- dockerServicesDir %>'] }, + { ignores: ['<%- dockerServicesDir %>'] }, <&_ } -&> From 7b7db04f2610b3a2e64a46f0ec33c3b48ce831ef Mon Sep 17 00:00:00 2001 From: mshima <1417183+mshima@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:52:29 +0000 Subject: [PATCH 006/938] update spring-boot-dependencies bom to v3.3.2 --- .../resources/spring-boot-dependencies.pom | 204 +++++++++--------- 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/generators/spring-boot/resources/spring-boot-dependencies.pom b/generators/spring-boot/resources/spring-boot-dependencies.pom index d1bf8c49834a..6d5ee50fc9b7 100644 --- a/generators/spring-boot/resources/spring-boot-dependencies.pom +++ b/generators/spring-boot/resources/spring-boot-dependencies.pom @@ -3,7 +3,7 @@ 4.0.0 org.springframework.boot spring-boot-dependencies - 3.3.1 + 3.3.2 pom spring-boot-dependencies Spring Boot Dependencies @@ -29,13 +29,13 @@ 6.1.2 2.0.3 2.33.0 - 1.9.22 + 1.9.22.1 3.25.3 4.2.1 3.4.0 6.0.3 3.5.0 - 1.14.17 + 1.14.18 2.6.1.Final 3.1.8 4.18.1 @@ -49,7 +49,7 @@ 1.4.0 2.8.0 11.5.9.0 - 1.1.5 + 1.1.6 10.16.1.1 3.10.8 8.13.4 @@ -58,8 +58,8 @@ 8.0.2 4.0.5 3.0.1 - 22.0 - 4.0.21 + 22.1 + 4.0.22 2.10.1 2.2.224 2.2 @@ -72,10 +72,10 @@ 4.1.5 5.3.1 4.4.16 - 5.2.4 + 5.2.5 15.0.5.Final 2.24 - 2.17.1 + 2.17.2 2.1.3 2.1.1 2.0.1 @@ -104,16 +104,16 @@ 5.0.2 3.1.7 4.0.5 - 12.0.10 + 12.0.11 1.16 3.19.10 2.9.0 2.5.1 - 1.5.1 + 1.5.3 1.3.1 4.13.2 - 5.10.2 - 3.7.0 + 5.10.3 + 3.7.1 1.9.24 1.8.1 1.6.3 @@ -121,7 +121,7 @@ 4.27.0 2.23.1 1.5.6 - 1.18.32 + 1.18.34 3.3.3 3.1.0 3.7.1 @@ -141,15 +141,15 @@ 3.3.1 3.2.5 3.4.0 - 1.13.1 - 1.3.1 + 1.13.2 + 1.3.2 5.11.0 5.0.1 - 12.6.2.jre11 + 12.6.3.jre11 8.3.0 0.10.2 1.9.22 - 5.21.0 + 5.22.0 4.1.111.Final 4.12.0 1.37.0 @@ -164,7 +164,7 @@ 2.3.2 5.1.0 1.0.0.RELEASE - 1.2.0 + 1.2.1 1.0.2.RELEASE 1.1.3 1.0.1.RELEASE @@ -174,7 +174,7 @@ 5.21.0 0.15.0 1.0.4 - 2023.0.7 + 2023.0.8 5.4.0 1.1.3 3.1.8 @@ -187,16 +187,16 @@ 3.1.6 1.3.1 5.1.2 - 2024.0.1 - 6.1.10 - 1.3.1 - 2.3.0 - 6.3.1 - 3.2.1 + 2024.0.2 + 6.1.11 + 1.3.2 + 2.3.1 + 6.3.2 + 3.2.2 3.2.4 - 1.1.1 + 1.1.2 3.0.1 - 2.0.6 + 2.0.7 6.3.1 3.3.1 4.0.11 @@ -206,7 +206,7 @@ 2.0.1 3.1.2.RELEASE 3.3.0 - 10.1.25 + 10.1.26 6.0.11 2.3.13.Final 2.16.2 @@ -1666,367 +1666,367 @@ org.springframework.boot spring-boot - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-test - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-test-autoconfigure - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-testcontainers - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-actuator - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-actuator-autoconfigure - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-autoconfigure - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-autoconfigure-processor - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-buildpack-platform - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-configuration-metadata - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-configuration-processor - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-devtools - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-docker-compose - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-jarmode-tools - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-loader - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-loader-classic - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-loader-tools - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-properties-migrator - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-activemq - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-actuator - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-amqp - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-aop - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-artemis - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-batch - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-cache - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-data-cassandra - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-data-cassandra-reactive - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-data-couchbase - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-data-couchbase-reactive - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-data-elasticsearch - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-data-jdbc - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-data-jpa - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-data-ldap - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-data-mongodb - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-data-mongodb-reactive - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-data-r2dbc - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-data-redis - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-data-redis-reactive - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-data-neo4j - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-data-rest - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-freemarker - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-graphql - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-groovy-templates - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-hateoas - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-integration - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-jdbc - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-jersey - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-jetty - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-jooq - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-json - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-log4j2 - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-logging - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-mail - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-mustache - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-oauth2-authorization-server - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-oauth2-client - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-oauth2-resource-server - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-pulsar - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-pulsar-reactive - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-quartz - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-reactor-netty - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-rsocket - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-security - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-test - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-thymeleaf - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-tomcat - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-undertow - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-validation - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-web - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-webflux - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-websocket - 3.3.1 + 3.3.2 org.springframework.boot spring-boot-starter-web-services - 3.3.1 + 3.3.2 com.sun.xml.messaging.saaj @@ -2725,7 +2725,7 @@ org.springframework.boot spring-boot-maven-plugin - 3.3.1 + 3.3.2 org.codehaus.mojo From 2a579cecfea008d1cb59289a2419355057bb9f38 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 18 Jul 2024 16:28:17 -0300 Subject: [PATCH 007/938] cleanup --- generators/angular/resources/package.json | 2 -- generators/app/__snapshots__/generator.spec.ts.snap | 4 ---- 2 files changed, 6 deletions(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 62dbb1d74734..1e656b768df1 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -23,12 +23,10 @@ "@angular-architects/module-federation-runtime": "18.0.4", "@angular-builders/custom-webpack": "18.0.0", "@angular-builders/jest": "18.0.0", - "@angular-eslint/eslint-plugin": "18.1.0", "@angular/cli": "18.1.1", "@types/jest": "29.5.12", "@types/node": "20.11.25", "@types/sockjs-client": "1.5.4", - "@typescript-eslint/eslint-plugin": "7.16.1", "angular-eslint": "18.1.0", "browser-sync": "3.0.2", "browser-sync-webpack-plugin": "2.3.0", diff --git a/generators/app/__snapshots__/generator.spec.ts.snap b/generators/app/__snapshots__/generator.spec.ts.snap index 441f998a49e0..41fca92f6e23 100644 --- a/generators/app/__snapshots__/generator.spec.ts.snap +++ b/generators/app/__snapshots__/generator.spec.ts.snap @@ -612,7 +612,6 @@ exports[`generator - app with default config should match snapshot 1`] = ` "@angular-architects/module-federation-runtime": "ANGULAR_ARCHITECTS_MODULE_FEDERATION_RUNTIME_VERSION", "@angular-builders/custom-webpack": "ANGULAR_BUILDERS_CUSTOM_WEBPACK_VERSION", "@angular-builders/jest": "ANGULAR_BUILDERS_JEST_VERSION", - "@angular-eslint/eslint-plugin": "ANGULAR_ESLINT_ESLINT_PLUGIN_VERSION", "@angular/cli": "ANGULAR_CLI_VERSION", "@angular/common": "ANGULAR_COMMON_VERSION", "@cypress/code-coverage": "CYPRESS_CODE_COVERAGE_VERSION", @@ -627,7 +626,6 @@ exports[`generator - app with default config should match snapshot 1`] = ` "@types/jest": "TYPES_JEST_VERSION", "@types/node": "TYPES_NODE_VERSION", "@types/sockjs-client": "TYPES_SOCKJS_CLIENT_VERSION", - "@typescript-eslint/eslint-plugin": "TYPESCRIPT_ESLINT_ESLINT_PLUGIN_VERSION", "angular-eslint": "ANGULAR_ESLINT_VERSION", "babel-loader": "BABEL_LOADER_VERSION", "babel-plugin-istanbul": "BABEL_PLUGIN_ISTANBUL_VERSION", @@ -1222,7 +1220,6 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "@angular-architects/module-federation-runtime": "ANGULAR_ARCHITECTS_MODULE_FEDERATION_RUNTIME_VERSION", "@angular-builders/custom-webpack": "ANGULAR_BUILDERS_CUSTOM_WEBPACK_VERSION", "@angular-builders/jest": "ANGULAR_BUILDERS_JEST_VERSION", - "@angular-eslint/eslint-plugin": "ANGULAR_ESLINT_ESLINT_PLUGIN_VERSION", "@angular/cli": "ANGULAR_CLI_VERSION", "@angular/common": "ANGULAR_COMMON_VERSION", "@cypress/code-coverage": "CYPRESS_CODE_COVERAGE_VERSION", @@ -1237,7 +1234,6 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "@types/jest": "TYPES_JEST_VERSION", "@types/node": "TYPES_NODE_VERSION", "@types/sockjs-client": "TYPES_SOCKJS_CLIENT_VERSION", - "@typescript-eslint/eslint-plugin": "TYPESCRIPT_ESLINT_ESLINT_PLUGIN_VERSION", "angular-eslint": "ANGULAR_ESLINT_VERSION", "babel-loader": "BABEL_LOADER_VERSION", "babel-plugin-istanbul": "BABEL_PLUGIN_ISTANBUL_VERSION", From 438e2b8ce8cb85036307c0c82055d01d1481f50f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:54:11 +0000 Subject: [PATCH 008/938] Bump docker/build-push-action from 6.4.0 to 6.4.1 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.4.0 to 6.4.1. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.4.0...v6.4.1) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-image-publish-github-registry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-publish-github-registry.yml b/.github/workflows/docker-image-publish-github-registry.yml index 2d154be64e8b..5704bb77ac30 100644 --- a/.github/workflows/docker-image-publish-github-registry.yml +++ b/.github/workflows/docker-image-publish-github-registry.yml @@ -72,7 +72,7 @@ jobs: images: ghcr.io/${{ github.repository }}${{ (steps.login-hub.outcome == 'success' && ',jhipster/jhipster') || ''}} - name: Build and push Docker image - uses: docker/build-push-action@v6.4.0 + uses: docker/build-push-action@v6.4.1 with: context: . platforms: linux/amd64,linux/arm64 From 073d316ea746f22bdcab8c59959fdf90ac02a71b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:54:23 +0000 Subject: [PATCH 009/938] Bump io.cucumber:cucumber-bom in /generators/server/resources Bumps [io.cucumber:cucumber-bom](https://github.com/cucumber/cucumber-jvm) from 7.18.0 to 7.18.1. - [Release notes](https://github.com/cucumber/cucumber-jvm/releases) - [Changelog](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md) - [Commits](https://github.com/cucumber/cucumber-jvm/compare/v7.18.0...v7.18.1) --- updated-dependencies: - dependency-name: io.cucumber:cucumber-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/server/resources/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/gradle/libs.versions.toml b/generators/server/resources/gradle/libs.versions.toml index d259ec1574fa..3dcd1a464990 100644 --- a/generators/server/resources/gradle/libs.versions.toml +++ b/generators/server/resources/gradle/libs.versions.toml @@ -7,7 +7,7 @@ feign-reactor-bom = { module = 'com.playtika.reactivefeign:feign-reactor-bom', v # Cucumber testng = { module = 'org.testng:testng', version = '7.10.2' } -cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.18.0' } +cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.18.1' } mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.4.4' } From beb804cc0a072518d4356989409d064ddf0524ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:54:37 +0000 Subject: [PATCH 010/938] Bump ts-jest from 29.2.2 to 29.2.3 in /generators/angular/resources Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 29.2.2 to 29.2.3. - [Release notes](https://github.com/kulshekhar/ts-jest/releases) - [Changelog](https://github.com/kulshekhar/ts-jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/kulshekhar/ts-jest/compare/v29.2.2...v29.2.3) --- updated-dependencies: - dependency-name: ts-jest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 1e656b768df1..b78160ace6c6 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -46,7 +46,7 @@ "merge-jsons-webpack-plugin": "2.0.1", "postcss-rtlcss": "5.3.0", "rimraf": "5.0.8", - "ts-jest": "29.2.2", + "ts-jest": "29.2.3", "typescript": "5.4.5", "typescript-eslint": "8.0.0-alpha.44", "webpack": "5.93.0", From 998839d80ce8bee0f32938b9ffd475743b2327ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:54:46 +0000 Subject: [PATCH 011/938] Bump typescript-eslint in /generators/angular/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.44 to 8.0.0-alpha.45. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/HEAD/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 1e656b768df1..5fb5a3798f32 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -48,7 +48,7 @@ "rimraf": "5.0.8", "ts-jest": "29.2.2", "typescript": "5.4.5", - "typescript-eslint": "8.0.0-alpha.44", + "typescript-eslint": "8.0.0-alpha.45", "webpack": "5.93.0", "webpack-bundle-analyzer": "4.10.2", "webpack-merge": "6.0.1", From b48d838e60a1c6d03e85a2569d15c7f3ef1f0e81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:55:00 +0000 Subject: [PATCH 012/938] Bump dayjs from 1.11.11 to 1.11.12 in /generators/client/resources Bumps [dayjs](https://github.com/iamkun/dayjs) from 1.11.11 to 1.11.12. - [Release notes](https://github.com/iamkun/dayjs/releases) - [Changelog](https://github.com/iamkun/dayjs/blob/dev/CHANGELOG.md) - [Commits](https://github.com/iamkun/dayjs/compare/v1.11.11...v1.11.12) --- updated-dependencies: - dependency-name: dayjs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/client/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/resources/package.json b/generators/client/resources/package.json index 881a135b0b70..e75f517274ed 100644 --- a/generators/client/resources/package.json +++ b/generators/client/resources/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "dayjs": "1.11.11" + "dayjs": "1.11.12" }, "devDependencies": { "@cypress/code-coverage": "3.12.42", From baa21fcd0859c92997b92fd2912bd35d5432962f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:55:09 +0000 Subject: [PATCH 013/938] Bump ts-jest from 29.2.2 to 29.2.3 in /generators/react/resources Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 29.2.2 to 29.2.3. - [Release notes](https://github.com/kulshekhar/ts-jest/releases) - [Changelog](https://github.com/kulshekhar/ts-jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/kulshekhar/ts-jest/compare/v29.2.2...v29.2.3) --- updated-dependencies: - dependency-name: ts-jest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index 466383efe717..b781f4823fd9 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -78,7 +78,7 @@ "style-loader": "4.0.0", "terser-webpack-plugin": "5.3.10", "thread-loader": "4.0.2", - "ts-jest": "29.2.2", + "ts-jest": "29.2.3", "ts-loader": "9.5.1", "typescript": "5.5.3", "typescript-eslint": "7.16.1", From b966b06521eb7fc90fb939e760037428d8ce3a77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:55:45 +0000 Subject: [PATCH 014/938] Bump type-fest from 4.22.0 to 4.22.1 Bumps [type-fest](https://github.com/sindresorhus/type-fest) from 4.22.0 to 4.22.1. - [Release notes](https://github.com/sindresorhus/type-fest/releases) - [Commits](https://github.com/sindresorhus/type-fest/compare/v4.22.0...v4.22.1) --- updated-dependencies: - dependency-name: type-fest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 725a8e66e67b..ee4515894c9b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,7 +59,7 @@ "semver": "7.6.3", "simple-git": "3.25.0", "sort-keys": "5.0.0", - "type-fest": "4.22.0", + "type-fest": "4.22.1", "typescript": "5.4.5", "winston": "3.13.1", "yaml": "2.4.5", @@ -13535,9 +13535,9 @@ } }, "node_modules/type-fest": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.22.0.tgz", - "integrity": "sha512-hxMO1k4ip1uTVGgPbs1hVpYyhz2P91A6tQyH2H9POx3U6T3MdhIcfY8L2hRu/LRmzPFdfduOS0RIDjFlP2urPw==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.22.1.tgz", + "integrity": "sha512-9tHNEa0Ov81YOopiVkcCJVz5TM6AEQ+CHHjFIktqPnE3NV0AHIkx+gh9tiCl58m/66wWxkOC9eltpa75J4lQPA==", "engines": { "node": ">=16" }, diff --git a/package.json b/package.json index 53cb68035846..ed27d2f283f6 100644 --- a/package.json +++ b/package.json @@ -167,7 +167,7 @@ "semver": "7.6.3", "simple-git": "3.25.0", "sort-keys": "5.0.0", - "type-fest": "4.22.0", + "type-fest": "4.22.1", "typescript": "5.4.5", "winston": "3.13.1", "yaml": "2.4.5", From 391b520f8fe64f04605efdd97d98f62a34d65e16 Mon Sep 17 00:00:00 2001 From: mithun522 Date: Fri, 19 Jul 2024 19:57:51 +0530 Subject: [PATCH 015/938] corrected the ar-ly fron english to ar-ly --- .../entity/i18n/entity_ar-ly.json.ejs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/generators/languages/templates/entity/i18n/entity_ar-ly.json.ejs b/generators/languages/templates/entity/i18n/entity_ar-ly.json.ejs index 36546fb53082..860ee20971f6 100644 --- a/generators/languages/templates/entity/i18n/entity_ar-ly.json.ejs +++ b/generators/languages/templates/entity/i18n/entity_ar-ly.json.ejs @@ -22,24 +22,24 @@ let helpBlocks = 0; %> "<%= entityTranslationKey %>" : { "home": { "title": "<%= entityClassPluralHumanized %>", - "refreshListLabel": "Refresh list", + "refreshListLabel": "تحديث القائمة", <%_ if (!readOnly) { _%> - "createLabel": "Create a new <%= entityClassHumanized %>", - "createOrEditLabel": "Create or edit a <%= entityClassHumanized %>", + "createLabel": "إنشاء <%= entityClassHumanized %> جديد", + "createOrEditLabel": "إنشاء أو تعديل <%= entityClassHumanized %>", <%_ } _%> <%_ if (searchEngineAny) { _%> - "search": "Search for <%= entityClassHumanized %>", + "search": "البحث عن <%= entityClassHumanized %>", <%_ } _%> - "notFound": "No <%= entityClassPluralHumanized %> found" + "notFound": "لم يتم العثور على <%= entityClassPluralHumanized %>" }, <%_ if (!microserviceAppName && !readOnly) { _%> - "created": "A new <%= entityClassHumanized %> is created with identifier {{ param }}", - "updated": "A <%= entityClassHumanized %> is updated with identifier {{ param }}", - "deleted": "A <%= entityClassHumanized %> is deleted with identifier {{ param }}", + "created": "<%= entityClassHumanized %> جديد تم إنشاؤه بالمعرف {{ param }}", + "updated": "<%= entityClassHumanized %> تم تحديثه بالمعرف {{ param }}", + "deleted": "<%= entityClassHumanized %> تم حذفه بالمعرف {{ param }}", <%_ } _%> <%_ if (!readOnly) { _%> "delete": { - "question": "Are you sure you want to delete <%= entityClassHumanized %> {{ id }}?" + "question": "هل أنت متأكد أنك تريد حذف <%= entityClassHumanized %> {{ id }}؟" }, <%_ } _%> "detail": { @@ -60,9 +60,9 @@ let helpBlocks = 0; %> <%_ if (microserviceAppName && !readOnly) { _%>, "<%= microserviceAppName %>": { "<%= entityTranslationKey %>" : { - "created": "A new <%= entityClassHumanized %> is created with identifier {{ param }}", - "updated": "A <%= entityClassHumanized %> is updated with identifier {{ param }}", - "deleted": "A <%= entityClassHumanized %> is deleted with identifier {{ param }}" + "created": "<%= entityClassHumanized %> جديد تم إنشاؤه بالمعرف {{ param }}", + "updated": "<%= entityClassHumanized %> تم تحديثه بالمعرف {{ param }}", + "deleted": "<%= entityClassHumanized %> تم حذفه بالمعرف {{ param }}" } } <%_ } _%> From 1ad3570566c1f800a8585994375dd0002ad7e36b Mon Sep 17 00:00:00 2001 From: JHipster Bot Date: Sat, 20 Jul 2024 00:19:53 +0000 Subject: [PATCH 016/938] Bump transitional dependencies --- package-lock.json | 163 +++++++++++++++++++++++++--------------------- 1 file changed, 88 insertions(+), 75 deletions(-) diff --git a/package-lock.json b/package-lock.json index ee4515894c9b..e42c9b020452 100644 --- a/package-lock.json +++ b/package-lock.json @@ -160,9 +160,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.8.tgz", - "integrity": "sha512-c4IM7OTg6k1Q+AJ153e2mc2QVTezTwnb4VzquwcyiEzGnW0Kedv4do/TrkU98qPeC5LNiMt/QXwIjzYXLBpyZg==", + "version": "7.24.9", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz", + "integrity": "sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==", "dev": true, "license": "MIT", "engines": { @@ -170,22 +170,22 @@ } }, "node_modules/@babel/core": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.8.tgz", - "integrity": "sha512-6AWcmZC/MZCO0yKys4uhg5NlxL0ESF3K6IAaoQ+xSXvPyPyxNWRafP+GDbI88Oh68O7QkJgmEtedWPM9U0pZNg==", + "version": "7.24.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz", + "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.24.8", + "@babel/generator": "^7.24.9", "@babel/helper-compilation-targets": "^7.24.8", - "@babel/helper-module-transforms": "^7.24.8", + "@babel/helper-module-transforms": "^7.24.9", "@babel/helpers": "^7.24.8", "@babel/parser": "^7.24.8", "@babel/template": "^7.24.7", "@babel/traverse": "^7.24.8", - "@babel/types": "^7.24.8", + "@babel/types": "^7.24.9", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -211,13 +211,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.8.tgz", - "integrity": "sha512-47DG+6F5SzOi0uEvK4wMShmn5yY0mVjVJoWTphdY2B4Rx9wHgjK7Yhtr0ru6nE+sn0v38mzrWOlah0p/YlHHOQ==", + "version": "7.24.10", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.10.tgz", + "integrity": "sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.24.8", + "@babel/types": "^7.24.9", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" @@ -308,9 +308,9 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.8.tgz", - "integrity": "sha512-m4vWKVqvkVAWLXfHCCfff2luJj86U+J0/x+0N3ArG/tP0Fq7zky2dYwMbtPmkc/oulkkbjdL3uWzuoBwQ8R00Q==", + "version": "7.24.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz", + "integrity": "sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==", "dev": true, "license": "MIT", "dependencies": { @@ -730,9 +730,9 @@ } }, "node_modules/@babel/types": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.8.tgz", - "integrity": "sha512-SkSBEHwwJRU52QEVZBmMBnE5Ux2/6WU1grdYyOhpbCNxbmJrDuDCphBzKZSO3taf0zztp+qkWlymE5tVL5l0TA==", + "version": "7.24.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.9.tgz", + "integrity": "sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1384,9 +1384,9 @@ "license": "ISC" }, "node_modules/@inquirer/figures": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.3.tgz", - "integrity": "sha512-ErXXzENMH5pJt5/ssXV0DfWUZqly8nGzf0UcBV9xTnP+KyffE2mqyxIMBrZ8ijQck2nU0TQm40EQB53YreyWHw==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.4.tgz", + "integrity": "sha512-R7Gsg6elpuqdn55fBH2y9oYzrU/yKrSmIsDX4ROT51vohrECFzTf2zw9BfUbOW8xjfmM2QbVoVYdTwhrtEKWSQ==", "license": "MIT", "engines": { "node": ">=18" @@ -3213,6 +3213,7 @@ "version": "7.16.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.16.1.tgz", "integrity": "sha512-SxdPak/5bO0EnGktV05+Hq8oatjAYVY3Zh2bye9pGZy6+jwyR3LG3YKkV4YatlsgqXP28BTeVm9pqwJM96vf2A==", + "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "7.16.1", @@ -3245,6 +3246,7 @@ "version": "7.16.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.16.1.tgz", "integrity": "sha512-u+1Qx86jfGQ5i4JjK33/FnawZRpsLxRnKzGE6EABZ40KxVT/vWsiZFEBBHjFOljmmV3MBYOHEKi0Jm9hbAOClA==", + "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/scope-manager": "7.16.1", "@typescript-eslint/types": "7.16.1", @@ -3272,6 +3274,7 @@ "version": "7.16.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.16.1.tgz", "integrity": "sha512-nYpyv6ALte18gbMz323RM+vpFpTjfNdyakbf3nsLvF43uF9KeNC289SUEW3QLZ1xPtyINJ1dIsZOuWuSRIWygw==", + "license": "MIT", "dependencies": { "@typescript-eslint/types": "7.16.1", "@typescript-eslint/visitor-keys": "7.16.1" @@ -3288,6 +3291,7 @@ "version": "7.16.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.16.1.tgz", "integrity": "sha512-rbu/H2MWXN4SkjIIyWcmYBjlp55VT+1G3duFOIukTNFxr9PI35pLc2ydwAfejCEitCv4uztA07q0QWanOHC7dA==", + "license": "MIT", "dependencies": { "@typescript-eslint/typescript-estree": "7.16.1", "@typescript-eslint/utils": "7.16.1", @@ -3314,6 +3318,7 @@ "version": "7.16.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.1.tgz", "integrity": "sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==", + "license": "MIT", "engines": { "node": "^18.18.0 || >=20.0.0" }, @@ -3326,6 +3331,7 @@ "version": "7.16.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.1.tgz", "integrity": "sha512-0vFPk8tMjj6apaAZ1HlwM8w7jbghC8jc1aRNJG5vN8Ym5miyhTQGMqU++kuBFDNKe9NcPeZ6x0zfSzV8xC1UlQ==", + "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/types": "7.16.1", "@typescript-eslint/visitor-keys": "7.16.1", @@ -3353,6 +3359,7 @@ "version": "7.16.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.16.1.tgz", "integrity": "sha512-WrFM8nzCowV0he0RlkotGDujx78xudsxnGMBHI88l5J8wEhED6yBwaSLP99ygfrzAjsQvcYQ94quDwI0d7E1fA==", + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@typescript-eslint/scope-manager": "7.16.1", @@ -3374,6 +3381,7 @@ "version": "7.16.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.1.tgz", "integrity": "sha512-Qlzzx4sE4u3FsHTPQAAQFJFNOuqtuY0LFrZHwQ8IHK705XxBiWOFkfKRWu6niB7hwfgnwIpO4jTC75ozW1PHWg==", + "license": "MIT", "dependencies": { "@typescript-eslint/types": "7.16.1", "eslint-visitor-keys": "^3.4.3" @@ -3441,9 +3449,9 @@ } }, "node_modules/@yeoman/conflicter/node_modules/@types/node": { - "version": "16.18.101", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.101.tgz", - "integrity": "sha512-AAsx9Rgz2IzG8KJ6tXd6ndNkVcu+GYB6U/SnFAaokSPNx2N7dcIIfnighYUNumvj6YS2q39Dejz5tT0NCV7CWA==", + "version": "16.18.103", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.103.tgz", + "integrity": "sha512-gOAcUSik1nR/CRC3BsK8kr6tbmNIOTpvb1sT+v5Nmmys+Ho8YtnIHP90wEsVK4hTcHndOqPVIlehEGEA5y31bA==", "license": "MIT" }, "node_modules/@yeoman/namespace": { @@ -3470,9 +3478,9 @@ } }, "node_modules/@yeoman/transform/node_modules/@types/node": { - "version": "16.18.101", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.101.tgz", - "integrity": "sha512-AAsx9Rgz2IzG8KJ6tXd6ndNkVcu+GYB6U/SnFAaokSPNx2N7dcIIfnighYUNumvj6YS2q39Dejz5tT0NCV7CWA==", + "version": "16.18.103", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.103.tgz", + "integrity": "sha512-gOAcUSik1nR/CRC3BsK8kr6tbmNIOTpvb1sT+v5Nmmys+Ho8YtnIHP90wEsVK4hTcHndOqPVIlehEGEA5y31bA==", "license": "MIT" }, "node_modules/@yeoman/types": { @@ -3508,9 +3516,9 @@ } }, "node_modules/@yeoman/types/node_modules/@types/node": { - "version": "16.18.101", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.101.tgz", - "integrity": "sha512-AAsx9Rgz2IzG8KJ6tXd6ndNkVcu+GYB6U/SnFAaokSPNx2N7dcIIfnighYUNumvj6YS2q39Dejz5tT0NCV7CWA==", + "version": "16.18.103", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.103.tgz", + "integrity": "sha512-gOAcUSik1nR/CRC3BsK8kr6tbmNIOTpvb1sT+v5Nmmys+Ho8YtnIHP90wEsVK4hTcHndOqPVIlehEGEA5y31bA==", "license": "MIT" }, "node_modules/abbrev": { @@ -4336,9 +4344,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001641", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001641.tgz", - "integrity": "sha512-Phv5thgl67bHYo1TtMY/MurjkHhV4EDaCosezRXgZ8jzA/Ub+wjxAvbGvjoFENStinwi5kCyOYV3mi5tOGykwA==", + "version": "1.0.30001642", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001642.tgz", + "integrity": "sha512-3XQ0DoRgLijXJErLSl+bLnJ+Et4KqV1PY6JJBGAFlsNsz31zeAIncyeZfLCabHK/jtSh+671RM9YMldxjUPZtA==", "dev": true, "funding": [ { @@ -5435,9 +5443,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.827", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.827.tgz", - "integrity": "sha512-VY+J0e4SFcNfQy19MEoMdaIcZLmDCprqvBtkii1WTCTQHpRvf5N8+3kTYCgL/PcntvwQvmMJWTuDPsq+IlhWKQ==", + "version": "1.4.831", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.831.tgz", + "integrity": "sha512-6cKy9msoQGWhBF30n6y5ck80BdunKdwMRugM1lr74DMMXhjDRxSwMvrD1ncPP+n1PjF+KKmZZydvEF29skNZ1Q==", "dev": true, "license": "ISC" }, @@ -5944,6 +5952,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz", "integrity": "sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==", "dev": true, + "license": "MIT", "dependencies": { "prettier-linter-helpers": "^1.0.0", "synckit": "^0.9.1" @@ -7127,9 +7136,9 @@ } }, "node_modules/get-tsconfig": { - "version": "4.7.5", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.5.tgz", - "integrity": "sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==", + "version": "4.7.6", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.6.tgz", + "integrity": "sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==", "dev": true, "license": "MIT", "dependencies": { @@ -7642,9 +7651,9 @@ "license": "ISC" }, "node_modules/inquirer": { - "version": "9.3.5", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.3.5.tgz", - "integrity": "sha512-SVRCRovA7KaT6nqWB2mCNpTvU4cuZ0hOXo5KPyiyOcNNUIZwq/JKtvXuDJNaxfuJKabBYRu1ecHze0YEwDYoRQ==", + "version": "9.3.6", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.3.6.tgz", + "integrity": "sha512-riK/iQB2ctwkpWYgjjWIRv3MBLt2gzb2Sj0JNQNbyTXgyXsLWcDPJ5WS5ZDTCx7BRFnJsARtYh+58fjP5M2Y0Q==", "license": "MIT", "dependencies": { "@inquirer/figures": "^1.0.3", @@ -7982,9 +7991,9 @@ } }, "node_modules/is-core-module": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz", - "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==", + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz", + "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==", "license": "MIT", "dependencies": { "hasown": "^2.0.2" @@ -8386,9 +8395,9 @@ } }, "node_modules/jake": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz", - "integrity": "sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==", + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", + "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", "license": "Apache-2.0", "dependencies": { "async": "^3.2.3", @@ -9578,9 +9587,9 @@ } }, "node_modules/mem-fs-editor/node_modules/@types/node": { - "version": "18.19.39", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.39.tgz", - "integrity": "sha512-nPwTRDKUctxw3di5b4TfT3I0sWDiWoPQCZjXhvdkINntwr8lcoVCKsTgnXeRubKIlfnV+eN/HYk6Jb40tbcEAQ==", + "version": "18.19.41", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.41.tgz", + "integrity": "sha512-LX84pRJ+evD2e2nrgYCHObGWkiQJ1mL+meAgbvnwk/US6vmMY7S2ygBTGV2Jw91s9vUsLSXeDEkUHZIJGLrhsg==", "license": "MIT", "dependencies": { "undici-types": "~5.26.4" @@ -10544,9 +10553,9 @@ "license": "MIT" }, "node_modules/node-releases": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", + "version": "2.0.17", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.17.tgz", + "integrity": "sha512-Ww6ZlOiEQfPfXM45v17oabk77Z7mg5bOt7AjDyzy7RjK9OrLrLC8dyZQoAPEOtFX9SaNf1Tdvr5gRJWdTJj7GA==", "dev": true, "license": "MIT" }, @@ -11209,9 +11218,9 @@ } }, "node_modules/p-transform/node_modules/@types/node": { - "version": "16.18.101", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.101.tgz", - "integrity": "sha512-AAsx9Rgz2IzG8KJ6tXd6ndNkVcu+GYB6U/SnFAaokSPNx2N7dcIIfnighYUNumvj6YS2q39Dejz5tT0NCV7CWA==", + "version": "16.18.103", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.103.tgz", + "integrity": "sha512-gOAcUSik1nR/CRC3BsK8kr6tbmNIOTpvb1sT+v5Nmmys+Ho8YtnIHP90wEsVK4hTcHndOqPVIlehEGEA5y31bA==", "license": "MIT" }, "node_modules/p-try": { @@ -11225,9 +11234,9 @@ } }, "node_modules/package-json": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-10.0.0.tgz", - "integrity": "sha512-w34pqp733w35nElGG6eH1OnDnHEWud4uxruQ2nKzY/Uy0uOJmWFdjDcAC+xAD4goVuBZStwaAEBS21BANv83HQ==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/package-json/-/package-json-10.0.1.tgz", + "integrity": "sha512-ua1L4OgXSBdsu1FPb7F3tYH0F48a6kxvod4pLUlGY9COeJAJQNX/sNH2IiEmsxw7lqYiAwrdHMjz1FctOsyDQg==", "license": "MIT", "dependencies": { "ky": "^1.2.0", @@ -11436,9 +11445,9 @@ } }, "node_modules/peek-readable": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.1.1.tgz", - "integrity": "sha512-4hEOSH7KeEaZpMDF/xfm1W9fS5rT7Ett3BkXWHqAEzRLLwLaHkwOL+GvvpIEh9UrvX9BDhzfkvteslgraoH69w==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.1.3.tgz", + "integrity": "sha512-kCsc9HwH5RgVA3H3VqkWFyGQwsxUxLdiSX1d5nqAm7hnMFjNFX1VhBLmJoUY0hZNc8gmDNgBkLjfhiWPsziXWA==", "dev": true, "license": "MIT", "engines": { @@ -11584,6 +11593,7 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/prettier-plugin-packagejson/-/prettier-plugin-packagejson-2.5.1.tgz", "integrity": "sha512-6i4PW1KxEA+VrokYNGeI/q8qQX3u5DNBc7eLr9GX4OrvWr9DMls1lhbuNopkKG7Li9rTNxerWnYQyjxoUO4ROA==", + "license": "MIT", "dependencies": { "sort-package-json": "2.10.0", "synckit": "0.9.1" @@ -12468,6 +12478,7 @@ "version": "7.6.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -13074,17 +13085,17 @@ "license": "MIT" }, "node_modules/strtok3": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.1.0.tgz", - "integrity": "sha512-19dQEwG6Jd+VabjPRyBhymIF069vZiqWSZa2jJBoKJTsqGKnTxowGoQaLnz+yLARfDI041IUQekyPUMWElOgsQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.1.1.tgz", + "integrity": "sha512-mKX8HA/cdBqMKUr0MMZAFssCkIGoZeSCMXgnt79yKxNFguMLVFgRe6wB+fsL0NmoHDbeyZXczy7vEPSoo3rkzg==", "dev": true, "license": "MIT", "dependencies": { "@tokenizer/token": "^0.3.0", - "peek-readable": "^5.1.1" + "peek-readable": "^5.1.3" }, "engines": { - "node": ">=14.16" + "node": ">=16" }, "funding": { "type": "github", @@ -13128,6 +13139,7 @@ "version": "0.9.1", "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz", "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==", + "license": "MIT", "dependencies": { "@pkgr/core": "^0.1.0", "tslib": "^2.6.2" @@ -13538,6 +13550,7 @@ "version": "4.22.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.22.1.tgz", "integrity": "sha512-9tHNEa0Ov81YOopiVkcCJVz5TM6AEQ+CHHjFIktqPnE3NV0AHIkx+gh9tiCl58m/66wWxkOC9eltpa75J4lQPA==", + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=16" }, @@ -13639,9 +13652,9 @@ "license": "MIT" }, "node_modules/uint8array-extras": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/uint8array-extras/-/uint8array-extras-1.3.0.tgz", - "integrity": "sha512-npBAT0ZIX6mAIG7SF6G4LF1BIoRx3h+HVajSplHx0XmOD0Ug4qio5Yhcajn72i5OEj/qkk1OFaYh2PhqHBV33w==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/uint8array-extras/-/uint8array-extras-1.4.0.tgz", + "integrity": "sha512-ZPtzy0hu4cZjv3z5NW9gfKnNLjoz4y6uv4HlelAjDK7sY/xOkKZv9xK/WQpcsBB3jEybChz9DPC2U/+cusjJVQ==", "license": "MIT", "engines": { "node": ">=18" @@ -14661,9 +14674,9 @@ } }, "node_modules/yeoman-generator/node_modules/@types/node": { - "version": "18.19.39", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.39.tgz", - "integrity": "sha512-nPwTRDKUctxw3di5b4TfT3I0sWDiWoPQCZjXhvdkINntwr8lcoVCKsTgnXeRubKIlfnV+eN/HYk6Jb40tbcEAQ==", + "version": "18.19.41", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.41.tgz", + "integrity": "sha512-LX84pRJ+evD2e2nrgYCHObGWkiQJ1mL+meAgbvnwk/US6vmMY7S2ygBTGV2Jw91s9vUsLSXeDEkUHZIJGLrhsg==", "license": "MIT", "dependencies": { "undici-types": "~5.26.4" From cef1f80af88c24bba220ce70997c71c4cd9680a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 00:44:58 +0000 Subject: [PATCH 017/938] Bump couchbase/server in /generators/server/resources Bumps couchbase/server from 7.6.1 to 7.6.2. --- updated-dependencies: - dependency-name: couchbase/server dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/server/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile index a1d987c9a0b8..309c918e0b26 100644 --- a/generators/server/resources/Dockerfile +++ b/generators/server/resources/Dockerfile @@ -23,7 +23,7 @@ FROM mariadb:11.4.2 FROM mongo:7.0.6 LABEL ALIAS=mongodb -FROM couchbase/server:7.6.1 +FROM couchbase/server:7.6.2 LABEL ALIAS=couchbase FROM cassandra:5.0 From 8c4af55bf0236dfdf33f4bf348ab461599e7abb4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 01:09:06 +0000 Subject: [PATCH 018/938] Bump eslint-plugin-react in /generators/react/resources Bumps [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) from 7.34.4 to 7.35.0. - [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases) - [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md) - [Commits](https://github.com/jsx-eslint/eslint-plugin-react/compare/v7.34.4...v7.35.0) --- updated-dependencies: - dependency-name: eslint-plugin-react dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index b781f4823fd9..eed7ea406714 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -51,7 +51,7 @@ "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", - "eslint-plugin-react": "7.34.4", + "eslint-plugin-react": "7.35.0", "eslint-webpack-plugin": "4.2.0", "folder-hash": "4.0.4", "fork-ts-checker-webpack-plugin": "9.0.2", From 10858dea152f95ed580298d72beca10e7a50d4ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 03:16:37 +0000 Subject: [PATCH 019/938] Bump typescript-eslint in /generators/angular/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.45 to 8.0.0-alpha.49. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/HEAD/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index d29bc98a3eef..05a93370d856 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -48,7 +48,7 @@ "rimraf": "5.0.8", "ts-jest": "29.2.3", "typescript": "5.4.5", - "typescript-eslint": "8.0.0-alpha.45", + "typescript-eslint": "8.0.0-alpha.49", "webpack": "5.93.0", "webpack-bundle-analyzer": "4.10.2", "webpack-merge": "6.0.1", From 527db270ffe4d2114df8c3578abb0d6f045a8677 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 05:47:12 +0000 Subject: [PATCH 020/938] Bump org.apache.maven.plugins:maven-javadoc-plugin Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.7.0 to 3.8.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.7.0...maven-javadoc-plugin-3.8.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/server/resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/pom.xml b/generators/server/resources/pom.xml index 82a5747dad4e..2596abc3b9fd 100644 --- a/generators/server/resources/pom.xml +++ b/generators/server/resources/pom.xml @@ -33,7 +33,7 @@ 3.5.0 3.3.1 3.4.2 - 3.7.0 + 3.8.0 3.3.1 3.12.1 3.3.1 From 36806008ea691af64d29a440c54670e0f61aeedb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 07:29:44 +0000 Subject: [PATCH 021/938] Bump @cypress/code-coverage in /generators/client/resources Bumps [@cypress/code-coverage](https://github.com/cypress-io/code-coverage) from 3.12.42 to 3.12.44. - [Release notes](https://github.com/cypress-io/code-coverage/releases) - [Changelog](https://github.com/cypress-io/code-coverage/blob/master/.releaserc) - [Commits](https://github.com/cypress-io/code-coverage/compare/v3.12.42...v3.12.44) --- updated-dependencies: - dependency-name: "@cypress/code-coverage" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/client/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/resources/package.json b/generators/client/resources/package.json index e75f517274ed..51dfad913cc0 100644 --- a/generators/client/resources/package.json +++ b/generators/client/resources/package.json @@ -3,7 +3,7 @@ "dayjs": "1.11.12" }, "devDependencies": { - "@cypress/code-coverage": "3.12.42", + "@cypress/code-coverage": "3.12.44", "babel-loader": "9.1.3", "babel-plugin-istanbul": "7.0.0", "cypress": "13.13.1", From 752cea031914d541882e137a9a22f45bbaaa4afe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 09:04:20 +0000 Subject: [PATCH 022/938] Bump eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter Bumps eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter from 2.10.3 to 2.10.4. --- updated-dependencies: - dependency-name: eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/server/resources/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/gradle/libs.versions.toml b/generators/server/resources/gradle/libs.versions.toml index 3dcd1a464990..0575ab2998e4 100644 --- a/generators/server/resources/gradle/libs.versions.toml +++ b/generators/server/resources/gradle/libs.versions.toml @@ -11,7 +11,7 @@ cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.18.1' } mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.4.4' } -neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.10.3' } +neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.10.4' } # Cassandra lz4-java = { module = 'org.lz4:lz4-java', version = '1.8.0' } From 4173861b081aad17fdb2148d972d4ae1e84cbbfc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:57:42 +0000 Subject: [PATCH 023/938] Bump vitest in /generators/generate-blueprint/resources Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 2.0.3 to 2.0.4. - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Commits](https://github.com/vitest-dev/vitest/commits/v2.0.4/packages/vitest) --- updated-dependencies: - dependency-name: vitest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/generate-blueprint/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generate-blueprint/resources/package.json b/generators/generate-blueprint/resources/package.json index f0653937f38f..9a56e8abdc76 100644 --- a/generators/generate-blueprint/resources/package.json +++ b/generators/generate-blueprint/resources/package.json @@ -2,6 +2,6 @@ "dependencies": { "eslint": "9.7.0", "globals": "15.8.0", - "vitest": "2.0.3" + "vitest": "2.0.4" } } From 4a5436e8879c78bc7f303f568f7241a638fc7a1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 23:07:32 +0000 Subject: [PATCH 024/938] Bump the typescript-eslint group with 2 updates Bumps the typescript-eslint group with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser). Updates `@typescript-eslint/eslint-plugin` from 7.16.1 to 7.17.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.17.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 7.16.1 to 7.17.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.17.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: typescript-eslint - dependency-name: "@typescript-eslint/parser" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: typescript-eslint ... Signed-off-by: dependabot[bot] --- package-lock.json | 98 ++++++++++++++++++++++------------------------- package.json | 4 +- 2 files changed, 47 insertions(+), 55 deletions(-) diff --git a/package-lock.json b/package-lock.json index e42c9b020452..3406cbc79c19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,8 +14,8 @@ "@iarna/toml": "3.0.0", "@types/ejs": "3.1.5", "@types/lodash": "4.17.6", - "@typescript-eslint/eslint-plugin": "7.16.1", - "@typescript-eslint/parser": "7.16.1", + "@typescript-eslint/eslint-plugin": "7.17.0", + "@typescript-eslint/parser": "7.17.0", "@yeoman/adapter": "1.4.0", "@yeoman/conflicter": "2.0.0", "@yeoman/namespace": "1.0.0", @@ -3210,16 +3210,15 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.16.1.tgz", - "integrity": "sha512-SxdPak/5bO0EnGktV05+Hq8oatjAYVY3Zh2bye9pGZy6+jwyR3LG3YKkV4YatlsgqXP28BTeVm9pqwJM96vf2A==", - "license": "MIT", + "version": "7.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.17.0.tgz", + "integrity": "sha512-pyiDhEuLM3PuANxH7uNYan1AaFs5XE0zw1hq69JBvGvE7gSuEoQl1ydtEe/XQeoC3GQxLXyOVa5kNOATgM638A==", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.16.1", - "@typescript-eslint/type-utils": "7.16.1", - "@typescript-eslint/utils": "7.16.1", - "@typescript-eslint/visitor-keys": "7.16.1", + "@typescript-eslint/scope-manager": "7.17.0", + "@typescript-eslint/type-utils": "7.17.0", + "@typescript-eslint/utils": "7.17.0", + "@typescript-eslint/visitor-keys": "7.17.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -3243,15 +3242,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.16.1.tgz", - "integrity": "sha512-u+1Qx86jfGQ5i4JjK33/FnawZRpsLxRnKzGE6EABZ40KxVT/vWsiZFEBBHjFOljmmV3MBYOHEKi0Jm9hbAOClA==", - "license": "BSD-2-Clause", - "dependencies": { - "@typescript-eslint/scope-manager": "7.16.1", - "@typescript-eslint/types": "7.16.1", - "@typescript-eslint/typescript-estree": "7.16.1", - "@typescript-eslint/visitor-keys": "7.16.1", + "version": "7.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.17.0.tgz", + "integrity": "sha512-puiYfGeg5Ydop8eusb/Hy1k7QmOU6X3nvsqCgzrB2K4qMavK//21+PzNE8qeECgNOIoertJPUC1SpegHDI515A==", + "dependencies": { + "@typescript-eslint/scope-manager": "7.17.0", + "@typescript-eslint/types": "7.17.0", + "@typescript-eslint/typescript-estree": "7.17.0", + "@typescript-eslint/visitor-keys": "7.17.0", "debug": "^4.3.4" }, "engines": { @@ -3271,13 +3269,12 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.16.1.tgz", - "integrity": "sha512-nYpyv6ALte18gbMz323RM+vpFpTjfNdyakbf3nsLvF43uF9KeNC289SUEW3QLZ1xPtyINJ1dIsZOuWuSRIWygw==", - "license": "MIT", + "version": "7.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.17.0.tgz", + "integrity": "sha512-0P2jTTqyxWp9HiKLu/Vemr2Rg1Xb5B7uHItdVZ6iAenXmPo4SZ86yOPCJwMqpCyaMiEHTNqizHfsbmCFT1x9SA==", "dependencies": { - "@typescript-eslint/types": "7.16.1", - "@typescript-eslint/visitor-keys": "7.16.1" + "@typescript-eslint/types": "7.17.0", + "@typescript-eslint/visitor-keys": "7.17.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3288,13 +3285,12 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.16.1.tgz", - "integrity": "sha512-rbu/H2MWXN4SkjIIyWcmYBjlp55VT+1G3duFOIukTNFxr9PI35pLc2ydwAfejCEitCv4uztA07q0QWanOHC7dA==", - "license": "MIT", + "version": "7.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.17.0.tgz", + "integrity": "sha512-XD3aaBt+orgkM/7Cei0XNEm1vwUxQ958AOLALzPlbPqb8C1G8PZK85tND7Jpe69Wualri81PLU+Zc48GVKIMMA==", "dependencies": { - "@typescript-eslint/typescript-estree": "7.16.1", - "@typescript-eslint/utils": "7.16.1", + "@typescript-eslint/typescript-estree": "7.17.0", + "@typescript-eslint/utils": "7.17.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -3315,10 +3311,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.1.tgz", - "integrity": "sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==", - "license": "MIT", + "version": "7.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.17.0.tgz", + "integrity": "sha512-a29Ir0EbyKTKHnZWbNsrc/gqfIBqYPwj3F2M+jWE/9bqfEHg0AMtXzkbUkOG6QgEScxh2+Pz9OXe11jHDnHR7A==", "engines": { "node": "^18.18.0 || >=20.0.0" }, @@ -3328,13 +3323,12 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.1.tgz", - "integrity": "sha512-0vFPk8tMjj6apaAZ1HlwM8w7jbghC8jc1aRNJG5vN8Ym5miyhTQGMqU++kuBFDNKe9NcPeZ6x0zfSzV8xC1UlQ==", - "license": "BSD-2-Clause", + "version": "7.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.17.0.tgz", + "integrity": "sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw==", "dependencies": { - "@typescript-eslint/types": "7.16.1", - "@typescript-eslint/visitor-keys": "7.16.1", + "@typescript-eslint/types": "7.17.0", + "@typescript-eslint/visitor-keys": "7.17.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3356,15 +3350,14 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.16.1.tgz", - "integrity": "sha512-WrFM8nzCowV0he0RlkotGDujx78xudsxnGMBHI88l5J8wEhED6yBwaSLP99ygfrzAjsQvcYQ94quDwI0d7E1fA==", - "license": "MIT", + "version": "7.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.17.0.tgz", + "integrity": "sha512-r+JFlm5NdB+JXc7aWWZ3fKSm1gn0pkswEwIYsrGPdsT2GjsRATAKXiNtp3vgAAO1xZhX8alIOEQnNMl3kbTgJw==", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "7.16.1", - "@typescript-eslint/types": "7.16.1", - "@typescript-eslint/typescript-estree": "7.16.1" + "@typescript-eslint/scope-manager": "7.17.0", + "@typescript-eslint/types": "7.17.0", + "@typescript-eslint/typescript-estree": "7.17.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3378,12 +3371,11 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.1.tgz", - "integrity": "sha512-Qlzzx4sE4u3FsHTPQAAQFJFNOuqtuY0LFrZHwQ8IHK705XxBiWOFkfKRWu6niB7hwfgnwIpO4jTC75ozW1PHWg==", - "license": "MIT", + "version": "7.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.17.0.tgz", + "integrity": "sha512-RVGC9UhPOCsfCdI9pU++K4nD7to+jTcMIbXTSOcrLqUEW6gF2pU1UUbYJKc9cvcRSK1UDeMJ7pdMxf4bhMpV/A==", "dependencies": { - "@typescript-eslint/types": "7.16.1", + "@typescript-eslint/types": "7.17.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { diff --git a/package.json b/package.json index ed27d2f283f6..980173628dcf 100644 --- a/package.json +++ b/package.json @@ -122,8 +122,8 @@ "@iarna/toml": "3.0.0", "@types/ejs": "3.1.5", "@types/lodash": "4.17.6", - "@typescript-eslint/eslint-plugin": "7.16.1", - "@typescript-eslint/parser": "7.16.1", + "@typescript-eslint/eslint-plugin": "7.17.0", + "@typescript-eslint/parser": "7.17.0", "@yeoman/adapter": "1.4.0", "@yeoman/conflicter": "2.0.0", "@yeoman/namespace": "1.0.0", From 2c6559435125dcf104b26bbcfa4c2de1dfd637a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 23:07:53 +0000 Subject: [PATCH 025/938] Bump type-fest from 4.22.1 to 4.23.0 Bumps [type-fest](https://github.com/sindresorhus/type-fest) from 4.22.1 to 4.23.0. - [Release notes](https://github.com/sindresorhus/type-fest/releases) - [Commits](https://github.com/sindresorhus/type-fest/compare/v4.22.1...v4.23.0) --- updated-dependencies: - dependency-name: type-fest dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index e42c9b020452..1e0fb533f17c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,7 +59,7 @@ "semver": "7.6.3", "simple-git": "3.25.0", "sort-keys": "5.0.0", - "type-fest": "4.22.1", + "type-fest": "4.23.0", "typescript": "5.4.5", "winston": "3.13.1", "yaml": "2.4.5", @@ -13547,10 +13547,9 @@ } }, "node_modules/type-fest": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.22.1.tgz", - "integrity": "sha512-9tHNEa0Ov81YOopiVkcCJVz5TM6AEQ+CHHjFIktqPnE3NV0AHIkx+gh9tiCl58m/66wWxkOC9eltpa75J4lQPA==", - "license": "(MIT OR CC0-1.0)", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.23.0.tgz", + "integrity": "sha512-ZiBujro2ohr5+Z/hZWHESLz3g08BBdrdLMieYFULJO+tWc437sn8kQsWLJoZErY8alNhxre9K4p3GURAG11n+w==", "engines": { "node": ">=16" }, diff --git a/package.json b/package.json index ed27d2f283f6..1677f35126e4 100644 --- a/package.json +++ b/package.json @@ -167,7 +167,7 @@ "semver": "7.6.3", "simple-git": "3.25.0", "sort-keys": "5.0.0", - "type-fest": "4.22.1", + "type-fest": "4.23.0", "typescript": "5.4.5", "winston": "3.13.1", "yaml": "2.4.5", From c35611c107a7bf42a1ce67c69d9117d891c2f3fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 01:18:48 +0000 Subject: [PATCH 026/938] Bump typescript-eslint in /generators/react/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 7.16.1 to 7.17.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.17.0/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index eed7ea406714..3203553a06cb 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -81,7 +81,7 @@ "ts-jest": "29.2.3", "ts-loader": "9.5.1", "typescript": "5.5.3", - "typescript-eslint": "7.16.1", + "typescript-eslint": "7.17.0", "webpack": "5.93.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", From a1ade4ab269950d1949f0bfa0bf7383507e06145 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 01:36:02 +0000 Subject: [PATCH 027/938] Bump typescript from 5.5.3 to 5.5.4 in /generators/react/resources Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.5.3 to 5.5.4. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.5.3...v5.5.4) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index 3203553a06cb..abdba6e9b93f 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -80,7 +80,7 @@ "thread-loader": "4.0.2", "ts-jest": "29.2.3", "ts-loader": "9.5.1", - "typescript": "5.5.3", + "typescript": "5.5.4", "typescript-eslint": "7.17.0", "webpack": "5.93.0", "webpack-cli": "5.1.4", From a454650dbdf29b6e387024e19c56f514a2209b7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 02:33:51 +0000 Subject: [PATCH 028/938] Bump vue-tsc from 2.0.26 to 2.0.28 in /generators/vue/resources Bumps [vue-tsc](https://github.com/vuejs/language-tools/tree/HEAD/packages/tsc) from 2.0.26 to 2.0.28. - [Release notes](https://github.com/vuejs/language-tools/releases) - [Changelog](https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/language-tools/commits/v2.0.28/packages/tsc) --- updated-dependencies: - dependency-name: vue-tsc dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 61b36e9d4821..c8590d9aac52 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -64,7 +64,7 @@ "vitest-sonar-reporter": "2.0.0", "vue-loader": "17.4.2", "vue-style-loader": "4.1.3", - "vue-tsc": "2.0.26", + "vue-tsc": "2.0.28", "webpack": "5.93.0", "webpack-bundle-analyzer": "4.10.2", "webpack-cli": "5.1.4", From 035d8da74a1d44efebb9b45708b69794be030d40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 03:01:22 +0000 Subject: [PATCH 029/938] Bump vitest from 2.0.3 to 2.0.4 in /generators/vue/resources Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 2.0.3 to 2.0.4. - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Commits](https://github.com/vitest-dev/vitest/commits/v2.0.4/packages/vitest) --- updated-dependencies: - dependency-name: vitest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index c8590d9aac52..e567dc881bff 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -60,7 +60,7 @@ "typescript": "5.5.3", "vite": "5.3.4", "vite-plugin-static-copy": "1.0.6", - "vitest": "2.0.3", + "vitest": "2.0.4", "vitest-sonar-reporter": "2.0.0", "vue-loader": "17.4.2", "vue-style-loader": "4.1.3", From dc26a76709ee262296be07000072fb8a8736cc69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 03:27:01 +0000 Subject: [PATCH 030/938] Bump jest-preset-angular Bumps the angular group in /generators/angular/resources with 1 update: [jest-preset-angular](https://github.com/thymikee/jest-preset-angular). Updates `jest-preset-angular` from 14.1.1 to 14.2.0 - [Release notes](https://github.com/thymikee/jest-preset-angular/releases) - [Changelog](https://github.com/thymikee/jest-preset-angular/blob/main/CHANGELOG.md) - [Commits](https://github.com/thymikee/jest-preset-angular/compare/v14.1.1...v14.2.0) --- updated-dependencies: - dependency-name: jest-preset-angular dependency-type: direct:development update-type: version-update:semver-minor dependency-group: angular ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 05a93370d856..58ddffda3bde 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -41,7 +41,7 @@ "jest": "29.7.0", "jest-date-mock": "1.0.10", "jest-junit": "16.0.0", - "jest-preset-angular": "14.1.1", + "jest-preset-angular": "14.2.0", "jest-sonar": "0.2.16", "merge-jsons-webpack-plugin": "2.0.1", "postcss-rtlcss": "5.3.0", From b68bc183289f91113ee0327bcb730125a7a5697b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 03:27:13 +0000 Subject: [PATCH 031/938] Bump typescript-eslint in /generators/angular/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.49 to 8.0.0-alpha.51. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/HEAD/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 05a93370d856..8d97d9ed21fa 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -48,7 +48,7 @@ "rimraf": "5.0.8", "ts-jest": "29.2.3", "typescript": "5.4.5", - "typescript-eslint": "8.0.0-alpha.49", + "typescript-eslint": "8.0.0-alpha.51", "webpack": "5.93.0", "webpack-bundle-analyzer": "4.10.2", "webpack-merge": "6.0.1", From c45e3549516ccbfaa8e319bf7de49b2a7f3daa77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 03:47:43 +0000 Subject: [PATCH 032/938] Bump typescript from 5.5.3 to 5.5.4 in /generators/vue/resources Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.5.3 to 5.5.4. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.5.3...v5.5.4) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index e567dc881bff..3c245d1201af 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -57,7 +57,7 @@ "sinon": "18.0.0", "terser-webpack-plugin": "5.3.10", "ts-loader": "9.5.1", - "typescript": "5.5.3", + "typescript": "5.5.4", "vite": "5.3.4", "vite-plugin-static-copy": "1.0.6", "vitest": "2.0.4", From c07cfcf4097032bc416f9a2ab99871d80f296df0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 08:55:49 +0000 Subject: [PATCH 033/938] Bump com.gradle.enterprise in /generators/server/resources Bumps com.gradle.enterprise from 3.17.5 to 3.17.6. --- updated-dependencies: - dependency-name: com.gradle.enterprise dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/server/resources/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/gradle/libs.versions.toml b/generators/server/resources/gradle/libs.versions.toml index 0575ab2998e4..5e8c4b238f37 100644 --- a/generators/server/resources/gradle/libs.versions.toml +++ b/generators/server/resources/gradle/libs.versions.toml @@ -29,7 +29,7 @@ spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.25.0' } gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.9.3' } -gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.17.5' } +gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.17.6' } common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '2.0.2' } From 07acb08533ddee83f37b64721dea958a78b895db Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 23 Jul 2024 10:14:34 -0300 Subject: [PATCH 034/938] react: update eslint to v9 --- generators/react/resources/package.json | 6 +++--- generators/react/templates/webpack/webpack.common.js.ejs | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index abdba6e9b93f..eea50d463582 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -29,7 +29,7 @@ "webstomp-client": "1.2.6" }, "devDependencies": { - "@eslint/js": "8.57.0", + "@eslint/js": "9.7.0", "@module-federation/utilities": "3.0.3-0", "@testing-library/react": "16.0.0", "@types/jest": "29.5.12", @@ -48,7 +48,7 @@ "cross-env": "7.0.3", "css-loader": "7.1.2", "css-minimizer-webpack-plugin": "7.0.0", - "eslint": "8.57.0", + "eslint": "9.7.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", "eslint-plugin-react": "7.35.0", @@ -81,7 +81,7 @@ "ts-jest": "29.2.3", "ts-loader": "9.5.1", "typescript": "5.5.4", - "typescript-eslint": "7.17.0", + "typescript-eslint": "8.0.0-alpha.51", "webpack": "5.93.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", diff --git a/generators/react/templates/webpack/webpack.common.js.ejs b/generators/react/templates/webpack/webpack.common.js.ejs index 9401cb4d4e46..df67c0b19ce6 100644 --- a/generators/react/templates/webpack/webpack.common.js.ejs +++ b/generators/react/templates/webpack/webpack.common.js.ejs @@ -128,7 +128,6 @@ return merge( }), new ESLintPlugin({ configType: 'flat', - eslintPath: 'eslint/use-at-your-own-risk', extensions: ['ts', 'tsx'], }), new ForkTsCheckerWebpackPlugin(), From 6ab317b435fa8778b1e2da6e64341d029b841248 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 23 Jul 2024 10:50:10 -0300 Subject: [PATCH 035/938] drop @typescript-eslint/ban-types rule --- generators/react/templates/eslint.config.js.jhi.react.ejs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/generators/react/templates/eslint.config.js.jhi.react.ejs b/generators/react/templates/eslint.config.js.jhi.react.ejs index 37229fa6d7a4..92fd6a9831d6 100644 --- a/generators/react/templates/eslint.config.js.jhi.react.ejs +++ b/generators/react/templates/eslint.config.js.jhi.react.ejs @@ -66,14 +66,6 @@ import react from 'eslint-plugin-react/configs/recommended.js'; '@typescript-eslint/restrict-template-expressions': 'off', '@typescript-eslint/restrict-plus-operands': 'off', '@typescript-eslint/no-floating-promises': 'off', - '@typescript-eslint/ban-types': [ - 'error', - { - types: { - Object: 'Use {} instead.', - }, - }, - ], '@typescript-eslint/interface-name-prefix': 'off', '@typescript-eslint/no-empty-function': 'off', '@typescript-eslint/unbound-method': 'off', From b7f0a8bf99f8bcc35b466329cfc91a26acdeb9e1 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 23 Jul 2024 09:39:49 -0300 Subject: [PATCH 036/938] don't override current package.json fields --- .../__snapshots__/generator.spec.ts.snap | 24 +++++++++---------- .../generators/bootstrap/generator.ts | 15 ++++++++---- .../bootstrap/templates/package.json.ejs | 4 ---- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/generators/javascript/generators/bootstrap/__snapshots__/generator.spec.ts.snap b/generators/javascript/generators/bootstrap/__snapshots__/generator.spec.ts.snap index 498e89996569..0e42ad79e019 100644 --- a/generators/javascript/generators/bootstrap/__snapshots__/generator.spec.ts.snap +++ b/generators/javascript/generators/bootstrap/__snapshots__/generator.spec.ts.snap @@ -9,17 +9,17 @@ exports[`generator - javascript:bootstrap customVersion-commonjs should match fi }, "package.json": { "contents": "{ - "name": "dasherizedBaseName", - "version": "0.0.0", - "description": "projectDescription", "private": true, - "license": "UNLICENSED", "dependencies": {}, "devDependencies": {}, "engines": { "node": "customVersion" }, "scripts": {}, + "name": "dasherizedBaseName", + "version": "0.0.0", + "description": "projectDescription", + "license": "UNLICENSED", "type": "commonjs" } ", @@ -37,15 +37,15 @@ exports[`generator - javascript:bootstrap packageJsonNodeEngine(false)-module sh }, "package.json": { "contents": "{ - "name": "dasherizedBaseName", - "version": "0.0.0", - "description": "projectDescription", "private": true, - "license": "UNLICENSED", "dependencies": {}, "devDependencies": {}, "engines": {}, "scripts": {}, + "name": "dasherizedBaseName", + "version": "0.0.0", + "description": "projectDescription", + "license": "UNLICENSED", "type": "module" } ", @@ -63,17 +63,17 @@ exports[`generator - javascript:bootstrap packageJsonNodeEngine(true) should mat }, "package.json": { "contents": "{ - "name": "dasherizedBaseName", - "version": "0.0.0", - "description": "projectDescription", "private": true, - "license": "UNLICENSED", "dependencies": {}, "devDependencies": {}, "engines": { "node": "^18.19.0 || >= 20.6.1" }, "scripts": {}, + "name": "dasherizedBaseName", + "version": "0.0.0", + "description": "projectDescription", + "license": "UNLICENSED", "type": "commonjs" } ", diff --git a/generators/javascript/generators/bootstrap/generator.ts b/generators/javascript/generators/bootstrap/generator.ts index 3c6066554771..770a25f06449 100644 --- a/generators/javascript/generators/bootstrap/generator.ts +++ b/generators/javascript/generators/bootstrap/generator.ts @@ -68,15 +68,20 @@ export default class BootstrapGenerator extends BaseApplicationGenerator { get postWriting() { return this.asPostWritingTaskGroup({ addPrettierDependencies({ application }) { - const { packageJsonNodeEngine, packageJsonType } = application; + const { packageJsonNodeEngine, packageJsonType, dasherizedBaseName, projectDescription } = application; + this.packageJson.defaults({ + name: dasherizedBaseName, + version: '0.0.0', + description: projectDescription, + license: 'UNLICENSED', + }); if (packageJsonType) { this.packageJson.merge({ type: packageJsonType }); } if (packageJsonNodeEngine) { - this.packageJson.merge({ - engines: { - node: typeof packageJsonNodeEngine === 'string' ? packageJsonNodeEngine : packageJson.engines.node, - }, + this.packageJson.set('engines', { + ...(this.packageJson.get('engines') ?? {}), + node: typeof packageJsonNodeEngine === 'string' ? packageJsonNodeEngine : packageJson.engines.node, }); } }, diff --git a/generators/javascript/generators/bootstrap/templates/package.json.ejs b/generators/javascript/generators/bootstrap/templates/package.json.ejs index f39db40aca7d..3bd2d4152ac0 100644 --- a/generators/javascript/generators/bootstrap/templates/package.json.ejs +++ b/generators/javascript/generators/bootstrap/templates/package.json.ejs @@ -17,11 +17,7 @@ limitations under the License. -%> { - "name": "<%= dasherizedBaseName %>", - "version": "0.0.0", - "description": "<%= projectDescription %>", "private": true, - "license": "UNLICENSED", "dependencies": {}, "devDependencies": {}, "engines": {}, From c7752430fc1a19ddf6c18d97ff941f116630c073 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 23 Jul 2024 10:04:30 -0300 Subject: [PATCH 037/938] add prettierFolders and addPrettierExtensions to prettier generator --- .../app/__snapshots__/generator.spec.ts.snap | 12 +++++-- generators/bootstrap-application/generator.ts | 15 ++++---- .../__snapshots__/generator.spec.ts.snap | 24 +++++++++++++ .../generators/prettier/generator.spec.ts | 2 +- .../generators/prettier/generator.ts | 34 ++++++++++++++++--- generators/javascript/types.d.ts | 2 ++ 6 files changed, 74 insertions(+), 15 deletions(-) diff --git a/generators/app/__snapshots__/generator.spec.ts.snap b/generators/app/__snapshots__/generator.spec.ts.snap index 41fca92f6e23..49bfe2247c41 100644 --- a/generators/app/__snapshots__/generator.spec.ts.snap +++ b/generators/app/__snapshots__/generator.spec.ts.snap @@ -213,6 +213,7 @@ exports[`generator - app with default config should match snapshot 1`] = ` "SERVER_TEST_SRC_DIR": "src/test/java/", "TEST_DIR": "src/test/", "VUE": "vue", + "addPrettierExtensions": [Function], "addSpringMilestoneRepository": false, "angularLocaleId": "en", "anyEntityHasRelationshipWithUser": false, @@ -722,7 +723,8 @@ exports[`generator - app with default config should match snapshot 1`] = ` "packageName": "com.mycompany.myapp", "pages": [], "prettierConfigFile": ".prettierrc", - "prettierExtensions": "md,json,yml,html,cjs,mjs,js,ts,tsx,css,scss,java", + "prettierExtensions": "md,json,yml,js,cjs,mjs,ts,cts,mts,java,html,css,scss", + "prettierFolders": ",**/", "prettierJava": undefined, "prettierTabWidth": 2, "prodDatabaseDriver": { @@ -825,6 +827,7 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "SERVER_TEST_SRC_DIR": "src/test/java/", "TEST_DIR": "src/test/", "VUE": "vue", + "addPrettierExtensions": [Function], "addSpringMilestoneRepository": false, "angularLocaleId": "en", "anyEntityHasRelationshipWithUser": false, @@ -1330,7 +1333,8 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "packageName": "com.mycompany.myapp", "pages": [], "prettierConfigFile": ".prettierrc", - "prettierExtensions": "md,json,yml,html,cjs,mjs,js,ts,tsx,css,scss,java", + "prettierExtensions": "md,json,yml,js,cjs,mjs,ts,cts,mts,java,html,css,scss", + "prettierFolders": ",**/", "prettierJava": undefined, "prettierTabWidth": 2, "prodDatabaseDriver": { @@ -1435,6 +1439,7 @@ exports[`generator - app with microservice should match snapshot 1`] = ` "SERVER_TEST_SRC_DIR": "src/test/java/", "TEST_DIR": "src/test/", "VUE": "vue", + "addPrettierExtensions": [Function], "addSpringMilestoneRepository": false, "anyEntityHasRelationshipWithUser": false, "applicationType": "microservice", @@ -1883,7 +1888,8 @@ exports[`generator - app with microservice should match snapshot 1`] = ` "packageName": "com.mycompany.myapp", "pages": [], "prettierConfigFile": ".prettierrc", - "prettierExtensions": "md,json,yml,html,java", + "prettierExtensions": "md,json,yml,js,cjs,mjs,ts,cts,mts,java", + "prettierFolders": ",**/", "prettierJava": undefined, "prettierTabWidth": 2, "prodDatabaseDriver": { diff --git a/generators/bootstrap-application/generator.ts b/generators/bootstrap-application/generator.ts index a4d7be482dc4..d57707b27b1d 100644 --- a/generators/bootstrap-application/generator.ts +++ b/generators/bootstrap-application/generator.ts @@ -69,12 +69,6 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera gatewayServicesApiAvailable: undefined, }); - applicationDefaults({ - useNpmWrapper: application => application.clientFrameworkAny && application.backendTypeJavaAny, - documentationArchiveUrl: ({ jhipsterVersion }) => - `${JHIPSTER_DOCUMENTATION_URL}${JHIPSTER_DOCUMENTATION_ARCHIVE_PATH}v${jhipsterVersion}`, - }); - let prettierExtensions = 'md,json,yml,html'; if (application.clientFrameworkAny) { prettierExtensions = `${prettierExtensions},cjs,mjs,js,ts,tsx,css,scss`; @@ -85,7 +79,14 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera if (!application.skipServer) { prettierExtensions = `${prettierExtensions},java`; } - application.prettierExtensions = prettierExtensions; + + applicationDefaults({ + // TODO remove prettierExtensions, moved to prettier generator + prettierExtensions, + useNpmWrapper: application => application.clientFrameworkAny && application.backendTypeJavaAny, + documentationArchiveUrl: ({ jhipsterVersion }) => + `${JHIPSTER_DOCUMENTATION_URL}${JHIPSTER_DOCUMENTATION_ARCHIVE_PATH}v${jhipsterVersion}`, + }); }, }); } diff --git a/generators/javascript/generators/prettier/__snapshots__/generator.spec.ts.snap b/generators/javascript/generators/prettier/__snapshots__/generator.spec.ts.snap index abc19a26cb1d..b4c3a4fd5c86 100644 --- a/generators/javascript/generators/prettier/__snapshots__/generator.spec.ts.snap +++ b/generators/javascript/generators/prettier/__snapshots__/generator.spec.ts.snap @@ -1,5 +1,11 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`generator - javascript:prettier fromInit(false) should compose with generators 1`] = ` +[ + "jhipster:javascript:bootstrap", +] +`; + exports[`generator - javascript:prettier fromInit(false) should match files snapshot 1`] = ` { ".prettierignore": { @@ -37,6 +43,12 @@ plugins: } `; +exports[`generator - javascript:prettier fromInit(true) should compose with generators 1`] = ` +[ + "jhipster:javascript:bootstrap", +] +`; + exports[`generator - javascript:prettier fromInit(true) should match files snapshot 1`] = ` { ".prettierignore": { @@ -78,6 +90,12 @@ plugins: } `; +exports[`generator - javascript:prettier monorepository(true)-monorepositoryRoot(false) should compose with generators 1`] = ` +[ + "jhipster:javascript:bootstrap", +] +`; + exports[`generator - javascript:prettier monorepository(true)-monorepositoryRoot(false) should match files snapshot 1`] = ` { ".prettierignore": { @@ -115,6 +133,12 @@ plugins: } `; +exports[`generator - javascript:prettier monorepository(true)-monorepositoryRoot(true) should compose with generators 1`] = ` +[ + "jhipster:javascript:bootstrap", +] +`; + exports[`generator - javascript:prettier monorepository(true)-monorepositoryRoot(true) should match files snapshot 1`] = ` { ".prettierignore": { diff --git a/generators/javascript/generators/prettier/generator.spec.ts b/generators/javascript/generators/prettier/generator.spec.ts index a24d503fda95..314d8625b2d2 100644 --- a/generators/javascript/generators/prettier/generator.spec.ts +++ b/generators/javascript/generators/prettier/generator.spec.ts @@ -52,7 +52,7 @@ describe(`generator - ${generator}`, () => { }); it('should compose with generators', () => { - expect(result.composedMockedGenerators).toMatchInlineSnapshot('[]'); + expect(result.composedMockedGenerators).toMatchSnapshot(); }); }); }); diff --git a/generators/javascript/generators/prettier/generator.ts b/generators/javascript/generators/prettier/generator.ts index 04533140e2b1..4fda149c7507 100644 --- a/generators/javascript/generators/prettier/generator.ts +++ b/generators/javascript/generators/prettier/generator.ts @@ -33,13 +33,16 @@ export default class PrettierGenerator extends BaseApplicationGenerator { await this.composeWithBlueprints(); } - if (!this.delegateToBlueprint && !this.options.fromInit) { - await this.dependsOnBootstrapApplication(); + if (!this.delegateToBlueprint) { + if (!this.options.fromInit) { + await this.dependsOnBootstrapApplication(); + } + await this.dependsOnJHipster('jhipster:javascript:bootstrap'); } } - get preparing() { - return this.asPreparingTaskGroup({ + get loading() { + return this.asLoadingTaskGroup({ loadNodeDependencies({ application }) { this.loadNodeDependencies(application.nodeDependencies, { prettier: packageJson.dependencies.prettier, @@ -47,6 +50,29 @@ export default class PrettierGenerator extends BaseApplicationGenerator { 'prettier-plugin-packagejson': packageJson.dependencies['prettier-plugin-packagejson'], }); }, + loadDefaults({ application, applicationDefaults }) { + applicationDefaults({ + prettierFolders: ',**/', + prettierExtensions: 'md,json,yml,js,cjs,mjs,ts,cts,mts', + }); + + application.addPrettierExtensions = (extensions: string[]) => { + const currentExtensions = application.prettierExtensions!.split(','); + const extensionsToAdd = extensions.filter(ext => !currentExtensions.includes(ext)); + if (extensionsToAdd.length > 0) { + application.prettierExtensions = `${application.prettierExtensions},${extensionsToAdd.join(',')}`; + } + }; + }, + }); + } + + get [BaseApplicationGenerator.LOADING]() { + return this.delegateTasksToBlueprint(() => this.loading); + } + + get preparing() { + return this.asPreparingTaskGroup({ source({ source }) { source.mergePrettierConfig = config => this.mergeDestinationYaml(this.prettierConfigFile, config); // `.prettierignore` file is only supported in the root of a project refer to https://github.com/prettier/prettier/issues/4081. diff --git a/generators/javascript/types.d.ts b/generators/javascript/types.d.ts index 5af8355d8a83..e93b90796c66 100644 --- a/generators/javascript/types.d.ts +++ b/generators/javascript/types.d.ts @@ -7,4 +7,6 @@ export type JavaScriptApplication = { packageJsonNodeEngine?: boolean | string; packageJsonType?: string; eslintConfigFile?: string; + + addPrettierExtensions?: (extensions: string[]) => void; }; From 2d8514fbf6c28524680752683cb87efc0c56a629 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 23 Jul 2024 10:05:45 -0300 Subject: [PATCH 038/938] use addPrettierExtensions --- generators/angular/generator.ts | 4 +++- generators/common/__snapshots__/generator.spec.js.snap | 2 +- generators/java/generators/bootstrap/generator.ts | 3 +++ generators/react/generator.js | 4 +++- generators/vue/generator.js | 2 ++ 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/generators/angular/generator.ts b/generators/angular/generator.ts index ddf2fdd3c917..d6ad1b473b28 100644 --- a/generators/angular/generator.ts +++ b/generators/angular/generator.ts @@ -88,13 +88,15 @@ export default class AngularGenerator extends BaseApplicationGenerator { get preparing() { return this.asPreparingTaskGroup({ - applicationDefauts({ applicationDefaults }) { + applicationDefauts({ application, applicationDefaults }) { applicationDefaults({ __override__: true, eslintConfigFile: app => `eslint.config.${app.packageJsonType === 'module' ? 'js' : 'mjs'}`, webappEnumerationsDir: app => `${app.clientSrcDir}app/entities/enumerations/`, angularLocaleId: app => app.nativeLanguageDefinition.angularLocale ?? defaultLanguage.angularLocale, }); + + application.addPrettierExtensions?.(['html', 'css', 'scss']); }, addNeedles({ source, application }) { source.addEntitiesToClient = param => { diff --git a/generators/common/__snapshots__/generator.spec.js.snap b/generators/common/__snapshots__/generator.spec.js.snap index fbf37e6dcf7f..82692ed55c2b 100644 --- a/generators/common/__snapshots__/generator.spec.js.snap +++ b/generators/common/__snapshots__/generator.spec.js.snap @@ -40,7 +40,7 @@ trim_trailing_whitespace = false }, ".lintstagedrc.cjs": { "contents": "module.exports = { - '{,**/}*.{md,json,yml,html,cjs,mjs,js,ts,tsx,css,scss,java}': ['prettier --write'], + '{,**/}*.{md,json,yml,js,cjs,mjs,ts,cts,mts}': ['prettier --write'], }; ", "stateCleared": "modified", diff --git a/generators/java/generators/bootstrap/generator.ts b/generators/java/generators/bootstrap/generator.ts index ddacd234e4f8..43b4af3ff2eb 100644 --- a/generators/java/generators/bootstrap/generator.ts +++ b/generators/java/generators/bootstrap/generator.ts @@ -75,6 +75,9 @@ export default class BootstrapGenerator extends BaseApplicationGenerator { get preparing() { return this.asPreparingTaskGroup({ + applicationDefaults({ application }) { + application.addPrettierExtensions?.(['java']); + }, prepareJavaApplication({ application, source }) { source.hasJavaProperty = (property: string) => application.javaProperties![property] !== undefined; source.hasJavaManagedProperty = (property: string) => application.javaManagedProperties![property] !== undefined; diff --git a/generators/react/generator.js b/generators/react/generator.js index 91d809b41142..55d93cbea4f9 100644 --- a/generators/react/generator.js +++ b/generators/react/generator.js @@ -90,7 +90,9 @@ export default class ReactGenerator extends BaseApplicationGenerator { get preparing() { return this.asPreparingTaskGroup({ - applicationDefauts({ applicationDefaults }) { + applicationDefauts({ application, applicationDefaults }) { + application.addPrettierExtensions?.(['html', 'tsx', 'css', 'scss']); + applicationDefaults({ __override__: true, eslintConfigFile: app => `eslint.config.${app.packageJsonType === 'module' ? 'js' : 'mjs'}`, diff --git a/generators/vue/generator.js b/generators/vue/generator.js index d2e78e361225..ac51200f40f0 100644 --- a/generators/vue/generator.js +++ b/generators/vue/generator.js @@ -71,6 +71,8 @@ export default class VueGenerator extends BaseApplicationGenerator { get preparing() { return this.asPreparingTaskGroup({ prepareForTemplates({ application, source }) { + application.addPrettierExtensions?.(['html', 'vue', 'css', 'scss']); + application.clientWebappDir = `${application.clientSrcDir}app/`; application.webappEnumerationsDir = `${application.clientWebappDir}shared/model/enumerations/`; application.clientSpecDir = `${application.clientTestDir}spec/`; From 33e6a32fdbd9548110b6f153c63851eaf87166f5 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 18 Jul 2024 16:49:32 -0300 Subject: [PATCH 039/938] update husky to v9.1.1 --- .../app/__snapshots__/generator.spec.ts.snap | 10 ++++++- .../__snapshots__/generator.spec.js.snap | 27 ++++++++++--------- generators/common/command.ts | 9 +------ generators/common/files.js | 6 ----- generators/common/generator.js | 24 +++-------------- generators/common/resources/package.json | 2 -- .../common/templates/.husky/pre-commit.ejs | 9 ------- .../common/templates/.lintstagedrc.cjs.ejs | 21 --------------- .../__snapshots__/generator.spec.ts.snap | 8 +++--- .../generators/husky/generator.spec.ts | 4 +-- .../javascript/generators/husky/generator.ts | 2 +- .../husky/templates/.husky/pre-commit.ejs | 5 +--- .../husky/templates/.lintstagedrc.cjs.ejs | 2 +- generators/javascript/resources/package.json | 2 +- .../jdl/__snapshots__/generator.spec.ts.snap | 2 +- 15 files changed, 38 insertions(+), 95 deletions(-) delete mode 100755 generators/common/templates/.husky/pre-commit.ejs delete mode 100644 generators/common/templates/.lintstagedrc.cjs.ejs diff --git a/generators/app/__snapshots__/generator.spec.ts.snap b/generators/app/__snapshots__/generator.spec.ts.snap index 49bfe2247c41..75173630f55b 100644 --- a/generators/app/__snapshots__/generator.spec.ts.snap +++ b/generators/app/__snapshots__/generator.spec.ts.snap @@ -27,9 +27,9 @@ Options: --skip-jhipster-dependencies Don't write jhipster dependencies to package.json. --creation-timestamp Project creation timestamp (used for reproducible builds) --jdl-store JDL store - --skip-commit-hook Skip adding husky commit hooks --prettier-tab-width Default tab width for prettier --monorepository Use monorepository + --skip-commit-hook Skip adding husky commit hooks --db Provide DB name for the application when skipping server side generation --incremental-changelog Creates incremental database changelogs --skip-user-management Skip the user management module during app generation @@ -720,6 +720,8 @@ exports[`generator - app with default config should match snapshot 1`] = ` "packageName": "com.mycompany.myapp.web.rest.vm", }, ], + "packageJsonNodeEngine": undefined, + "packageJsonType": "commonjs", "packageName": "com.mycompany.myapp", "pages": [], "prettierConfigFile": ".prettierrc", @@ -1330,6 +1332,8 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "packageName": "com.mycompany.myapp.web.rest.vm", }, ], + "packageJsonNodeEngine": undefined, + "packageJsonType": "commonjs", "packageName": "com.mycompany.myapp", "pages": [], "prettierConfigFile": ".prettierrc", @@ -1836,6 +1840,8 @@ exports[`generator - app with microservice should match snapshot 1`] = ` }, "nodeDependencies": { "concurrently": "CONCURRENTLY_VERSION", + "eslint-config-prettier": "ESLINT_CONFIG_PRETTIER_VERSION", + "eslint-plugin-prettier": "ESLINT_PLUGIN_PRETTIER_VERSION", "husky": "HUSKY_VERSION", "lint-staged": "LINT_STAGED_VERSION", "npm": "NPM_VERSION", @@ -1885,6 +1891,8 @@ exports[`generator - app with microservice should match snapshot 1`] = ` "packageName": "com.mycompany.myapp.web.rest.vm", }, ], + "packageJsonNodeEngine": undefined, + "packageJsonType": "commonjs", "packageName": "com.mycompany.myapp", "pages": [], "prettierConfigFile": ".prettierrc", diff --git a/generators/common/__snapshots__/generator.spec.js.snap b/generators/common/__snapshots__/generator.spec.js.snap index 82692ed55c2b..61635a011280 100644 --- a/generators/common/__snapshots__/generator.spec.js.snap +++ b/generators/common/__snapshots__/generator.spec.js.snap @@ -30,11 +30,7 @@ trim_trailing_whitespace = false "stateCleared": "modified", }, ".husky/pre-commit": { - "contents": "#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - - -"$(dirname "$0")/../npmw" exec --no-install lint-staged + "contents": "lint-staged ", "stateCleared": "modified", }, @@ -111,20 +107,27 @@ This application was generated using JHipster JHIPSTER_VERSION, you can find doc }, "package.json": { "contents": "{ - "config": { - "default_environment": "prod" - }, + "private": true, + "dependencies": {}, "devDependencies": { "generator-jhipster": "JHIPSTER_VERSION", - "husky": "HUSKY_VERSION", - "lint-staged": "LINT_STAGED_VERSION", "prettier": "PRETTIER_VERSION", "prettier-plugin-packagejson": "PRETTIER_PLUGIN_PACKAGEJSON_VERSION", - "prettier-plugin-java": "PRETTIER_PLUGIN_JAVA_VERSION" + "husky": "HUSKY_VERSION", + "lint-staged": "LINT_STAGED_VERSION" }, + "engines": {}, "scripts": { "prepare": "husky" - } + }, + "config": { + "default_environment": "prod" + }, + "name": "jhipster", + "version": "0.0.0", + "description": "Description for JHipster", + "license": "UNLICENSED", + "type": "commonjs" } ", "stateCleared": "modified", diff --git a/generators/common/command.ts b/generators/common/command.ts index ad3ac009f69a..ecec82f73785 100644 --- a/generators/common/command.ts +++ b/generators/common/command.ts @@ -20,13 +20,6 @@ import { JHipsterCommandDefinition } from '../base/api.js'; import { GENERATOR_BOOTSTRAP_APPLICATION_BASE } from '../generator-list.js'; const command: JHipsterCommandDefinition = { - options: { - skipCommitHook: { - description: 'Skip adding husky commit hooks', - type: Boolean, - scope: 'storage', - }, - }, configs: { defaultEnvironment: { description: 'Default environment for the application', @@ -40,7 +33,7 @@ const command: JHipsterCommandDefinition = { scope: 'storage', }, }, - import: [GENERATOR_BOOTSTRAP_APPLICATION_BASE, 'jhipster:javascript:prettier'], + import: [GENERATOR_BOOTSTRAP_APPLICATION_BASE, 'jhipster:javascript:prettier', 'jhipster:javascript:husky'], }; export default command; diff --git a/generators/common/files.js b/generators/common/files.js index 860040a65100..2faecc9ff2f9 100644 --- a/generators/common/files.js +++ b/generators/common/files.js @@ -32,12 +32,6 @@ export const commonFiles = { templates: ['sonar-project.properties'], }, ], - commitHooks: [ - { - condition: generator => !generator.skipCommitHook, - templates: ['.lintstagedrc.cjs', '.husky/pre-commit'], - }, - ], }; export function writeFiles() { diff --git a/generators/common/generator.js b/generators/common/generator.js index 8733e4100cba..32282865fb36 100644 --- a/generators/common/generator.js +++ b/generators/common/generator.js @@ -79,6 +79,9 @@ export default class CommonGenerator extends BaseApplicationGenerator { return this.asComposingTaskGroup({ async composing() { await this.composeWithJHipster('jhipster:javascript:prettier'); + if (!this.jhipsterConfig.skipCommitHook) { + await this.composeWithJHipster('jhipster:javascript:husky'); + } }, }); } @@ -225,27 +228,6 @@ export default class CommonGenerator extends BaseApplicationGenerator { }, }); }, - addCommitHookDependencies({ application }) { - if (application.skipCommitHook) return; - this.packageJson.merge({ - scripts: { - prepare: 'husky', - }, - devDependencies: { - husky: application.nodeDependencies.husky, - 'lint-staged': application.nodeDependencies['lint-staged'], - prettier: application.nodeDependencies.prettier, - 'prettier-plugin-packagejson': application.nodeDependencies['prettier-plugin-packagejson'], - }, - }); - if (application.backendTypeJavaAny) { - this.packageJson.merge({ - devDependencies: { - 'prettier-plugin-java': application.nodeDependencies['prettier-plugin-java'], - }, - }); - } - }, }); } diff --git a/generators/common/resources/package.json b/generators/common/resources/package.json index e5d4bff5d8a2..3a29190ba942 100644 --- a/generators/common/resources/package.json +++ b/generators/common/resources/package.json @@ -1,8 +1,6 @@ { "devDependencies": { "concurrently": "8.2.2", - "husky": "9.0.11", - "lint-staged": "15.2.7", "npm": "10.8.2", "wait-on": "7.2.0" } diff --git a/generators/common/templates/.husky/pre-commit.ejs b/generators/common/templates/.husky/pre-commit.ejs deleted file mode 100755 index 96421e83b237..000000000000 --- a/generators/common/templates/.husky/pre-commit.ejs +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - - -<%_ if (useNpmWrapper) { _%> -"$(dirname "$0")/../npmw" exec --no-install lint-staged -<%_ } else { _%> -npx --no-install lint-staged -<%_ } _%> diff --git a/generators/common/templates/.lintstagedrc.cjs.ejs b/generators/common/templates/.lintstagedrc.cjs.ejs deleted file mode 100644 index d87d1d08e925..000000000000 --- a/generators/common/templates/.lintstagedrc.cjs.ejs +++ /dev/null @@ -1,21 +0,0 @@ -<%# - Copyright 2013-2024 the original author or authors from the JHipster project. - - This file is part of the JHipster project, see https://www.jhipster.tech/ - for more information. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. --%> -module.exports = { - '{,**/}*.{<%= prettierExtensions %>}': ['prettier --write'], -}; diff --git a/generators/javascript/generators/husky/__snapshots__/generator.spec.ts.snap b/generators/javascript/generators/husky/__snapshots__/generator.spec.ts.snap index 81c4151375dd..82daa45ae1eb 100644 --- a/generators/javascript/generators/husky/__snapshots__/generator.spec.ts.snap +++ b/generators/javascript/generators/husky/__snapshots__/generator.spec.ts.snap @@ -5,15 +5,13 @@ exports[`generator - javascript:husky skipCommitHook(false) should call source s exports[`generator - javascript:husky skipCommitHook(false) should match files snapshot 1`] = ` { ".husky/pre-commit": { - "contents": "#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -npx --no-install lint-staged", + "contents": "lint-staged +", "stateCleared": "modified", }, ".lintstagedrc.cjs": { "contents": "module.exports = { - '{,src/**/,webpack/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}': ['prettier --write'], + '{PRETTIER_FOLDERS}*.{PRETTIER_EXTENSIONS}': ['prettier --write'], }; ", "stateCleared": "modified", diff --git a/generators/javascript/generators/husky/generator.spec.ts b/generators/javascript/generators/husky/generator.spec.ts index 770e6cc1e377..6e8615121907 100644 --- a/generators/javascript/generators/husky/generator.spec.ts +++ b/generators/javascript/generators/husky/generator.spec.ts @@ -41,7 +41,7 @@ describe(`generator - ${generator}`, () => { .withMockedJHipsterGenerators() .withMockedSource() .withMockedNodeDependencies() - .withSharedApplication({}) + .withSharedApplication({ prettierExtensions: 'PRETTIER_EXTENSIONS', prettierFolders: 'PRETTIER_FOLDERS' }) .withJHipsterConfig(config); }); @@ -54,7 +54,7 @@ describe(`generator - ${generator}`, () => { }); it('should compose with generators', () => { - expect(result.composedMockedGenerators).toMatchObject(expect.arrayContaining(['jhipster:javascript:bootstrap'])); + expect(result.composedMockedGenerators).toMatchObject(['jhipster:javascript:prettier'] as any); }); }); } diff --git a/generators/javascript/generators/husky/generator.ts b/generators/javascript/generators/husky/generator.ts index c1055a723ff2..f751c7b713f5 100644 --- a/generators/javascript/generators/husky/generator.ts +++ b/generators/javascript/generators/husky/generator.ts @@ -29,7 +29,7 @@ export default class HuskyGenerator extends BaseApplicationGenerator { } if (!this.delegateToBlueprint) { - await this.dependsOnJHipster('jhipster:javascript:bootstrap'); + await this.dependsOnJHipster('jhipster:javascript:prettier'); } } diff --git a/generators/javascript/generators/husky/templates/.husky/pre-commit.ejs b/generators/javascript/generators/husky/templates/.husky/pre-commit.ejs index c70c608e786c..c27d8893a994 100755 --- a/generators/javascript/generators/husky/templates/.husky/pre-commit.ejs +++ b/generators/javascript/generators/husky/templates/.husky/pre-commit.ejs @@ -1,4 +1 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -npx --no-install lint-staged \ No newline at end of file +lint-staged diff --git a/generators/javascript/generators/husky/templates/.lintstagedrc.cjs.ejs b/generators/javascript/generators/husky/templates/.lintstagedrc.cjs.ejs index 4ae14f966d2e..31cc54366c92 100644 --- a/generators/javascript/generators/husky/templates/.lintstagedrc.cjs.ejs +++ b/generators/javascript/generators/husky/templates/.lintstagedrc.cjs.ejs @@ -17,5 +17,5 @@ limitations under the License. -%> module.exports = { - '{,src/**/,webpack/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}': ['prettier --write'], + '{<%= prettierFolders %>}*.{<%= prettierExtensions %>}': ['prettier --write'], }; diff --git a/generators/javascript/resources/package.json b/generators/javascript/resources/package.json index 48b53a677e1c..138f05e8826b 100644 --- a/generators/javascript/resources/package.json +++ b/generators/javascript/resources/package.json @@ -2,7 +2,7 @@ "dependencies": { "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", - "husky": "9.0.11", + "husky": "9.1.1", "lint-staged": "15.2.7" } } diff --git a/generators/jdl/__snapshots__/generator.spec.ts.snap b/generators/jdl/__snapshots__/generator.spec.ts.snap index 68fe9f049134..491f271792a8 100644 --- a/generators/jdl/__snapshots__/generator.spec.ts.snap +++ b/generators/jdl/__snapshots__/generator.spec.ts.snap @@ -190,8 +190,8 @@ Options: --skip-jhipster-dependencies Don't write jhipster dependencies to package.json. --creation-timestamp Project creation timestamp (used for reproducible builds) --jdl-store JDL store - --skip-commit-hook Skip adding husky commit hooks --prettier-tab-width Default tab width for prettier + --skip-commit-hook Skip adding husky commit hooks --db Provide DB name for the application when skipping server side generation --incremental-changelog Creates incremental database changelogs --recreate-initial-changelog Recreate the initial database changelog based on the current config From cd1eb59531cc94b1e603dcb8d30bb4213a827d64 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 23 Jul 2024 11:01:29 -0300 Subject: [PATCH 040/938] eslint adjusts --- .../src/main/webapp/app/config/axios-interceptor.ts.ejs | 4 ++-- .../src/main/webapp/app/config/notification-middleware.ts.ejs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/generators/react/templates/src/main/webapp/app/config/axios-interceptor.ts.ejs b/generators/react/templates/src/main/webapp/app/config/axios-interceptor.ts.ejs index 35ff5ac04d3c..91c45fa0027e 100644 --- a/generators/react/templates/src/main/webapp/app/config/axios-interceptor.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/config/axios-interceptor.ts.ejs @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. -%> -import axios from 'axios'; +import axios, { type AxiosError } from 'axios'; import { Storage } from 'react-jhipster'; const TIMEOUT = 1 * 60 * 1000; @@ -34,7 +34,7 @@ const setupAxiosInterceptors = onUnauthenticated => { return config; }; const onResponseSuccess = response => response; - const onResponseError = err => { + const onResponseError = (err: AxiosError) => { const status = err.status || (err.response ? err.response.status : 0); if (status === 401) { onUnauthenticated(); diff --git a/generators/react/templates/src/main/webapp/app/config/notification-middleware.ts.ejs b/generators/react/templates/src/main/webapp/app/config/notification-middleware.ts.ejs index 6f326b9ce4e1..10560acdaa44 100644 --- a/generators/react/templates/src/main/webapp/app/config/notification-middleware.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/config/notification-middleware.ts.ejs @@ -57,6 +57,7 @@ const getFieldErrorsTosts = (fieldErrors: FieldErrorVM[]): TostMessage[] => <%_ } _%> }); +// eslint-disable-next-line complexity export default () => next => action => { const { error, payload } = action; From 56992d50916a8a6c231f187d96c9c310350334cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 00:42:48 +0000 Subject: [PATCH 041/938] Bump mysql from 9.0.0 to 9.0.1 in /generators/server/resources Bumps mysql from 9.0.0 to 9.0.1. --- updated-dependencies: - dependency-name: mysql dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/server/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile index 309c918e0b26..66d1bb29ffa7 100644 --- a/generators/server/resources/Dockerfile +++ b/generators/server/resources/Dockerfile @@ -16,7 +16,7 @@ LABEL ALIAS=postgresql FROM quay.io/keycloak/keycloak:25.0.1 LABEL ALIAS=keycloak -FROM mysql:9.0.0 +FROM mysql:9.0.1 FROM mariadb:11.4.2 From b6d861710003cb0a1aa0cdc0bdfb6883ebe62ecb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 00:42:55 +0000 Subject: [PATCH 042/938] Bump neo4j from 5.21.2 to 5.22.0 in /generators/server/resources Bumps neo4j from 5.21.2 to 5.22.0. --- updated-dependencies: - dependency-name: neo4j dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/server/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile index 309c918e0b26..962275e340cf 100644 --- a/generators/server/resources/Dockerfile +++ b/generators/server/resources/Dockerfile @@ -31,7 +31,7 @@ FROM cassandra:5.0 FROM mcr.microsoft.com/mssql/server:2019-CU16-GDR1-ubuntu-20.04 LABEL ALIAS=mssql -FROM neo4j:5.21.2 +FROM neo4j:5.22.0 FROM hazelcast/management-center:5.4.1 LABEL ALIAS=hazelcast From e7a6da0b0d96e3c711dbb1609b01b3525780d379 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 01:31:56 +0000 Subject: [PATCH 043/938] Bump typescript-eslint in /generators/react/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.51 to 8.0.0-alpha.52. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/HEAD/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index eea50d463582..765d434c5d91 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -81,7 +81,7 @@ "ts-jest": "29.2.3", "ts-loader": "9.5.1", "typescript": "5.5.4", - "typescript-eslint": "8.0.0-alpha.51", + "typescript-eslint": "8.0.0-alpha.52", "webpack": "5.93.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", From 51af1eea0cff7d42b66363503878416adca393e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 01:32:13 +0000 Subject: [PATCH 044/938] Bump sass-loader from 14.2.1 to 15.0.0 in /generators/react/resources Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 14.2.1 to 15.0.0. - [Release notes](https://github.com/webpack-contrib/sass-loader/releases) - [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/sass-loader/compare/v14.2.1...v15.0.0) --- updated-dependencies: - dependency-name: sass-loader dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index eea50d463582..a16113a8b4c3 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -70,7 +70,7 @@ "redux-mock-store": "1.5.4", "rimraf": "5.0.8", "sass": "1.77.8", - "sass-loader": "14.2.1", + "sass-loader": "15.0.0", "simple-progress-webpack-plugin": "2.0.0", "sinon": "18.0.0", "source-map-loader": "5.0.0", From 5bca204c9262ecaf95a922320eefc16490cfc94e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 02:53:35 +0000 Subject: [PATCH 045/938] Bump @vitejs/plugin-vue from 5.0.5 to 5.1.0 in /generators/vue/resources Bumps [@vitejs/plugin-vue](https://github.com/vitejs/vite-plugin-vue/tree/HEAD/packages/plugin-vue) from 5.0.5 to 5.1.0. - [Release notes](https://github.com/vitejs/vite-plugin-vue/releases) - [Changelog](https://github.com/vitejs/vite-plugin-vue/blob/main/packages/plugin-vue/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite-plugin-vue/commits/plugin-vue@5.1.0/packages/plugin-vue) --- updated-dependencies: - dependency-name: "@vitejs/plugin-vue" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 3c245d1201af..beee46f5685d 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -27,7 +27,7 @@ "@tsconfig/node18": "18.2.4", "@types/node": "20.11.25", "@types/sinon": "17.0.3", - "@vitejs/plugin-vue": "5.0.5", + "@vitejs/plugin-vue": "5.1.0", "@vue/eslint-config-prettier": "9.0.0", "@vue/eslint-config-typescript": "13.0.0", "@vue/test-utils": "2.4.6", From 981dc1a7ad431b821a5ca5cade0992a1b20c70ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 02:53:50 +0000 Subject: [PATCH 046/938] Bump sass-loader from 14.2.1 to 15.0.0 in /generators/vue/resources Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 14.2.1 to 15.0.0. - [Release notes](https://github.com/webpack-contrib/sass-loader/releases) - [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/sass-loader/compare/v14.2.1...v15.0.0) --- updated-dependencies: - dependency-name: sass-loader dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 3c245d1201af..7209d58c9958 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -53,7 +53,7 @@ "postcss-url": "10.1.3", "rimraf": "5.0.8", "sass": "1.77.8", - "sass-loader": "14.2.1", + "sass-loader": "15.0.0", "sinon": "18.0.0", "terser-webpack-plugin": "5.3.10", "ts-loader": "9.5.1", From 71a2183a2484530c0e5306781389d10bd7f4ecb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 04:01:51 +0000 Subject: [PATCH 047/938] Bump typescript-eslint in /generators/angular/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.51 to 8.0.0-alpha.52. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/HEAD/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index f52102947225..990f3ad5e1ae 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -48,7 +48,7 @@ "rimraf": "5.0.8", "ts-jest": "29.2.3", "typescript": "5.4.5", - "typescript-eslint": "8.0.0-alpha.51", + "typescript-eslint": "8.0.0-alpha.52", "webpack": "5.93.0", "webpack-bundle-analyzer": "4.10.2", "webpack-merge": "6.0.1", From a79bc3382f0101a6c944047b1a3c2bbcd8c434d2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:49:14 +0000 Subject: [PATCH 048/938] chore(deps): update dependency node to v20.16.0 --- generators/init/resources/.node-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/init/resources/.node-version b/generators/init/resources/.node-version index 119f15a0aa05..593cb75bc5c2 100644 --- a/generators/init/resources/.node-version +++ b/generators/init/resources/.node-version @@ -1 +1 @@ -20.15.1 \ No newline at end of file +20.16.0 \ No newline at end of file From e64f14cd243f6a2274dbc6b8af8490eef193ab0f Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Wed, 24 Jul 2024 11:50:30 -0300 Subject: [PATCH 049/938] adjusts to cypress eslint --- .../cypress/templates/eslint.config.js.jhi.cypress.ejs | 4 ++-- .../src/test/javascript/cypress/plugins/index.ts.ejs | 6 ++++-- .../src/test/javascript/cypress/support/account.ts.ejs | 1 + .../src/test/javascript/cypress/support/management.ts.ejs | 1 + .../src/test/javascript/cypress/support/oauth2.ts.ejs | 1 + 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/generators/cypress/templates/eslint.config.js.jhi.cypress.ejs b/generators/cypress/templates/eslint.config.js.jhi.cypress.ejs index 41c496ee2eb7..f905b2dd35a8 100644 --- a/generators/cypress/templates/eslint.config.js.jhi.cypress.ejs +++ b/generators/cypress/templates/eslint.config.js.jhi.cypress.ejs @@ -21,7 +21,7 @@ import cypress from 'eslint-plugin-cypress/flat'; <&_ } -&> <&_ if (fragment.configSection) { -&> { - files: ['<%- this.relativeDir(clientRootDir, cypressDir) %>**/*.cy.ts'], + files: ['<%- this.relativeDir(clientRootDir, cypressDir) %>**/*.ts'], extends: [...tseslint.configs.recommendedTypeChecked, cypress.configs.recommended], languageOptions: { parserOptions: { @@ -34,8 +34,8 @@ import cypress from 'eslint-plugin-cypress/flat'; '@typescript-eslint/no-unsafe-assignment': 'warn', '@typescript-eslint/no-unsafe-call': 'warn', '@typescript-eslint/no-unsafe-member-access': 'warn', - '@typescript-eslint/unbound-method': 'warn', '@typescript-eslint/no-unused-vars': 'warn', + '@typescript-eslint/unbound-method': 'warn', }, }, <&_ } -&> diff --git a/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs b/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs index 9fb8cc994b51..801c9195e29b 100644 --- a/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs +++ b/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs @@ -33,7 +33,7 @@ import { existsSync, mkdirSync, writeFileSync } from 'fs'; import { lighthouse, pa11y, prepareAudit } from 'cypress-audit'; <%_ } _%> -export default async (on: Cypress.PluginEvents, config: Cypress.PluginConfigOptions) => { +export default <% if (cypressCoverage) { %>async <% } %>(on: Cypress.PluginEvents, config: Cypress.PluginConfigOptions) => { on('before:browser:launch', (browser, launchOptions) => { <%_ if (cypressAudit) { _%> prepareAudit(launchOptions); @@ -60,7 +60,9 @@ export default async (on: Cypress.PluginEvents, config: Cypress.PluginConfigOpti on('task', { lighthouse: lighthouse(async (lighthouseReport) => { const { default: ReportGenerator } = await import('lighthouse/report/generator/report-generator'); - !existsSync('<%= cypressTemporaryDir %>') && mkdirSync('<%= cypressTemporaryDir %>', { recursive: true }); + if (!existsSync('<%= cypressTemporaryDir %>')) { + mkdirSync('<%= cypressTemporaryDir %>', { recursive: true }); + } writeFileSync('<%= cypressTemporaryDir %>lhreport.html', ReportGenerator.generateReport(lighthouseReport.lhr, 'html')); }), pa11y: pa11y(), diff --git a/generators/cypress/templates/src/test/javascript/cypress/support/account.ts.ejs b/generators/cypress/templates/src/test/javascript/cypress/support/account.ts.ejs index da5d3682b65d..769d6e2b9ede 100644 --- a/generators/cypress/templates/src/test/javascript/cypress/support/account.ts.ejs +++ b/generators/cypress/templates/src/test/javascript/cypress/support/account.ts.ejs @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-namespace */ export type Account = Record; Cypress.Commands.add('getAccount', () => { diff --git a/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs b/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs index 4e4612249011..9589aeb70f2a 100644 --- a/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs +++ b/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs @@ -18,6 +18,7 @@ -%> /* eslint-disable @typescript-eslint/no-namespace */ /* eslint-disable @typescript-eslint/no-use-before-define */ +/* eslint-disable @typescript-eslint/no-unsafe-return */ Cypress.Commands.add('getManagementInfo', () => { return cy.request({ diff --git a/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs b/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs index eb3d3334ba8c..19b00403f219 100644 --- a/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs +++ b/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs @@ -16,6 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. -%> +/* eslint-disable @typescript-eslint/no-namespace */ // eslint-disable-next-line spaced-comment /// From cc32dc994172c26acdd3035d18b43e111e55e4dc Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Wed, 24 Jul 2024 11:50:58 -0300 Subject: [PATCH 050/938] adjusts to eslint.config base template --- .../generators/eslint/__snapshots__/generator.spec.ts.snap | 2 -- .../generators/eslint/templates/eslint.config.js.jhi.ejs | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generators/javascript/generators/eslint/__snapshots__/generator.spec.ts.snap b/generators/javascript/generators/eslint/__snapshots__/generator.spec.ts.snap index 7c67f1afea45..4218eeab3872 100644 --- a/generators/javascript/generators/eslint/__snapshots__/generator.spec.ts.snap +++ b/generators/javascript/generators/eslint/__snapshots__/generator.spec.ts.snap @@ -10,7 +10,6 @@ exports[`generator - javascript:eslint with defaults options should match files "eslint.config.mjs": { "contents": "import globals from 'globals'; import prettier from 'eslint-plugin-prettier/recommended'; - // jhipster-needle-eslint-add-import - JHipster will add additional import here export default [ @@ -21,7 +20,6 @@ export default [ }, }, }, - // jhipster-needle-eslint-add-config - JHipster will add additional config here prettier, ]; diff --git a/generators/javascript/generators/eslint/templates/eslint.config.js.jhi.ejs b/generators/javascript/generators/eslint/templates/eslint.config.js.jhi.ejs index 8b7515f3078a..b69dbce80259 100644 --- a/generators/javascript/generators/eslint/templates/eslint.config.js.jhi.ejs +++ b/generators/javascript/generators/eslint/templates/eslint.config.js.jhi.ejs @@ -21,6 +21,7 @@ fragments.registerSections({ importsSection: 0, configSection: 0, + endConfigSection: 0, }); _&> <%_ if (typescriptEslint) { _%> @@ -32,7 +33,7 @@ import prettier from 'eslint-plugin-prettier/recommended'; <%_ if (typescriptEslint) { _%> import tseslint from 'typescript-eslint'; <%_ } _%> -<&- fragments.importsSection() &> +<&- fragments.importsSection() -&> // jhipster-needle-eslint-add-import - JHipster will add additional import here <%_ if (typescriptEslint) { _%> @@ -47,9 +48,10 @@ export default [ }, }, }, -<&- fragments.configSection() &> +<&- fragments.configSection() -&> // jhipster-needle-eslint-add-config - JHipster will add additional config here prettier, +<&- fragments.endConfigSection() -&> <%_ if (typescriptEslint) { _%> ); <%_ } else { _%> From 26fcb329ba0124452782963afa9fc0121ef2637f Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Wed, 24 Jul 2024 14:59:44 -0300 Subject: [PATCH 051/938] apply eslint to templates --- generators/vue/templates/vite.config.mts.ejs | 2 ++ generators/vue/templates/webpack/config.js.ejs | 4 +--- generators/vue/templates/webpack/vue.utils.js.ejs | 2 -- generators/vue/templates/webpack/webpack.dev.js.ejs | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/generators/vue/templates/vite.config.mts.ejs b/generators/vue/templates/vite.config.mts.ejs index 1cbb57c79cc3..dc5d03e82095 100644 --- a/generators/vue/templates/vite.config.mts.ejs +++ b/generators/vue/templates/vite.config.mts.ejs @@ -31,7 +31,9 @@ import { viteStaticCopy } from 'vite-plugin-static-copy'; <%_ if (microfrontend) { _%> import federation from "@originjs/vite-plugin-federation"; + <%_ if (applicationTypeGateway) { _%> const sharedAppVersion = '0.0.0'; + <%_ } _%> <%_ } _%> const getFileFromRepo = (file: string) => diff --git a/generators/vue/templates/webpack/config.js.ejs b/generators/vue/templates/webpack/config.js.ejs index c7b3770c7655..fe10699613d9 100644 --- a/generators/vue/templates/webpack/config.js.ejs +++ b/generators/vue/templates/webpack/config.js.ejs @@ -1,7 +1,5 @@ 'use strict'; -const path = require('path'); - <%_ if (buildToolUnknown) { _%> const packageJson = require('./../package.json'); <%_ } _%> @@ -12,7 +10,7 @@ module.exports = { version: packageJson.version, <%_ } else { _%> // APP_VERSION is passed as an environment variable from the Gradle / Maven build tasks. - version: process.env.hasOwnProperty('APP_VERSION') ? process.env.APP_VERSION : 'DEV', + version: process.env.APP_VERSION || 'DEV', <%_ } _%> dev: { diff --git a/generators/vue/templates/webpack/vue.utils.js.ejs b/generators/vue/templates/webpack/vue.utils.js.ejs index 4eed5e09c16e..e0d751465e27 100644 --- a/generators/vue/templates/webpack/vue.utils.js.ejs +++ b/generators/vue/templates/webpack/vue.utils.js.ejs @@ -1,9 +1,7 @@ 'use strict'; -const path = require('path'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const sass = require('sass'); -const packageConfig = require('../package.json'); const config = require('./config'); const sourceMapEnabled = production => (production ? config.build.productionSourceMap : config.dev.cssSourceMap); diff --git a/generators/vue/templates/webpack/webpack.dev.js.ejs b/generators/vue/templates/webpack/webpack.dev.js.ejs index c0785f723946..56341dd4d9a9 100644 --- a/generators/vue/templates/webpack/webpack.dev.js.ejs +++ b/generators/vue/templates/webpack/webpack.dev.js.ejs @@ -18,7 +18,6 @@ -%> 'use strict'; const BrowserSyncPlugin = require('browser-sync-webpack-plugin'); -const webpack = require('webpack'); const { styleLoaders } = require('./vue.utils'); const config = require('./config'); From 9d4554606618635fff8fb01f2aeb8c589a9189e7 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Wed, 24 Jul 2024 15:39:31 -0300 Subject: [PATCH 052/938] fix --- generators/vue/templates/webpack/webpack.prod.js.ejs | 1 - 1 file changed, 1 deletion(-) diff --git a/generators/vue/templates/webpack/webpack.prod.js.ejs b/generators/vue/templates/webpack/webpack.prod.js.ejs index 1ed92e955afc..894d86cc398a 100644 --- a/generators/vue/templates/webpack/webpack.prod.js.ejs +++ b/generators/vue/templates/webpack/webpack.prod.js.ejs @@ -17,7 +17,6 @@ limitations under the License. -%> 'use strict'; -const webpack = require('webpack'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); const WorkboxPlugin = require('workbox-webpack-plugin'); From 2d40eacbb12619f1a9d9ff294192c1d73299812e Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Wed, 24 Jul 2024 15:00:39 -0300 Subject: [PATCH 053/938] migrate vue eslint to flat config --- generators/client/files-common.js | 4 - generators/client/templates/.eslintignore.ejs | 32 ------- .../vue/__snapshots__/generator.spec.ts.snap | 57 ++++-------- generators/vue/files-vue.js | 4 +- generators/vue/generator.js | 29 ++++-- generators/vue/resources/package.json | 3 + generators/vue/templates/.eslintrc.cjs.ejs | 65 ------------- .../templates/eslint.config.js.jhi.vue.ejs | 92 +++++++++++++++++++ generators/vue/templates/package.json.ejs | 7 +- 9 files changed, 141 insertions(+), 152 deletions(-) delete mode 100644 generators/client/templates/.eslintignore.ejs delete mode 100644 generators/vue/templates/.eslintrc.cjs.ejs create mode 100644 generators/vue/templates/eslint.config.js.jhi.vue.ejs diff --git a/generators/client/files-common.js b/generators/client/files-common.js index 28b65e0d90bc..5b076b7e959d 100644 --- a/generators/client/files-common.js +++ b/generators/client/files-common.js @@ -26,10 +26,6 @@ export const files = { { templates: ['README.md.jhi.client', '.prettierignore.jhi.client'], }, - clientRootTemplatesBlock({ - condition: ctx => !ctx.clientFrameworkReact && !ctx.clientFrameworkAngular, - templates: ['.eslintignore'], - }), clientRootTemplatesBlock({ condition: generator => generator.microfrontend && (generator.clientFrameworkVue || generator.clientFrameworkReact), templates: ['webpack/webpack.microfrontend.js.jhi'], diff --git a/generators/client/templates/.eslintignore.ejs b/generators/client/templates/.eslintignore.ejs deleted file mode 100644 index d4baca84c272..000000000000 --- a/generators/client/templates/.eslintignore.ejs +++ /dev/null @@ -1,32 +0,0 @@ -<%# - Copyright 2013-2024 the original author or authors from the JHipster project. - - This file is part of the JHipster project, see https://www.jhipster.tech/ - for more information. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. --%> -node_modules/ -<%- dockerServicesDir %> -<%_ if (!clientFrameworkVue) { _%> -jest.conf.js -<%_ } _%> -<%_ if (!clientFrameworkVue || microfrontend) { _%> -webpack/ -<%_ } _%> -<%- temporaryDir %> -coverage/ -<%_ if (clientFrameworkReact) { _%> -postcss.config.js -<%_ } _%> -<%- this.relativeDir(clientRootDir, clientDistDir) %> diff --git a/generators/vue/__snapshots__/generator.spec.ts.snap b/generators/vue/__snapshots__/generator.spec.ts.snap index a434261f6ce6..81c96d44f772 100644 --- a/generators/vue/__snapshots__/generator.spec.ts.snap +++ b/generators/vue/__snapshots__/generator.spec.ts.snap @@ -17,13 +17,10 @@ exports[`generator - vue gateway-jwt-skipUserManagement(true)-withAdminUi(false) ".yo-rc.json": { "stateCleared": "modified", }, - "clientRoot/.eslintignore": { + "clientRoot/.postcssrc.js": { "stateCleared": "modified", }, - "clientRoot/.eslintrc.cjs": { - "stateCleared": "modified", - }, - "clientRoot/.postcssrc.js": { + "clientRoot/eslint.config.mjs": { "stateCleared": "modified", }, "clientRoot/package.json": { @@ -472,13 +469,10 @@ exports[`generator - vue gateway-oauth2-withAdminUi(true)-skipJhipsterDependenci ".yo-rc.json": { "stateCleared": "modified", }, - "clientRoot/.eslintignore": { - "stateCleared": "modified", - }, - "clientRoot/.eslintrc.cjs": { + "clientRoot/.postcssrc.js": { "stateCleared": "modified", }, - "clientRoot/.postcssrc.js": { + "clientRoot/eslint.config.mjs": { "stateCleared": "modified", }, "clientRoot/package.json": { @@ -999,13 +993,10 @@ exports[`generator - vue microservice-jwt-skipUserManagement(false)-withAdminUi( ".yo-rc.json": { "stateCleared": "modified", }, - "clientRoot/.eslintignore": { - "stateCleared": "modified", - }, - "clientRoot/.eslintrc.cjs": { + "clientRoot/.postcssrc.js": { "stateCleared": "modified", }, - "clientRoot/.postcssrc.js": { + "clientRoot/eslint.config.mjs": { "stateCleared": "modified", }, "clientRoot/package.json": { @@ -1463,12 +1454,6 @@ exports[`generator - vue microservice-jwt-skipUserManagement(false)-withAdminUi( exports[`generator - vue microservice-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(false) should match generated files snapshot 1`] = ` { - ".eslintignore": { - "stateCleared": "modified", - }, - ".eslintrc.cjs": { - "stateCleared": "modified", - }, ".jhipster/EntityWithCustomId.json": { "stateCleared": "modified", }, @@ -1487,6 +1472,9 @@ exports[`generator - vue microservice-oauth2-withAdminUi(true)-skipJhipsterDepen ".yo-rc.json": { "stateCleared": "modified", }, + "eslint.config.mjs": { + "stateCleared": "modified", + }, "package.json": { "stateCleared": "modified", }, @@ -1942,12 +1930,6 @@ exports[`generator - vue microservice-oauth2-withAdminUi(true)-skipJhipsterDepen exports[`generator - vue monolith-jwt-skipUserManagement(false)-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(true) should match generated files snapshot 1`] = ` { - ".eslintignore": { - "stateCleared": "modified", - }, - ".eslintrc.cjs": { - "stateCleared": "modified", - }, ".jhipster/EntityWithCustomId.json": { "stateCleared": "modified", }, @@ -1966,6 +1948,9 @@ exports[`generator - vue monolith-jwt-skipUserManagement(false)-withAdminUi(true ".yo-rc.json": { "stateCleared": "modified", }, + "eslint.config.mjs": { + "stateCleared": "modified", + }, "package.json": { "stateCleared": "modified", }, @@ -2556,12 +2541,6 @@ exports[`generator - vue monolith-jwt-skipUserManagement(false)-withAdminUi(true exports[`generator - vue monolith-oauth2-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-websocket(false) should match generated files snapshot 1`] = ` { - ".eslintignore": { - "stateCleared": "modified", - }, - ".eslintrc.cjs": { - "stateCleared": "modified", - }, ".jhipster/EntityWithCustomId.json": { "stateCleared": "modified", }, @@ -2580,6 +2559,9 @@ exports[`generator - vue monolith-oauth2-withAdminUi(false)-skipJhipsterDependen ".yo-rc.json": { "stateCleared": "modified", }, + "eslint.config.mjs": { + "stateCleared": "modified", + }, "package.json": { "stateCleared": "modified", }, @@ -2990,12 +2972,6 @@ exports[`generator - vue monolith-oauth2-withAdminUi(false)-skipJhipsterDependen exports[`generator - vue monolith-session-skipUserManagement(true)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-websocket(true) should match generated files snapshot 1`] = ` { - ".eslintignore": { - "stateCleared": "modified", - }, - ".eslintrc.cjs": { - "stateCleared": "modified", - }, ".jhipster/EntityWithCustomId.json": { "stateCleared": "modified", }, @@ -3014,6 +2990,9 @@ exports[`generator - vue monolith-session-skipUserManagement(true)-withAdminUi(f ".yo-rc.json": { "stateCleared": "modified", }, + "eslint.config.mjs": { + "stateCleared": "modified", + }, "package.json": { "stateCleared": "modified", }, diff --git a/generators/vue/files-vue.js b/generators/vue/files-vue.js index 41eb2b2a774a..fde87143ef90 100644 --- a/generators/vue/files-vue.js +++ b/generators/vue/files-vue.js @@ -23,13 +23,13 @@ export const vueFiles = { common: [ clientRootTemplatesBlock({ templates: [ + '.postcssrc.js', + { sourceFile: 'eslint.config.js.jhi.vue', destinationFile: ctx => `${ctx.eslintConfigFile}.jhi.vue` }, 'package.json', 'tsconfig.json', 'tsconfig.app.json', 'tsconfig.node.json', 'tsconfig.vitest.json', - '.postcssrc.js', - '.eslintrc.cjs', 'vite.config.mts', 'vitest.config.mts', ], diff --git a/generators/vue/generator.js b/generators/vue/generator.js index ac51200f40f0..d61b8c51bf0c 100644 --- a/generators/vue/generator.js +++ b/generators/vue/generator.js @@ -32,6 +32,7 @@ import { getTypescriptKeyType as getTSKeyType, } from '../client/support/index.js'; import { createNeedleCallback } from '../base/support/index.js'; +import { writeEslintClientRootConfigFile } from '../javascript/generators/eslint/support/tasks.js'; import { writeEntityFiles, postWriteEntityFiles, cleanupEntitiesFiles } from './entity-files-vue.js'; import cleanupOldFilesTask from './cleanup.js'; import { writeFiles, writeEntitiesFiles } from './files-vue.js'; @@ -61,6 +62,12 @@ export default class VueGenerator extends BaseApplicationGenerator { this.fetchFromInstalledJHipster(GENERATOR_VUE, 'resources', 'package.json'), ); }, + applicationDefauts({ applicationDefaults }) { + applicationDefaults({ + __override__: true, + typescriptEslint: true, + }); + }, }); } @@ -70,17 +77,17 @@ export default class VueGenerator extends BaseApplicationGenerator { get preparing() { return this.asPreparingTaskGroup({ + applicationDefauts({ applicationDefaults }) { + applicationDefaults({ + __override__: true, + eslintConfigFile: app => `eslint.config.${app.packageJsonType === 'module' ? 'js' : 'mjs'}`, + clientWebappDir: app => `${app.clientSrcDir}app/`, + webappEnumerationsDir: app => `${app.clientWebappDir}shared/model/enumerations/`, + }); + }, prepareForTemplates({ application, source }) { application.addPrettierExtensions?.(['html', 'vue', 'css', 'scss']); - application.clientWebappDir = `${application.clientSrcDir}app/`; - application.webappEnumerationsDir = `${application.clientWebappDir}shared/model/enumerations/`; - application.clientSpecDir = `${application.clientTestDir}spec/`; - - // Can be dropped if tests are moved near implementation - application.applicationRootRelativeToClientTestDir = `${relative(application.clientSpecDir, '.')}/`; - application.clientSrcDirRelativeToClientTestDir = `${relative(application.clientSpecDir, application.clientWebappDir)}/`; - source.addWebpackConfig = args => { const webpackPath = `${application.clientRootDir}webpack/webpack.common.js`; const ignoreNonExisting = this.sharedData.getControl().ignoreNeedlesError && 'Webpack configuration file not found'; @@ -148,7 +155,13 @@ export default class VueGenerator extends BaseApplicationGenerator { get writing() { return this.asWritingTaskGroup({ + cleanup({ control }) { + control.cleanupFiles({ + '8.6.1': ['.eslintrc.json', '.eslintignore'], + }); + }, cleanupOldFilesTask, + writeEslintClientRootConfigFile, writeFiles, }); } diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index beee46f5685d..caea95365a77 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -21,6 +21,8 @@ "vue-router": "4.4.0" }, "devDependencies": { + "@eslint/eslintrc": "3.1.0", + "@eslint/js": "8.57.0", "@module-federation/utilities": "3.0.3-0", "@pinia/testing": "0.1.3", "@rushstack/eslint-patch": "1.10.3", @@ -58,6 +60,7 @@ "terser-webpack-plugin": "5.3.10", "ts-loader": "9.5.1", "typescript": "5.5.4", + "typescript-eslint": "7.17.0", "vite": "5.3.4", "vite-plugin-static-copy": "1.0.6", "vitest": "2.0.4", diff --git a/generators/vue/templates/.eslintrc.cjs.ejs b/generators/vue/templates/.eslintrc.cjs.ejs deleted file mode 100644 index 626929dee1aa..000000000000 --- a/generators/vue/templates/.eslintrc.cjs.ejs +++ /dev/null @@ -1,65 +0,0 @@ -<%# - Copyright 2013-2024 the original author or authors from the JHipster project. - - This file is part of the JHipster project, see https://www.jhipster.tech/ - for more information. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. --%> -/* eslint-env node */ -require('@rushstack/eslint-patch/modern-module-resolution'); - -module.exports = { - root: true, - extends: [ - 'plugin:vue/vue3-essential', - 'eslint:recommended', - '@vue/eslint-config-typescript', - '@vue/eslint-config-prettier/skip-formatting', - ], -<%_ if (cypressTests) { _%> - overrides: [ - { - files: [ - '<%= clientTestDir %>cypress/e2e/**/*.{cy,spec}.{js,ts,jsx,tsx}', - ], - 'extends': [ - 'plugin:cypress/recommended', - ], - }, - ], -<%_ } _%> - parser: 'vue-eslint-parser', - parserOptions: { - parser: '@typescript-eslint/parser', - ecmaVersion: 'latest', - }, - rules: { - 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off', - 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off', - 'vue/multi-word-component-names': 'off', - '@typescript-eslint/no-explicit-any': 'off', - '@typescript-eslint/no-unused-vars': 'off', - '@typescript-eslint/explicit-module-boundary-types': 'off', - '@typescript-eslint/no-empty-function': 'off', - '@typescript-eslint/ban-ts-comment': 'off', - '@typescript-eslint/no-var-requires': 'off', - '@typescript-eslint/consistent-type-imports': 'error', - 'vue/no-v-text-v-html-on-component': [ - 'error', - { 'allow': ['router-link', 'b-alert', 'b-badge', 'b-button', 'b-link'] }, - ], - 'vue/no-reserved-component-names': 'off', - }, - ignorePatterns: ['<%= this.relativeDir(clientRootDir, temporaryDir) %>'], -}; diff --git a/generators/vue/templates/eslint.config.js.jhi.vue.ejs b/generators/vue/templates/eslint.config.js.jhi.vue.ejs new file mode 100644 index 000000000000..0d666c64a978 --- /dev/null +++ b/generators/vue/templates/eslint.config.js.jhi.vue.ejs @@ -0,0 +1,92 @@ +<%# + Copyright 2013-2024 the original author or authors from the JHipster project. + + This file is part of the JHipster project, see https://www.jhipster.tech/ + for more information. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> +<&_ if (fragment.importsSection) { -&> +import { fileURLToPath } from "node:url"; +import { dirname } from "node:path"; +import { FlatCompat } from '@eslint/eslintrc'; + +import js from '@eslint/js'; +import tseslint from 'typescript-eslint'; +import vue from 'eslint-plugin-vue'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); + +const compat = new FlatCompat({ baseDirectory: __dirname }); + +<&_ } -&> +<&_ if (fragment.configSection) { -&> + { ignores: ['<%- this.relativeDir(clientRootDir, clientDistDir) %>', '<%- temporaryDir %>'] }, + js.configs.recommended, + ...tseslint.configs.recommended.map(config => + config.name === 'typescript-eslint/base' ? config : { ...config, files: [ '**/*.ts', '**/*.tsx', '**/*.mts', '**/*.cts' ] }, + ), + { + files: ['**/*.{js,cjs,mjs}'], + rules: { + 'no-unused-vars': ['error', { argsIgnorePattern: '^_' }], + }, + }, + ...vue.configs['flat/recommended'], + { + files: ['**/*.vue'], + languageOptions: { + parserOptions: { parser: '@typescript-eslint/parser' }, + globals: { ...globals.browser }, + }, + }, + { + files: ['<%- this.relativeDir(clientRootDir, clientSrcDir) %>**/*.vue', '<%- this.relativeDir(clientRootDir, clientSrcDir) %>**/*.ts'], + languageOptions: { + globals: { ...globals.browser }, + }, + rules: { + ...Object.fromEntries( + compat + .extends('@vue/eslint-config-typescript/recommended') + .map(({ rules }) => (rules ? Object.entries(rules) : [])) + .flat(), + ), + 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off', + 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off', + 'vue/multi-word-component-names': 'off', + '@typescript-eslint/no-explicit-any': 'off', + '@typescript-eslint/no-unused-vars': 'off', + '@typescript-eslint/explicit-module-boundary-types': 'off', + '@typescript-eslint/no-empty-function': 'off', + '@typescript-eslint/ban-ts-comment': 'off', + '@typescript-eslint/no-var-requires': 'off', + '@typescript-eslint/consistent-type-imports': 'error', + 'vue/no-v-text-v-html-on-component': [ + 'error', + { 'allow': ['router-link', 'b-alert', 'b-badge', 'b-button', 'b-link'] }, + ], + 'vue/no-reserved-component-names': 'off', + }, + }, + { + files: ['<%- this.relativeDir(clientRootDir, clientSrcDir) %>**/*.spec.ts'], + rules: { + '@typescript-eslint/no-empty-function': 'off', + }, + }, +<&_ } -&> +<&_ if (fragment.endConfigSection) { -&> + // { rules: { "prettier/prettier": "off" } }, +<&_ } -&> diff --git a/generators/vue/templates/package.json.ejs b/generators/vue/templates/package.json.ejs index 11146b19f44d..921aea42f50d 100644 --- a/generators/vue/templates/package.json.ejs +++ b/generators/vue/templates/package.json.ejs @@ -83,6 +83,8 @@ "webpack-merge": "<%= nodeDependencies['webpack-merge'] %>", "workbox-webpack-plugin": "<%= nodeDependencies['workbox-webpack-plugin'] %>", <%_ } _%> + "@eslint/eslintrc": null, + "@eslint/js": null, "@pinia/testing": "<%= nodeDependencies['@pinia/testing'] %>", "@rushstack/eslint-patch": "<%= nodeDependencies['@rushstack/eslint-patch'] %>", "@types/node": "<%= nodeDependencies['@types/node'] %>", @@ -112,6 +114,7 @@ "eslint-plugin-prettier": "<%= nodeDependencies['eslint-plugin-prettier'] %>", "eslint-plugin-vue": "<%= nodeDependencies['eslint-plugin-vue'] %>", "typescript": "<%= nodeDependencies['typescript'] %>", + "typescript-eslint": null, "vite": null, "vitest": "<%= nodeDependencies.vitest %>", "vite-plugin-static-copy": null, @@ -132,8 +135,8 @@ "prettier:check": "prettier --check \"{,src/**/,.blueprint/**/}*.{<%= prettierExtensions %>}\"", "prettier:format": "prettier --write \"{,src/**/,.blueprint/**/}*.{<%= prettierExtensions %>}\"", <%_ } %> - "lint": "eslint . --ext .ts,.vue ", - "lint:fix": "eslint . --ext .ts,.vue --fix", + "lint": "eslint .", + "lint:fix": "eslint . --fix", "cleanup": "rimraf <%= this.relativeDir(clientRootDir, temporaryDir) %>", "clean-www": "rimraf <%= this.relativeDir(clientRootDir, clientDistDir) %>", "start": "<%= clientPackageManager %> run webapp:dev --", From 25155e766b3c853dd5c29acbc4f60754e558fa90 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Wed, 24 Jul 2024 16:40:15 -0300 Subject: [PATCH 054/938] cleanup dependencies. --- generators/vue/resources/package.json | 2 -- generators/vue/templates/package.json.ejs | 2 -- 2 files changed, 4 deletions(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index caea95365a77..0e1638df4eaf 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -25,12 +25,10 @@ "@eslint/js": "8.57.0", "@module-federation/utilities": "3.0.3-0", "@pinia/testing": "0.1.3", - "@rushstack/eslint-patch": "1.10.3", "@tsconfig/node18": "18.2.4", "@types/node": "20.11.25", "@types/sinon": "17.0.3", "@vitejs/plugin-vue": "5.1.0", - "@vue/eslint-config-prettier": "9.0.0", "@vue/eslint-config-typescript": "13.0.0", "@vue/test-utils": "2.4.6", "@vue/tsconfig": "0.5.1", diff --git a/generators/vue/templates/package.json.ejs b/generators/vue/templates/package.json.ejs index 921aea42f50d..c1140d1d478f 100644 --- a/generators/vue/templates/package.json.ejs +++ b/generators/vue/templates/package.json.ejs @@ -86,13 +86,11 @@ "@eslint/eslintrc": null, "@eslint/js": null, "@pinia/testing": "<%= nodeDependencies['@pinia/testing'] %>", - "@rushstack/eslint-patch": "<%= nodeDependencies['@rushstack/eslint-patch'] %>", "@types/node": "<%= nodeDependencies['@types/node'] %>", "@types/sinon": "<%= nodeDependencies['@types/sinon'] %>", "@tsconfig/node18": null, "@vitejs/plugin-vue": "<%= nodeDependencies['@vitejs/plugin-vue'] %>", "@vitest/coverage-v8": "<%= nodeDependencies.vitest %>", - "@vue/eslint-config-prettier": "<%= nodeDependencies['@vue/eslint-config-prettier'] %>", "@vue/eslint-config-typescript": "<%= nodeDependencies['@vue/eslint-config-typescript'] %>", "@vue/test-utils": "<%= nodeDependencies['@vue/test-utils'] %>", "@vue/tsconfig": null, From 5695eb9b1033b0beb49ac199761e6a1052288312 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Wed, 24 Jul 2024 18:28:48 -0300 Subject: [PATCH 055/938] add eslint-config-prettier dependency --- generators/vue/templates/package.json.ejs | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/vue/templates/package.json.ejs b/generators/vue/templates/package.json.ejs index c1140d1d478f..c05fa578a725 100644 --- a/generators/vue/templates/package.json.ejs +++ b/generators/vue/templates/package.json.ejs @@ -109,6 +109,7 @@ "sinon": "<%= nodeDependencies['sinon'] %>", "swagger-ui-dist": "<%= nodeDependencies['swagger-ui-dist'] %>", "eslint": "<%= nodeDependencies['eslint'] %>", + "eslint-config-prettier": null, "eslint-plugin-prettier": "<%= nodeDependencies['eslint-plugin-prettier'] %>", "eslint-plugin-vue": "<%= nodeDependencies['eslint-plugin-vue'] %>", "typescript": "<%= nodeDependencies['typescript'] %>", From 0b1251867634fd3e96a44c46dd8fe9996eb2ba87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:09:58 +0000 Subject: [PATCH 056/938] Bump yaml from 2.4.5 to 2.5.0 Bumps [yaml](https://github.com/eemeli/yaml) from 2.4.5 to 2.5.0. - [Release notes](https://github.com/eemeli/yaml/releases) - [Commits](https://github.com/eemeli/yaml/compare/v2.4.5...v2.5.0) --- updated-dependencies: - dependency-name: yaml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 541a081127a3..7a04917c330b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -62,7 +62,7 @@ "type-fest": "4.23.0", "typescript": "5.4.5", "winston": "3.13.1", - "yaml": "2.4.5", + "yaml": "2.5.0", "yeoman-environment": "4.4.1", "yeoman-generator": "7.3.2" }, @@ -14346,10 +14346,9 @@ "license": "ISC" }, "node_modules/yaml": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz", - "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==", - "license": "ISC", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz", + "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==", "bin": { "yaml": "bin.mjs" }, diff --git a/package.json b/package.json index f4567b8f7ed0..154ce1377b47 100644 --- a/package.json +++ b/package.json @@ -170,7 +170,7 @@ "type-fest": "4.23.0", "typescript": "5.4.5", "winston": "3.13.1", - "yaml": "2.4.5", + "yaml": "2.5.0", "yeoman-environment": "4.4.1", "yeoman-generator": "7.3.2" }, From b6225ccc878deda5099f0e80c8fe01668ff76731 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 01:24:43 +0000 Subject: [PATCH 057/938] Bump typescript-eslint in /generators/react/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.52 to 8.0.0-alpha.54. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/HEAD/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index 765d434c5d91..5e6608c3e071 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -81,7 +81,7 @@ "ts-jest": "29.2.3", "ts-loader": "9.5.1", "typescript": "5.5.4", - "typescript-eslint": "8.0.0-alpha.52", + "typescript-eslint": "8.0.0-alpha.54", "webpack": "5.93.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", From 8838ee8d8a1d97cc5f7dbc7af4ffa8688bb76abc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 03:41:24 +0000 Subject: [PATCH 058/938] Bump the angular group in /generators/angular/resources with 2 updates Bumps the angular group in /generators/angular/resources with 2 updates: [@angular/common](https://github.com/angular/angular/tree/HEAD/packages/common) and [@angular/cli](https://github.com/angular/angular-cli). Updates `@angular/common` from 18.1.1 to 18.1.2 - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/18.1.2/packages/common) Updates `@angular/cli` from 18.1.1 to 18.1.2 - [Release notes](https://github.com/angular/angular-cli/releases) - [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular-cli/compare/18.1.1...18.1.2) --- updated-dependencies: - dependency-name: "@angular/common" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: angular - dependency-name: "@angular/cli" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: angular ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 990f3ad5e1ae..f793635bfa74 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "@angular/common": "18.1.1", + "@angular/common": "18.1.2", "@fortawesome/angular-fontawesome": "0.15.0", "@fortawesome/fontawesome-svg-core": "6.6.0", "@fortawesome/free-solid-svg-icons": "6.6.0", @@ -23,7 +23,7 @@ "@angular-architects/module-federation-runtime": "18.0.4", "@angular-builders/custom-webpack": "18.0.0", "@angular-builders/jest": "18.0.0", - "@angular/cli": "18.1.1", + "@angular/cli": "18.1.2", "@types/jest": "29.5.12", "@types/node": "20.11.25", "@types/sockjs-client": "1.5.4", From a47e49c7e19ff1e9ddcb9b1888bc8383ef651fd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 03:41:33 +0000 Subject: [PATCH 059/938] Bump typescript-eslint in /generators/angular/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.52 to 8.0.0-alpha.54. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/HEAD/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 990f3ad5e1ae..618300949c35 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -48,7 +48,7 @@ "rimraf": "5.0.8", "ts-jest": "29.2.3", "typescript": "5.4.5", - "typescript-eslint": "8.0.0-alpha.52", + "typescript-eslint": "8.0.0-alpha.54", "webpack": "5.93.0", "webpack-bundle-analyzer": "4.10.2", "webpack-merge": "6.0.1", From 4af7c7bee3ef345ead4aa323aa8196ce15361ffc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 07:33:29 +0000 Subject: [PATCH 060/938] Bump eslint-plugin-cypress in /generators/client/resources Bumps [eslint-plugin-cypress](https://github.com/cypress-io/eslint-plugin-cypress) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/cypress-io/eslint-plugin-cypress/releases) - [Commits](https://github.com/cypress-io/eslint-plugin-cypress/compare/v3.3.0...v3.4.0) --- updated-dependencies: - dependency-name: eslint-plugin-cypress dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/client/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/resources/package.json b/generators/client/resources/package.json index 51dfad913cc0..926576ddfecb 100644 --- a/generators/client/resources/package.json +++ b/generators/client/resources/package.json @@ -8,7 +8,7 @@ "babel-plugin-istanbul": "7.0.0", "cypress": "13.13.1", "cypress-audit": "1.1.0", - "eslint-plugin-cypress": "3.3.0", + "eslint-plugin-cypress": "3.4.0", "lighthouse": "12.1.0", "nyc": "17.0.0", "swagger-ui-dist": "5.17.14" From 701435dd81e3c9a3ec3bfb59a7511a739e8edbfe Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 25 Jul 2024 10:06:27 -0300 Subject: [PATCH 061/938] remove commented eslint prettier disabling code --- generators/vue/templates/eslint.config.js.jhi.vue.ejs | 3 --- 1 file changed, 3 deletions(-) diff --git a/generators/vue/templates/eslint.config.js.jhi.vue.ejs b/generators/vue/templates/eslint.config.js.jhi.vue.ejs index 0d666c64a978..24993eca4754 100644 --- a/generators/vue/templates/eslint.config.js.jhi.vue.ejs +++ b/generators/vue/templates/eslint.config.js.jhi.vue.ejs @@ -87,6 +87,3 @@ const compat = new FlatCompat({ baseDirectory: __dirname }); }, }, <&_ } -&> -<&_ if (fragment.endConfigSection) { -&> - // { rules: { "prettier/prettier": "off" } }, -<&_ } -&> From 6c6c60eb01894a6f066d3c9ec8525f926fbe580e Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 25 Jul 2024 10:19:08 -0300 Subject: [PATCH 062/938] fix typo --- .../_entityPackage_/domain/_persistClass_.java.jhi.ejs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/java/generators/domain/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs b/generators/java/generators/domain/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs index d19fe3f98112..5105aac59ef7 100644 --- a/generators/java/generators/domain/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs +++ b/generators/java/generators/domain/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs @@ -137,8 +137,8 @@ public class <%= persistClass %> <&- fragments.extendsSection() -&>implements Se for (relationship of relationships) { if (typeof relationship.fieldApiDescription) { _%> <%- relationship.relationshipJavadoc %> - <%_ if (!dtoMapstruct && relationship.relationshipyApiDescription) { _%> - @Schema(description = "<%- relationship.relationshipyApiDescription %>") + <%_ if (!dtoMapstruct && relationship.relationshipApiDescription) { _%> + @Schema(description = "<%- relationship.relationshipApiDescription %>") <%_ } _%> <%_ } _%> <&- fragments.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection() -&> From ec7bb306e0a8dde64c2b3e579b25fd5785dfe9e8 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Thu, 25 Jul 2024 11:22:21 -0300 Subject: [PATCH 063/938] dependabot ajusts for eslint 9 --- .github/dependabot.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bc82c55cb9d4..06f9fefbca27 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -87,9 +87,10 @@ updates: patterns: - '@fortawesome/fontawesome-svg-core' - '@fortawesome/free-solid-svg-icons' - typescript-eslint: + eslint: patterns: - - '@typescript-eslint/*' + - '@eslint/*' + - 'eslint' - package-ecosystem: 'npm' directory: '/generators/common/resources/' @@ -184,9 +185,10 @@ updates: - dependency-name: '@module-federation/utilities' versions: ['*'] groups: - typescript-eslint: + eslint: patterns: - - '@typescript-eslint/*' + - '@eslint/*' + - 'eslint' vue-eslint: patterns: - '@vue/eslint-config-typescript' From 91f3f364b3a1b11247673126c0c96f6959162146 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:03:11 +0000 Subject: [PATCH 064/938] Bump com.hazelcast:hazelcast-spring Bumps [com.hazelcast:hazelcast-spring](https://github.com/hazelcast/hazelcast) from 5.4.0 to 5.5.0. - [Release notes](https://github.com/hazelcast/hazelcast/releases) - [Commits](https://github.com/hazelcast/hazelcast/commits) --- updated-dependencies: - dependency-name: com.hazelcast:hazelcast-spring dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/spring-cache/resources/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/spring-cache/resources/gradle/libs.versions.toml b/generators/spring-cache/resources/gradle/libs.versions.toml index f37637393e65..494d37d8007f 100644 --- a/generators/spring-cache/resources/gradle/libs.versions.toml +++ b/generators/spring-cache/resources/gradle/libs.versions.toml @@ -5,7 +5,7 @@ typesafe = { module = 'com.typesafe:config', version = '1.4.3' } # hazelcast hazelcast-hibernate53 = { module = 'com.hazelcast:hazelcast-hibernate53', version = '5.2.0' } -hazelcast-spring = { module = 'com.hazelcast:hazelcast-spring', version = '5.4.0' } +hazelcast-spring = { module = 'com.hazelcast:hazelcast-spring', version = '5.5.0' } # memcached xmemcached-provider = { module = 'com.google.code.simple-spring-memcached:xmemcached-provider', version = '4.1.3' } From 96319a9b29e7ad633414b785c82a5586fabfc546 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:03:12 +0000 Subject: [PATCH 065/938] Bump husky from 9.1.1 to 9.1.2 in /generators/javascript/resources Bumps [husky](https://github.com/typicode/husky) from 9.1.1 to 9.1.2. - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v9.1.1...v9.1.2) --- updated-dependencies: - dependency-name: husky dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/javascript/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/javascript/resources/package.json b/generators/javascript/resources/package.json index 138f05e8826b..8aa1a6d6b7e6 100644 --- a/generators/javascript/resources/package.json +++ b/generators/javascript/resources/package.json @@ -2,7 +2,7 @@ "dependencies": { "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", - "husky": "9.1.1", + "husky": "9.1.2", "lint-staged": "15.2.7" } } From e4099fce6734b3b082aafd15a911252317994f1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:03:13 +0000 Subject: [PATCH 066/938] Bump grafana/grafana in /generators/server/resources Bumps grafana/grafana from 11.1.0 to 11.1.1. --- updated-dependencies: - dependency-name: grafana/grafana dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/server/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile index 6f7b7ff2a845..087b367ac86d 100644 --- a/generators/server/resources/Dockerfile +++ b/generators/server/resources/Dockerfile @@ -64,7 +64,7 @@ LABEL ALIAS=prometheus-alertmanager FROM quay.io/coreos/prometheus-operator:v0.42.1 LABEL ALIAS=prometheus-operator -FROM grafana/grafana:11.1.0 +FROM grafana/grafana:11.1.1 LABEL ALIAS=grafana FROM quay.io/coreos/grafana-watcher:v0.0.8 From 3c0991dc789397ef2520a1435c4e5d8e1ce0fa43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:03:17 +0000 Subject: [PATCH 067/938] Bump docker/login-action from 3.2.0 to 3.3.0 Bumps [docker/login-action](https://github.com/docker/login-action) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v3.2.0...v3.3.0) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-image-publish-github-registry.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image-publish-github-registry.yml b/.github/workflows/docker-image-publish-github-registry.yml index 5704bb77ac30..8bff614c5658 100644 --- a/.github/workflows/docker-image-publish-github-registry.yml +++ b/.github/workflows/docker-image-publish-github-registry.yml @@ -49,7 +49,7 @@ jobs: - name: Login to GitHub Container Registry if: github.event_name != 'pull_request' - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -59,7 +59,7 @@ jobs: env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} if: ${{env.DOCKERHUB_USERNAME != '' && startsWith(github.ref, 'refs/tags/v')}} - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 id: login-hub with: username: ${{ secrets.DOCKERHUB_USERNAME }} From d468d64e8f67686c23ad53efd9b359d413dfad8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:03:19 +0000 Subject: [PATCH 068/938] Bump docker/setup-buildx-action from 3.4.0 to 3.5.0 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3.4.0...v3.5.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-image-publish-github-registry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-publish-github-registry.yml b/.github/workflows/docker-image-publish-github-registry.yml index 5704bb77ac30..18971fdc68e8 100644 --- a/.github/workflows/docker-image-publish-github-registry.yml +++ b/.github/workflows/docker-image-publish-github-registry.yml @@ -45,7 +45,7 @@ jobs: platforms: arm64 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3.4.0 + uses: docker/setup-buildx-action@v3.5.0 - name: Login to GitHub Container Registry if: github.event_name != 'pull_request' From 8cdf35c0f81cfaa407d16b14d8658aa00ed6fe34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:03:22 +0000 Subject: [PATCH 069/938] Bump docker/setup-qemu-action from 3.1.0 to 3.2.0 Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v3.1.0...v3.2.0) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-image-publish-github-registry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-publish-github-registry.yml b/.github/workflows/docker-image-publish-github-registry.yml index 5704bb77ac30..72acfa1364f0 100644 --- a/.github/workflows/docker-image-publish-github-registry.yml +++ b/.github/workflows/docker-image-publish-github-registry.yml @@ -40,7 +40,7 @@ jobs: uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v3.1.0 + uses: docker/setup-qemu-action@v3.2.0 with: platforms: arm64 From b5a98133aa43c901559f54affafbb4fbc3aead42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:03:25 +0000 Subject: [PATCH 070/938] Bump docker/build-push-action from 6.4.1 to 6.5.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.4.1 to 6.5.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.4.1...v6.5.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-image-publish-github-registry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-publish-github-registry.yml b/.github/workflows/docker-image-publish-github-registry.yml index 5704bb77ac30..00ce3f726bca 100644 --- a/.github/workflows/docker-image-publish-github-registry.yml +++ b/.github/workflows/docker-image-publish-github-registry.yml @@ -72,7 +72,7 @@ jobs: images: ghcr.io/${{ github.repository }}${{ (steps.login-hub.outcome == 'success' && ',jhipster/jhipster') || ''}} - name: Build and push Docker image - uses: docker/build-push-action@v6.4.1 + uses: docker/build-push-action@v6.5.0 with: context: . platforms: linux/amd64,linux/arm64 From f0bbe33dd66a0451cabc2daad8e4651e7aea6122 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:03:51 +0000 Subject: [PATCH 071/938] Bump chai and @types/chai Bumps [chai](https://github.com/chaijs/chai) and [@types/chai](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chai). These dependencies needed to be updated together. Updates `chai` from 4.4.1 to 4.5.0 - [Release notes](https://github.com/chaijs/chai/releases) - [Changelog](https://github.com/chaijs/chai/blob/main/History.md) - [Commits](https://github.com/chaijs/chai/compare/v4.4.1...v4.5.0) Updates `@types/chai` from 4.3.11 to 4.3.16 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chai) --- updated-dependencies: - dependency-name: chai dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: "@types/chai" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 31 +++++++++++++++++++------------ package.json | 4 ++-- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7a04917c330b..d594f0d4cfa7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -72,10 +72,10 @@ "devDependencies": { "@actions/core": "1.10.1", "@node-loaders/esbuildx": "1.4.0", - "@types/chai": "4.3.11", + "@types/chai": "4.3.16", "@types/node": "20.11.25", "@types/sinon-chai": "3.2.12", - "chai": "4.4.1", + "chai": "4.5.0", "cpy-cli": "5.0.0", "ejs-lint": "2.0.0", "eslint-config-prettier": "9.1.0", @@ -2987,11 +2987,10 @@ } }, "node_modules/@types/chai": { - "version": "4.3.11", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz", - "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==", - "dev": true, - "license": "MIT" + "version": "4.3.16", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.16.tgz", + "integrity": "sha512-PatH4iOdyh3MyWtmHVFXLWCCIhUbopaltqddG9BzB+gMIzee2MJrvd+jouii9Z3wzQJruGWAm7WOMjgfG8hQlQ==", + "dev": true }, "node_modules/@types/ejs": { "version": "3.1.5", @@ -4370,11 +4369,10 @@ } }, "node_modules/chai": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz", - "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz", + "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==", "dev": true, - "license": "MIT", "dependencies": { "assertion-error": "^1.1.0", "check-error": "^1.0.3", @@ -4382,12 +4380,21 @@ "get-func-name": "^2.0.2", "loupe": "^2.3.6", "pathval": "^1.1.1", - "type-detect": "^4.0.8" + "type-detect": "^4.1.0" }, "engines": { "node": ">=4" } }, + "node_modules/chai/node_modules/type-detect": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/chalk": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", diff --git a/package.json b/package.json index 154ce1377b47..db9ac7bdc61d 100644 --- a/package.json +++ b/package.json @@ -177,10 +177,10 @@ "devDependencies": { "@actions/core": "1.10.1", "@node-loaders/esbuildx": "1.4.0", - "@types/chai": "4.3.11", + "@types/chai": "4.3.16", "@types/node": "20.11.25", "@types/sinon-chai": "3.2.12", - "chai": "4.4.1", + "chai": "4.5.0", "cpy-cli": "5.0.0", "ejs-lint": "2.0.0", "eslint-config-prettier": "9.1.0", From 5b11907bc11f6996bc64d6db7bc8e870f8929e55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:04:36 +0000 Subject: [PATCH 072/938] Bump vue-tsc from 2.0.28 to 2.0.29 in /generators/vue/resources Bumps [vue-tsc](https://github.com/vuejs/language-tools/tree/HEAD/packages/tsc) from 2.0.28 to 2.0.29. - [Release notes](https://github.com/vuejs/language-tools/releases) - [Changelog](https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/language-tools/commits/HEAD/packages/tsc) --- updated-dependencies: - dependency-name: vue-tsc dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 0e1638df4eaf..7ed893b6d081 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -65,7 +65,7 @@ "vitest-sonar-reporter": "2.0.0", "vue-loader": "17.4.2", "vue-style-loader": "4.1.3", - "vue-tsc": "2.0.28", + "vue-tsc": "2.0.29", "webpack": "5.93.0", "webpack-bundle-analyzer": "4.10.2", "webpack-cli": "5.1.4", From a31f67bc6992b2d1c5579867e982a3dc5a4edcef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 16:41:55 +0000 Subject: [PATCH 073/938] Bump vite from 5.3.4 to 5.3.5 in /generators/vue/resources Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.3.4 to 5.3.5. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.3.5/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 7ed893b6d081..2635cb1548b3 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -59,7 +59,7 @@ "ts-loader": "9.5.1", "typescript": "5.5.4", "typescript-eslint": "7.17.0", - "vite": "5.3.4", + "vite": "5.3.5", "vite-plugin-static-copy": "1.0.6", "vitest": "2.0.4", "vitest-sonar-reporter": "2.0.0", From 48ee734386e21924bc2f803d232def3721ca0661 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 00:21:35 +0000 Subject: [PATCH 074/938] Bump confluentinc/cp-kafka in /generators/server/resources Bumps confluentinc/cp-kafka from 7.6.2 to 7.7.0. --- updated-dependencies: - dependency-name: confluentinc/cp-kafka dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/server/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile index 087b367ac86d..59e6409941e6 100644 --- a/generators/server/resources/Dockerfile +++ b/generators/server/resources/Dockerfile @@ -40,7 +40,7 @@ FROM memcached:1.6.29-alpine FROM redis:7.2.5 -FROM confluentinc/cp-kafka:7.6.2 +FROM confluentinc/cp-kafka:7.7.0 LABEL ALIAS=kafka FROM confluentinc/cp-zookeeper:7.6.2 From e893899e04c6a3f6c69b4417ef5059f5d8c195a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 00:21:42 +0000 Subject: [PATCH 075/938] Bump confluentinc/cp-zookeeper in /generators/server/resources Bumps confluentinc/cp-zookeeper from 7.6.2 to 7.7.0. --- updated-dependencies: - dependency-name: confluentinc/cp-zookeeper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/server/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile index 087b367ac86d..5405f6dfda4e 100644 --- a/generators/server/resources/Dockerfile +++ b/generators/server/resources/Dockerfile @@ -43,7 +43,7 @@ FROM redis:7.2.5 FROM confluentinc/cp-kafka:7.6.2 LABEL ALIAS=kafka -FROM confluentinc/cp-zookeeper:7.6.2 +FROM confluentinc/cp-zookeeper:7.7.0 LABEL ALIAS=zookeeper FROM apachepulsar/pulsar:3.2.3 From fe608f6ae83d86bc212932e4e6ecb800ce8946e3 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Thu, 25 Jul 2024 16:03:48 -0300 Subject: [PATCH 076/938] drop @vue/eslint-config-typescript --- .github/dependabot.yml | 4 ---- generators/vue/resources/package.json | 1 - generators/vue/templates/eslint.config.js.jhi.vue.ejs | 6 ------ generators/vue/templates/package.json.ejs | 1 - 4 files changed, 12 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 06f9fefbca27..581792f5ff40 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -189,10 +189,6 @@ updates: patterns: - '@eslint/*' - 'eslint' - vue-eslint: - patterns: - - '@vue/eslint-config-typescript' - - 'eslint-plugin-vue' fortawesome: patterns: - '@fortawesome/fontawesome-svg-core' diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 2635cb1548b3..d2a8d99a67d6 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -29,7 +29,6 @@ "@types/node": "20.11.25", "@types/sinon": "17.0.3", "@vitejs/plugin-vue": "5.1.0", - "@vue/eslint-config-typescript": "13.0.0", "@vue/test-utils": "2.4.6", "@vue/tsconfig": "0.5.1", "autoprefixer": "10.4.19", diff --git a/generators/vue/templates/eslint.config.js.jhi.vue.ejs b/generators/vue/templates/eslint.config.js.jhi.vue.ejs index 24993eca4754..8afe7e656741 100644 --- a/generators/vue/templates/eslint.config.js.jhi.vue.ejs +++ b/generators/vue/templates/eslint.config.js.jhi.vue.ejs @@ -57,12 +57,6 @@ const compat = new FlatCompat({ baseDirectory: __dirname }); globals: { ...globals.browser }, }, rules: { - ...Object.fromEntries( - compat - .extends('@vue/eslint-config-typescript/recommended') - .map(({ rules }) => (rules ? Object.entries(rules) : [])) - .flat(), - ), 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off', 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off', 'vue/multi-word-component-names': 'off', diff --git a/generators/vue/templates/package.json.ejs b/generators/vue/templates/package.json.ejs index c05fa578a725..afc2c5afb12e 100644 --- a/generators/vue/templates/package.json.ejs +++ b/generators/vue/templates/package.json.ejs @@ -91,7 +91,6 @@ "@tsconfig/node18": null, "@vitejs/plugin-vue": "<%= nodeDependencies['@vitejs/plugin-vue'] %>", "@vitest/coverage-v8": "<%= nodeDependencies.vitest %>", - "@vue/eslint-config-typescript": "<%= nodeDependencies['@vue/eslint-config-typescript'] %>", "@vue/test-utils": "<%= nodeDependencies['@vue/test-utils'] %>", "@vue/tsconfig": null, "axios-mock-adapter": "<%= nodeDependencies['axios-mock-adapter'] %>", From fa90be845dd46777b5ebdd5cf852de724e0eca68 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Thu, 25 Jul 2024 16:08:14 -0300 Subject: [PATCH 077/938] drop @eslint/eslintrc --- generators/vue/resources/package.json | 1 - generators/vue/templates/eslint.config.js.jhi.vue.ejs | 10 ---------- generators/vue/templates/package.json.ejs | 1 - 3 files changed, 12 deletions(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index d2a8d99a67d6..c57f916f23bc 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -21,7 +21,6 @@ "vue-router": "4.4.0" }, "devDependencies": { - "@eslint/eslintrc": "3.1.0", "@eslint/js": "8.57.0", "@module-federation/utilities": "3.0.3-0", "@pinia/testing": "0.1.3", diff --git a/generators/vue/templates/eslint.config.js.jhi.vue.ejs b/generators/vue/templates/eslint.config.js.jhi.vue.ejs index 8afe7e656741..8008f9a73a81 100644 --- a/generators/vue/templates/eslint.config.js.jhi.vue.ejs +++ b/generators/vue/templates/eslint.config.js.jhi.vue.ejs @@ -17,19 +17,9 @@ limitations under the License. -%> <&_ if (fragment.importsSection) { -&> -import { fileURLToPath } from "node:url"; -import { dirname } from "node:path"; -import { FlatCompat } from '@eslint/eslintrc'; - import js from '@eslint/js'; -import tseslint from 'typescript-eslint'; import vue from 'eslint-plugin-vue'; -const __filename = fileURLToPath(import.meta.url); -const __dirname = dirname(__filename); - -const compat = new FlatCompat({ baseDirectory: __dirname }); - <&_ } -&> <&_ if (fragment.configSection) { -&> { ignores: ['<%- this.relativeDir(clientRootDir, clientDistDir) %>', '<%- temporaryDir %>'] }, diff --git a/generators/vue/templates/package.json.ejs b/generators/vue/templates/package.json.ejs index afc2c5afb12e..bae1f6baa4f9 100644 --- a/generators/vue/templates/package.json.ejs +++ b/generators/vue/templates/package.json.ejs @@ -83,7 +83,6 @@ "webpack-merge": "<%= nodeDependencies['webpack-merge'] %>", "workbox-webpack-plugin": "<%= nodeDependencies['workbox-webpack-plugin'] %>", <%_ } _%> - "@eslint/eslintrc": null, "@eslint/js": null, "@pinia/testing": "<%= nodeDependencies['@pinia/testing'] %>", "@types/node": "<%= nodeDependencies['@types/node'] %>", From 909b629842c4fd1067747f687450fe7b5114c36f Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Thu, 25 Jul 2024 16:09:45 -0300 Subject: [PATCH 078/938] update vue eslint to v9 --- generators/vue/resources/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index c57f916f23bc..9653012d103e 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -21,7 +21,7 @@ "vue-router": "4.4.0" }, "devDependencies": { - "@eslint/js": "8.57.0", + "@eslint/js": "9.7.0", "@module-federation/utilities": "3.0.3-0", "@pinia/testing": "0.1.3", "@tsconfig/node18": "18.2.4", @@ -36,7 +36,7 @@ "copy-webpack-plugin": "12.0.2", "css-loader": "7.1.2", "css-minimizer-webpack-plugin": "7.0.0", - "eslint": "8.57.0", + "eslint": "9.7.0", "eslint-plugin-prettier": "5.2.1", "eslint-plugin-vue": "9.27.0", "flush-promises": "1.0.2", @@ -56,8 +56,8 @@ "terser-webpack-plugin": "5.3.10", "ts-loader": "9.5.1", "typescript": "5.5.4", - "typescript-eslint": "7.17.0", - "vite": "5.3.5", + "typescript-eslint": "8.0.0-alpha.54", + "vite": "5.3.4", "vite-plugin-static-copy": "1.0.6", "vitest": "2.0.4", "vitest-sonar-reporter": "2.0.0", From 1e57ce9a239de278026b3fa6c41b2a48e36b9faf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 15:30:06 +0000 Subject: [PATCH 079/938] Bump hazelcast/management-center in /generators/server/resources Bumps hazelcast/management-center from 5.4.1 to 5.5.0. --- updated-dependencies: - dependency-name: hazelcast/management-center dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/server/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile index 301cda7744d7..76db73f4744c 100644 --- a/generators/server/resources/Dockerfile +++ b/generators/server/resources/Dockerfile @@ -33,7 +33,7 @@ LABEL ALIAS=mssql FROM neo4j:5.22.0 -FROM hazelcast/management-center:5.4.1 +FROM hazelcast/management-center:5.5.0 LABEL ALIAS=hazelcast FROM memcached:1.6.29-alpine From 7c32bed76f30657562419a054b403ff36864ea3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 15:30:49 +0000 Subject: [PATCH 080/938] Bump pinia from 2.1.7 to 2.2.0 in /generators/vue/resources Bumps [pinia](https://github.com/vuejs/pinia) from 2.1.7 to 2.2.0. - [Release notes](https://github.com/vuejs/pinia/releases) - [Commits](https://github.com/vuejs/pinia/compare/pinia@2.1.7...pinia@2.2.0) --- updated-dependencies: - dependency-name: pinia dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 9653012d103e..9a9f6a350fb7 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -13,7 +13,7 @@ "bootswatch": "4.6.2", "deepmerge": "4.3.1", "js-cookie": "3.0.5", - "pinia": "2.1.7", + "pinia": "2.2.0", "rxjs": "7.8.1", "sockjs-client": "1.6.1", "vue": "3.4.21", From 405c45aa9fe4a11babd5408fdbc85fc7b098ea71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 15:31:12 +0000 Subject: [PATCH 081/938] Bump vite from 5.3.4 to 5.3.5 in /generators/vue/resources Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.3.4 to 5.3.5. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.3.5/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 9653012d103e..2577be34651a 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -57,7 +57,7 @@ "ts-loader": "9.5.1", "typescript": "5.5.4", "typescript-eslint": "8.0.0-alpha.54", - "vite": "5.3.4", + "vite": "5.3.5", "vite-plugin-static-copy": "1.0.6", "vitest": "2.0.4", "vitest-sonar-reporter": "2.0.0", From 173ff10a246a943d0acd3bd5860421c147405a68 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Fri, 26 Jul 2024 11:51:51 -0300 Subject: [PATCH 082/938] convert editorconfig to multistep template --- generators/common/__snapshots__/generator.spec.js.snap | 3 --- generators/common/files.js | 2 +- .../templates/{.editorconfig.ejs => .editorconfig.jhi.ejs} | 7 +++---- generators/init/generator.spec.ts | 2 +- generators/init/templates/.editorconfig.jhi.ejs | 2 +- generators/java/generators/bootstrap/generator.ts | 1 + .../bootstrap/templates/.editorconfig.jhi.java.ejs | 3 +++ 7 files changed, 10 insertions(+), 10 deletions(-) rename generators/common/templates/{.editorconfig.ejs => .editorconfig.jhi.ejs} (83%) create mode 100644 generators/java/generators/bootstrap/templates/.editorconfig.jhi.java.ejs diff --git a/generators/common/__snapshots__/generator.spec.js.snap b/generators/common/__snapshots__/generator.spec.js.snap index 61635a011280..5cd1490c00db 100644 --- a/generators/common/__snapshots__/generator.spec.js.snap +++ b/generators/common/__snapshots__/generator.spec.js.snap @@ -19,9 +19,6 @@ insert_final_newline = true # Change these settings to your own preference indent_style = space -indent_size = 4 - -[*.{ts,tsx,js,jsx,json,css,scss,yml,html,vue}] indent_size = 2 [*.md] diff --git a/generators/common/files.js b/generators/common/files.js index 2faecc9ff2f9..ea5c14f2b27a 100644 --- a/generators/common/files.js +++ b/generators/common/files.js @@ -24,7 +24,7 @@ export const commonFiles = { global: [ { - templates: ['README.md.jhi', '.editorconfig'], + templates: ['README.md.jhi', '.editorconfig.jhi'], }, ], sonar: [ diff --git a/generators/common/templates/.editorconfig.ejs b/generators/common/templates/.editorconfig.jhi.ejs similarity index 83% rename from generators/common/templates/.editorconfig.ejs rename to generators/common/templates/.editorconfig.jhi.ejs index c2fa6a2d9fab..352e2df72e42 100644 --- a/generators/common/templates/.editorconfig.ejs +++ b/generators/common/templates/.editorconfig.jhi.ejs @@ -14,10 +14,9 @@ insert_final_newline = true # Change these settings to your own preference indent_style = space -indent_size = 4 - -[*.{ts,tsx,js,jsx,json,css,scss,yml,html,vue}] -indent_size = 2 +indent_size = <%= prettierTabWidth %> [*.md] trim_trailing_whitespace = false + +<&- fragments.render({ join: '\n\n' }) &> diff --git a/generators/init/generator.spec.ts b/generators/init/generator.spec.ts index 9df83da53818..84ea06219dd3 100644 --- a/generators/init/generator.spec.ts +++ b/generators/init/generator.spec.ts @@ -54,7 +54,7 @@ describe(`generator - ${generator}`, () => { await helpers .runJHipster('init') .withMockedJHipsterGenerators(['bootstrap']) - .withSharedApplication({ projectDescription: 'projectDescription' }) + .withSharedApplication({ projectDescription: 'projectDescription', prettierTabWidth: 'prettierTabWidth' }) .withJHipsterConfig(); }); it('should write files and match snapshot', () => { diff --git a/generators/init/templates/.editorconfig.jhi.ejs b/generators/init/templates/.editorconfig.jhi.ejs index 93af72ebeaf3..9d8ad5dbf6a0 100644 --- a/generators/init/templates/.editorconfig.jhi.ejs +++ b/generators/init/templates/.editorconfig.jhi.ejs @@ -32,7 +32,7 @@ insert_final_newline = true # Change these settings to your own preference indent_style = space -indent_size = 2 +indent_size = <%= prettierTabWidth %> [*.md] trim_trailing_whitespace = false diff --git a/generators/java/generators/bootstrap/generator.ts b/generators/java/generators/bootstrap/generator.ts index 43b4af3ff2eb..0e72cc6d8b41 100644 --- a/generators/java/generators/bootstrap/generator.ts +++ b/generators/java/generators/bootstrap/generator.ts @@ -172,6 +172,7 @@ export default class BootstrapGenerator extends BaseApplicationGenerator { javaMainPackageTemplatesBlock({ templates: ['GeneratedByJHipster.java'], }), + { templates: ['.editorconfig.jhi.java'] }, ], context: application, }); diff --git a/generators/java/generators/bootstrap/templates/.editorconfig.jhi.java.ejs b/generators/java/generators/bootstrap/templates/.editorconfig.jhi.java.ejs new file mode 100644 index 000000000000..f17912e7730e --- /dev/null +++ b/generators/java/generators/bootstrap/templates/.editorconfig.jhi.java.ejs @@ -0,0 +1,3 @@ +# Generated by jhipster:java:bootstrap generator +[*.java] +indent_size = 4 From ef14009d57bf82ef15bf99ab87cee685e3febaa5 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Fri, 26 Jul 2024 12:47:49 -0300 Subject: [PATCH 083/938] fix gradle implementation platform scope --- generators/gradle/internal/needles.ts | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/generators/gradle/internal/needles.ts b/generators/gradle/internal/needles.ts index c221e810d6c6..e34cbd936cab 100644 --- a/generators/gradle/internal/needles.ts +++ b/generators/gradle/internal/needles.ts @@ -45,6 +45,9 @@ const scopeSortOrder = { runtimeOnly: 4, }; +const wrapScope = (scope: string, dependency: string) => + `${scope}${scope === 'implementation platform' ? '(' : ' '}${dependency}${scope === 'implementation platform' ? ')' : ''}`; + export const gradleNeedleOptionsWithDefaults = (options: GradleNeedleOptions): Required => { const { gradleFile = 'build.gradle', gradleVersionCatalogFile = 'gradle/libs.versions.toml' } = options; return { gradleFile, gradleVersionCatalogFile }; @@ -79,9 +82,12 @@ export const addGradleDependenciesCallback = (dependencies: GradleDependency[]) createNeedleCallback({ needle: 'gradle-dependency', contentToAdd: dependencies.map(({ groupId, artifactId, version, scope, classifier }) => - classifier && !version - ? `${scope} group: "${groupId}", name: "${artifactId}", classifier: "${classifier}"` - : `${scope} "${groupId}:${artifactId}${version ? `:${version}` : ''}${classifier ? `:${classifier}` : ''}"`, + wrapScope( + scope, + classifier && !version + ? `group: "${groupId}", name: "${artifactId}", classifier: "${classifier}"` + : `"${groupId}:${artifactId}${version ? `:${version}` : ''}${classifier ? `:${classifier}` : ''}"`, + ), ), }); @@ -89,7 +95,7 @@ export const addGradleDependenciesCallback = (dependencies: GradleDependency[]) export const addGradleBuildSrcDependencyCallback = ({ groupId, artifactId, version, scope }: GradleDependency) => createNeedleCallback({ needle: 'gradle-build-src-dependency', - contentToAdd: `${scope} "${groupId}:${artifactId}${version ? `:${version}` : ''}"`, + contentToAdd: wrapScope(scope, `"${groupId}:${artifactId}${version ? `:${version}` : ''}"`), }); export const addGradleDependenciesCatalogVersionCallback = (versions: GradleTomlVersion[]) => @@ -111,11 +117,7 @@ export const addGradleDependencyFromCatalogCallback = (libraries: GradleLibrary[ needle: 'gradle-dependency', contentToAdd: libraries .filter(({ scope }) => scope) - .map(({ libraryName, scope }) => - scope === 'implementation platform' - ? `${scope}(libs.${gradleNameToReference(libraryName)})` - : `${scope} libs.${gradleNameToReference(libraryName)}`, - ), + .map(({ libraryName, scope }) => wrapScope(scope!, `libs.${gradleNameToReference(libraryName)}`)), }); export const addGradleDependencyCatalogPluginsCallback = (plugins: GradleTomlPlugin[]) => From c39d72e403c43b4fd4957188b3507e0238581e15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 23:32:30 +0000 Subject: [PATCH 084/938] Bump @eslint/js from 9.7.0 to 9.8.0 Bumps [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) from 9.7.0 to 9.8.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/commits/v9.8.0/packages/js) --- updated-dependencies: - dependency-name: "@eslint/js" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index d594f0d4cfa7..139deef56c80 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "8.6.0", "license": "Apache-2.0", "dependencies": { - "@eslint/js": "9.7.0", + "@eslint/js": "9.8.0", "@faker-js/faker": "8.4.1", "@iarna/toml": "3.0.0", "@types/ejs": "3.1.5", @@ -1286,10 +1286,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.7.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.7.0.tgz", - "integrity": "sha512-ChuWDQenef8OSFnvuxv0TCVxEwmu3+hPNKvM9B34qpM0rDRbjL8t5QkQeHHeAfsKQjuH9wS82WeCi1J/owatng==", - "license": "MIT", + "version": "9.8.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.8.0.tgz", + "integrity": "sha512-MfluB7EUfxXtv3i/++oh89uzAr4PDI4nn201hsp+qaXqsjAWzinlZEHEfPgAX4doIlKvPG/i0A9dpKxOLII8yA==", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } diff --git a/package.json b/package.json index db9ac7bdc61d..4016a48b2663 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "update-snapshots": "esmocha jdl generators cli --update-snapshot --no-insight --forbid-only" }, "dependencies": { - "@eslint/js": "9.7.0", + "@eslint/js": "9.8.0", "@faker-js/faker": "8.4.1", "@iarna/toml": "3.0.0", "@types/ejs": "3.1.5", From 4d59640b0d65ab476f908aaf2faa64b6a97a1ed5 Mon Sep 17 00:00:00 2001 From: JHipster Bot Date: Sat, 27 Jul 2024 00:23:44 +0000 Subject: [PATCH 085/938] Bump transitional dependencies --- package-lock.json | 273 ++++++++++++++++++++-------------------------- 1 file changed, 120 insertions(+), 153 deletions(-) diff --git a/package-lock.json b/package-lock.json index 139deef56c80..0eb177ed9fe7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -160,9 +160,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.24.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz", - "integrity": "sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.0.tgz", + "integrity": "sha512-P4fwKI2mjEb3ZU5cnMJzvRsRKGBUcs8jvxIoRmr6ufAY9Xk2Bz7JubRTTivkw55c7WQJfTECeqYVa+HZ0FzREg==", "dev": true, "license": "MIT", "engines": { @@ -211,13 +211,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.24.10", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.10.tgz", - "integrity": "sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz", + "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.24.9", + "@babel/types": "^7.25.0", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" @@ -253,46 +253,6 @@ "semver": "bin/semver.js" } }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz", - "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz", - "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/template": "^7.24.7", - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz", - "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-module-imports": { "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", @@ -308,17 +268,16 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.24.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz", - "integrity": "sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.0.tgz", + "integrity": "sha512-bIkOa2ZJYn7FHnepzr5iX9Kmz8FjIz4UKzJ9zhX3dnYuVW0xul9RuR3skBfoLu+FPTQw90EHW9rJsSZhyLQ3fQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.24.7", "@babel/helper-module-imports": "^7.24.7", "@babel/helper-simple-access": "^7.24.7", - "@babel/helper-split-export-declaration": "^7.24.7", - "@babel/helper-validator-identifier": "^7.24.7" + "@babel/helper-validator-identifier": "^7.24.7", + "@babel/traverse": "^7.25.0" }, "engines": { "node": ">=6.9.0" @@ -351,19 +310,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz", - "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-string-parser": { "version": "7.24.8", "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", @@ -394,14 +340,14 @@ } }, "node_modules/@babel/helpers": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.8.tgz", - "integrity": "sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.0.tgz", + "integrity": "sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.24.7", - "@babel/types": "^7.24.8" + "@babel/template": "^7.25.0", + "@babel/types": "^7.25.0" }, "engines": { "node": ">=6.9.0" @@ -479,9 +425,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.8.tgz", - "integrity": "sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.0.tgz", + "integrity": "sha512-CzdIU9jdP0dg7HdyB+bHvDJGagUv+qtzZt5rYCWwW6tITNqV9odjp6Qu41gkG0ca5UfdDUWrKkiAnHHdGRnOrA==", "dev": true, "license": "MIT", "bin": { @@ -683,35 +629,32 @@ } }, "node_modules/@babel/template": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz", - "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", + "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.24.7", - "@babel/parser": "^7.24.7", - "@babel/types": "^7.24.7" + "@babel/parser": "^7.25.0", + "@babel/types": "^7.25.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.8.tgz", - "integrity": "sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.0.tgz", + "integrity": "sha512-ubALThHQy4GCf6mbb+5ZRNmLLCI7bJ3f8Q6LHBSRlSKSWj5a7dSUzJBLv3VuIhFrFPgjF4IzPF567YG/HSCdZA==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.24.8", - "@babel/helper-environment-visitor": "^7.24.7", - "@babel/helper-function-name": "^7.24.7", - "@babel/helper-hoist-variables": "^7.24.7", - "@babel/helper-split-export-declaration": "^7.24.7", - "@babel/parser": "^7.24.8", - "@babel/types": "^7.24.8", + "@babel/generator": "^7.25.0", + "@babel/parser": "^7.25.0", + "@babel/template": "^7.25.0", + "@babel/types": "^7.25.0", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -730,9 +673,9 @@ } }, "node_modules/@babel/types": { - "version": "7.24.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.9.tgz", - "integrity": "sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.0.tgz", + "integrity": "sha512-LcnxQSsd9aXOIgmmSpvZ/1yo46ra2ESYyqLcryaBZOghxy5qqOBjvCWP5JfkI8yl9rlxRgdLTTMCQQRcN2hdCg==", "dev": true, "license": "MIT", "dependencies": { @@ -1289,6 +1232,7 @@ "version": "9.8.0", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.8.0.tgz", "integrity": "sha512-MfluB7EUfxXtv3i/++oh89uzAr4PDI4nn201hsp+qaXqsjAWzinlZEHEfPgAX4doIlKvPG/i0A9dpKxOLII8yA==", + "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } @@ -1383,9 +1327,9 @@ "license": "ISC" }, "node_modules/@inquirer/figures": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.4.tgz", - "integrity": "sha512-R7Gsg6elpuqdn55fBH2y9oYzrU/yKrSmIsDX4ROT51vohrECFzTf2zw9BfUbOW8xjfmM2QbVoVYdTwhrtEKWSQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.5.tgz", + "integrity": "sha512-79hP/VWdZ2UVc9bFGJnoQ/lQMpL74mGgzSYX1xUqCVk7/v73vJCMw1VuyWN1jGkZ9B3z7THAbySqGbCNefcjfA==", "license": "MIT", "engines": { "node": ">=18" @@ -2905,6 +2849,16 @@ "type-detect": "4.0.8" } }, + "node_modules/@sinonjs/commons/node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/@sinonjs/fake-timers": { "version": "11.2.2", "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz", @@ -2937,6 +2891,16 @@ "type-detect": "4.0.8" } }, + "node_modules/@sinonjs/samsam/node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/@sinonjs/text-encoding": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz", @@ -2989,7 +2953,8 @@ "version": "4.3.16", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.16.tgz", "integrity": "sha512-PatH4iOdyh3MyWtmHVFXLWCCIhUbopaltqddG9BzB+gMIzee2MJrvd+jouii9Z3wzQJruGWAm7WOMjgfG8hQlQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/ejs": { "version": "3.1.5", @@ -3085,9 +3050,9 @@ } }, "node_modules/@types/markdown-it": { - "version": "14.1.1", - "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.1.tgz", - "integrity": "sha512-4NpsnpYl2Gt1ljyBGrKMxFYAYvpqbnnkgP/i/g+NLpjEUa3obn1XJCur9YbEXKDAkaXqsR1LbDnGEJ0MmKFxfg==", + "version": "14.1.2", + "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz", + "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==", "dev": true, "license": "MIT", "dependencies": { @@ -3211,6 +3176,7 @@ "version": "7.17.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.17.0.tgz", "integrity": "sha512-pyiDhEuLM3PuANxH7uNYan1AaFs5XE0zw1hq69JBvGvE7gSuEoQl1ydtEe/XQeoC3GQxLXyOVa5kNOATgM638A==", + "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "7.17.0", @@ -3243,6 +3209,7 @@ "version": "7.17.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.17.0.tgz", "integrity": "sha512-puiYfGeg5Ydop8eusb/Hy1k7QmOU6X3nvsqCgzrB2K4qMavK//21+PzNE8qeECgNOIoertJPUC1SpegHDI515A==", + "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/scope-manager": "7.17.0", "@typescript-eslint/types": "7.17.0", @@ -3270,6 +3237,7 @@ "version": "7.17.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.17.0.tgz", "integrity": "sha512-0P2jTTqyxWp9HiKLu/Vemr2Rg1Xb5B7uHItdVZ6iAenXmPo4SZ86yOPCJwMqpCyaMiEHTNqizHfsbmCFT1x9SA==", + "license": "MIT", "dependencies": { "@typescript-eslint/types": "7.17.0", "@typescript-eslint/visitor-keys": "7.17.0" @@ -3286,6 +3254,7 @@ "version": "7.17.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.17.0.tgz", "integrity": "sha512-XD3aaBt+orgkM/7Cei0XNEm1vwUxQ958AOLALzPlbPqb8C1G8PZK85tND7Jpe69Wualri81PLU+Zc48GVKIMMA==", + "license": "MIT", "dependencies": { "@typescript-eslint/typescript-estree": "7.17.0", "@typescript-eslint/utils": "7.17.0", @@ -3312,6 +3281,7 @@ "version": "7.17.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.17.0.tgz", "integrity": "sha512-a29Ir0EbyKTKHnZWbNsrc/gqfIBqYPwj3F2M+jWE/9bqfEHg0AMtXzkbUkOG6QgEScxh2+Pz9OXe11jHDnHR7A==", + "license": "MIT", "engines": { "node": "^18.18.0 || >=20.0.0" }, @@ -3324,6 +3294,7 @@ "version": "7.17.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.17.0.tgz", "integrity": "sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw==", + "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/types": "7.17.0", "@typescript-eslint/visitor-keys": "7.17.0", @@ -3351,6 +3322,7 @@ "version": "7.17.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.17.0.tgz", "integrity": "sha512-r+JFlm5NdB+JXc7aWWZ3fKSm1gn0pkswEwIYsrGPdsT2GjsRATAKXiNtp3vgAAO1xZhX8alIOEQnNMl3kbTgJw==", + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@typescript-eslint/scope-manager": "7.17.0", @@ -3372,6 +3344,7 @@ "version": "7.17.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.17.0.tgz", "integrity": "sha512-RVGC9UhPOCsfCdI9pU++K4nD7to+jTcMIbXTSOcrLqUEW6gF2pU1UUbYJKc9cvcRSK1UDeMJ7pdMxf4bhMpV/A==", + "license": "MIT", "dependencies": { "@typescript-eslint/types": "7.17.0", "eslint-visitor-keys": "^3.4.3" @@ -3439,9 +3412,9 @@ } }, "node_modules/@yeoman/conflicter/node_modules/@types/node": { - "version": "16.18.103", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.103.tgz", - "integrity": "sha512-gOAcUSik1nR/CRC3BsK8kr6tbmNIOTpvb1sT+v5Nmmys+Ho8YtnIHP90wEsVK4hTcHndOqPVIlehEGEA5y31bA==", + "version": "16.18.104", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.104.tgz", + "integrity": "sha512-OF3keVCbfPlkzxnnDBUZJn1RiCJzKeadjiW0xTEb0G1SUJ5gDVb3qnzZr2T4uIFvsbKJbXy1v2DN7e2zaEY7jQ==", "license": "MIT" }, "node_modules/@yeoman/namespace": { @@ -3468,9 +3441,9 @@ } }, "node_modules/@yeoman/transform/node_modules/@types/node": { - "version": "16.18.103", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.103.tgz", - "integrity": "sha512-gOAcUSik1nR/CRC3BsK8kr6tbmNIOTpvb1sT+v5Nmmys+Ho8YtnIHP90wEsVK4hTcHndOqPVIlehEGEA5y31bA==", + "version": "16.18.104", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.104.tgz", + "integrity": "sha512-OF3keVCbfPlkzxnnDBUZJn1RiCJzKeadjiW0xTEb0G1SUJ5gDVb3qnzZr2T4uIFvsbKJbXy1v2DN7e2zaEY7jQ==", "license": "MIT" }, "node_modules/@yeoman/types": { @@ -3506,9 +3479,9 @@ } }, "node_modules/@yeoman/types/node_modules/@types/node": { - "version": "16.18.103", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.103.tgz", - "integrity": "sha512-gOAcUSik1nR/CRC3BsK8kr6tbmNIOTpvb1sT+v5Nmmys+Ho8YtnIHP90wEsVK4hTcHndOqPVIlehEGEA5y31bA==", + "version": "16.18.104", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.104.tgz", + "integrity": "sha512-OF3keVCbfPlkzxnnDBUZJn1RiCJzKeadjiW0xTEb0G1SUJ5gDVb3qnzZr2T4uIFvsbKJbXy1v2DN7e2zaEY7jQ==", "license": "MIT" }, "node_modules/abbrev": { @@ -4334,9 +4307,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001642", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001642.tgz", - "integrity": "sha512-3XQ0DoRgLijXJErLSl+bLnJ+Et4KqV1PY6JJBGAFlsNsz31zeAIncyeZfLCabHK/jtSh+671RM9YMldxjUPZtA==", + "version": "1.0.30001643", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz", + "integrity": "sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==", "dev": true, "funding": [ { @@ -4372,6 +4345,7 @@ "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz", "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==", "dev": true, + "license": "MIT", "dependencies": { "assertion-error": "^1.1.0", "check-error": "^1.0.3", @@ -4385,15 +4359,6 @@ "node": ">=4" } }, - "node_modules/chai/node_modules/type-detect": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", - "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/chalk": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", @@ -5441,9 +5406,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.831", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.831.tgz", - "integrity": "sha512-6cKy9msoQGWhBF30n6y5ck80BdunKdwMRugM1lr74DMMXhjDRxSwMvrD1ncPP+n1PjF+KKmZZydvEF29skNZ1Q==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.2.tgz", + "integrity": "sha512-kc4r3U3V3WLaaZqThjYz/Y6z8tJe+7K0bbjUVo3i+LWIypVdMx5nXCkwRe6SWbY6ILqLdc1rKcKmr3HoH7wjSQ==", "dev": true, "license": "ISC" }, @@ -9275,9 +9240,9 @@ "license": "MIT" }, "node_modules/ky": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ky/-/ky-1.4.0.tgz", - "integrity": "sha512-tPhhoGUiEiU/WXR4rt8klIoLdnTtyu+9jVKHd/wauEjYud32jyn63mzKWQweaQrHWxBQtYoVtdcEnYX1LosnFQ==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/ky/-/ky-1.5.0.tgz", + "integrity": "sha512-bkQo+UqryW6Zmo/DsixYZE4Z9t2mzvNMhceyIhuMuInb3knm5Q+GNGMKveydJAj+Z6piN1SwI6eR/V0G+Z0BtA==", "license": "MIT", "engines": { "node": ">=18" @@ -9585,9 +9550,9 @@ } }, "node_modules/mem-fs-editor/node_modules/@types/node": { - "version": "18.19.41", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.41.tgz", - "integrity": "sha512-LX84pRJ+evD2e2nrgYCHObGWkiQJ1mL+meAgbvnwk/US6vmMY7S2ygBTGV2Jw91s9vUsLSXeDEkUHZIJGLrhsg==", + "version": "18.19.42", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.42.tgz", + "integrity": "sha512-d2ZFc/3lnK2YCYhos8iaNIYu9Vfhr92nHiyJHRltXWjXUBjEE+A4I58Tdbnw4VhggSW+2j5y5gTrLs4biNnubg==", "license": "MIT", "dependencies": { "undici-types": "~5.26.4" @@ -9915,9 +9880,9 @@ } }, "node_modules/mocha": { - "version": "10.6.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.6.0.tgz", - "integrity": "sha512-hxjt4+EEB0SA0ZDygSS015t65lJw/I2yRCS3Ae+SJ5FrbzrXgfYwJr96f0OvIXdj7h4lv/vLCrH3rkiuizFSvw==", + "version": "10.7.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.0.tgz", + "integrity": "sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==", "dev": true, "license": "MIT", "peer": true, @@ -10551,9 +10516,9 @@ "license": "MIT" }, "node_modules/node-releases": { - "version": "2.0.17", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.17.tgz", - "integrity": "sha512-Ww6ZlOiEQfPfXM45v17oabk77Z7mg5bOt7AjDyzy7RjK9OrLrLC8dyZQoAPEOtFX9SaNf1Tdvr5gRJWdTJj7GA==", + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", "dev": true, "license": "MIT" }, @@ -10643,9 +10608,9 @@ } }, "node_modules/npm-package-arg": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.2.tgz", - "integrity": "sha512-IGN0IAwmhDJwy13Wc8k+4PEbTPhpJnMtfR53ZbOyjkvmEcLS4nCwp6mvMWjS5sUjeiW3mpx6cHmuhKEu9XmcQw==", + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz", + "integrity": "sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==", "license": "ISC", "dependencies": { "hosted-git-info": "^7.0.0", @@ -11216,9 +11181,9 @@ } }, "node_modules/p-transform/node_modules/@types/node": { - "version": "16.18.103", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.103.tgz", - "integrity": "sha512-gOAcUSik1nR/CRC3BsK8kr6tbmNIOTpvb1sT+v5Nmmys+Ho8YtnIHP90wEsVK4hTcHndOqPVIlehEGEA5y31bA==", + "version": "16.18.104", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.104.tgz", + "integrity": "sha512-OF3keVCbfPlkzxnnDBUZJn1RiCJzKeadjiW0xTEb0G1SUJ5gDVb3qnzZr2T4uIFvsbKJbXy1v2DN7e2zaEY7jQ==", "license": "MIT" }, "node_modules/p-try": { @@ -11662,9 +11627,9 @@ } }, "node_modules/pretty-ms": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.0.0.tgz", - "integrity": "sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.1.0.tgz", + "integrity": "sha512-o1piW0n3tgKIKCwk2vpM/vOV13zjJzvP37Ioze54YlTHE06m4tjEbzg9WsKkvTuyYln2DHjo5pY4qrZGI0otpw==", "license": "MIT", "dependencies": { "parse-ms": "^4.0.0" @@ -13535,9 +13500,9 @@ } }, "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", "dev": true, "license": "MIT", "engines": { @@ -13548,6 +13513,7 @@ "version": "4.23.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.23.0.tgz", "integrity": "sha512-ZiBujro2ohr5+Z/hZWHESLz3g08BBdrdLMieYFULJO+tWc437sn8kQsWLJoZErY8alNhxre9K4p3GURAG11n+w==", + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=16" }, @@ -13676,9 +13642,9 @@ } }, "node_modules/underscore": { - "version": "1.13.6", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz", - "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==", + "version": "1.13.7", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz", + "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==", "dev": true, "license": "MIT" }, @@ -14355,6 +14321,7 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz", "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==", + "license": "ISC", "bin": { "yaml": "bin.mjs" }, @@ -14670,9 +14637,9 @@ } }, "node_modules/yeoman-generator/node_modules/@types/node": { - "version": "18.19.41", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.41.tgz", - "integrity": "sha512-LX84pRJ+evD2e2nrgYCHObGWkiQJ1mL+meAgbvnwk/US6vmMY7S2ygBTGV2Jw91s9vUsLSXeDEkUHZIJGLrhsg==", + "version": "18.19.42", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.42.tgz", + "integrity": "sha512-d2ZFc/3lnK2YCYhos8iaNIYu9Vfhr92nHiyJHRltXWjXUBjEE+A4I58Tdbnw4VhggSW+2j5y5gTrLs4biNnubg==", "license": "MIT", "dependencies": { "undici-types": "~5.26.4" From ec4be7aa202fc0d6587a35d2351707275e1f5e16 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 01:10:26 +0000 Subject: [PATCH 086/938] Bump husky from 9.1.2 to 9.1.3 in /generators/javascript/resources Bumps [husky](https://github.com/typicode/husky) from 9.1.2 to 9.1.3. - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v9.1.2...v9.1.3) --- updated-dependencies: - dependency-name: husky dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/javascript/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/javascript/resources/package.json b/generators/javascript/resources/package.json index 8aa1a6d6b7e6..ce5013ac9990 100644 --- a/generators/javascript/resources/package.json +++ b/generators/javascript/resources/package.json @@ -2,7 +2,7 @@ "dependencies": { "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", - "husky": "9.1.2", + "husky": "9.1.3", "lint-staged": "15.2.7" } } From a2d0287b428f752b629b206a6c39ee93209dcb25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 01:26:55 +0000 Subject: [PATCH 087/938] Bump the eslint group in /generators/react/resources with 2 updates Bumps the eslint group in /generators/react/resources with 2 updates: [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) and [eslint](https://github.com/eslint/eslint). Updates `@eslint/js` from 9.7.0 to 9.8.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/commits/v9.8.0/packages/js) Updates `eslint` from 9.7.0 to 9.8.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.7.0...v9.8.0) --- updated-dependencies: - dependency-name: "@eslint/js" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index ebcb6678aaae..27a28a61a237 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -29,7 +29,7 @@ "webstomp-client": "1.2.6" }, "devDependencies": { - "@eslint/js": "9.7.0", + "@eslint/js": "9.8.0", "@module-federation/utilities": "3.0.3-0", "@testing-library/react": "16.0.0", "@types/jest": "29.5.12", @@ -48,7 +48,7 @@ "cross-env": "7.0.3", "css-loader": "7.1.2", "css-minimizer-webpack-plugin": "7.0.0", - "eslint": "9.7.0", + "eslint": "9.8.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", "eslint-plugin-react": "7.35.0", From 08ee9ca2969ade6583eaa34c52a4384d366d2430 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 01:27:14 +0000 Subject: [PATCH 088/938] Bump @reduxjs/toolkit in /generators/react/resources in the react group Bumps the react group in /generators/react/resources with 1 update: [@reduxjs/toolkit](https://github.com/reduxjs/redux-toolkit). Updates `@reduxjs/toolkit` from 2.2.6 to 2.2.7 - [Release notes](https://github.com/reduxjs/redux-toolkit/releases) - [Commits](https://github.com/reduxjs/redux-toolkit/compare/v2.2.6...v2.2.7) --- updated-dependencies: - dependency-name: "@reduxjs/toolkit" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: react ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index ebcb6678aaae..e81e8ed87a1e 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -3,7 +3,7 @@ "@fortawesome/fontawesome-svg-core": "6.6.0", "@fortawesome/free-solid-svg-icons": "6.6.0", "@fortawesome/react-fontawesome": "0.2.2", - "@reduxjs/toolkit": "2.2.6", + "@reduxjs/toolkit": "2.2.7", "axios": "1.7.2", "bootstrap": "5.3.3", "bootswatch": "5.3.3", From fc11a8c9f2b4ea409375084a0eb0ac85cc419115 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 01:27:30 +0000 Subject: [PATCH 089/938] Bump sass-loader from 15.0.0 to 16.0.0 in /generators/react/resources Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 15.0.0 to 16.0.0. - [Release notes](https://github.com/webpack-contrib/sass-loader/releases) - [Changelog](https://github.com/webpack-contrib/sass-loader/blob/v16.0.0/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/sass-loader/compare/v15.0.0...v16.0.0) --- updated-dependencies: - dependency-name: sass-loader dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index ebcb6678aaae..68fdb079f4b2 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -70,7 +70,7 @@ "redux-mock-store": "1.5.4", "rimraf": "5.0.8", "sass": "1.77.8", - "sass-loader": "15.0.0", + "sass-loader": "16.0.0", "simple-progress-webpack-plugin": "2.0.0", "sinon": "18.0.0", "source-map-loader": "5.0.0", From 5a70ebd333c12d178b0cf02b545666bf0f44a537 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 02:25:41 +0000 Subject: [PATCH 090/938] Bump the eslint group in /generators/vue/resources with 2 updates Bumps the eslint group in /generators/vue/resources with 2 updates: [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) and [eslint](https://github.com/eslint/eslint). Updates `@eslint/js` from 9.7.0 to 9.8.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/commits/v9.8.0/packages/js) Updates `eslint` from 9.7.0 to 9.8.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.7.0...v9.8.0) --- updated-dependencies: - dependency-name: "@eslint/js" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index aeb21b15e797..e28dcbd556f2 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -21,7 +21,7 @@ "vue-router": "4.4.0" }, "devDependencies": { - "@eslint/js": "9.7.0", + "@eslint/js": "9.8.0", "@module-federation/utilities": "3.0.3-0", "@pinia/testing": "0.1.3", "@tsconfig/node18": "18.2.4", @@ -36,7 +36,7 @@ "copy-webpack-plugin": "12.0.2", "css-loader": "7.1.2", "css-minimizer-webpack-plugin": "7.0.0", - "eslint": "9.7.0", + "eslint": "9.8.0", "eslint-plugin-prettier": "5.2.1", "eslint-plugin-vue": "9.27.0", "flush-promises": "1.0.2", From b2a9f966e18173b898fc94597045038b248fdeae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 02:25:58 +0000 Subject: [PATCH 091/938] Bump sass-loader from 15.0.0 to 16.0.0 in /generators/vue/resources Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 15.0.0 to 16.0.0. - [Release notes](https://github.com/webpack-contrib/sass-loader/releases) - [Changelog](https://github.com/webpack-contrib/sass-loader/blob/v16.0.0/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/sass-loader/compare/v15.0.0...v16.0.0) --- updated-dependencies: - dependency-name: sass-loader dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index aeb21b15e797..19d58494e3ce 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -51,7 +51,7 @@ "postcss-url": "10.1.3", "rimraf": "5.0.8", "sass": "1.77.8", - "sass-loader": "15.0.0", + "sass-loader": "16.0.0", "sinon": "18.0.0", "terser-webpack-plugin": "5.3.10", "ts-loader": "9.5.1", From 7bb50a3c8850e79dfc7cc4ed6e70e87c237212e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 02:26:16 +0000 Subject: [PATCH 092/938] Bump typescript-eslint in /generators/vue/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.54 to 8.0.0-alpha.55. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/HEAD/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index aeb21b15e797..7b809ec9ac06 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -56,7 +56,7 @@ "terser-webpack-plugin": "5.3.10", "ts-loader": "9.5.1", "typescript": "5.5.4", - "typescript-eslint": "8.0.0-alpha.54", + "typescript-eslint": "8.0.0-alpha.55", "vite": "5.3.5", "vite-plugin-static-copy": "1.0.6", "vitest": "2.0.4", From c7a1a85f4718b832c023bfde29232c928aafa1e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 02:26:36 +0000 Subject: [PATCH 093/938] Bump @vitejs/plugin-vue from 5.1.0 to 5.1.1 in /generators/vue/resources Bumps [@vitejs/plugin-vue](https://github.com/vitejs/vite-plugin-vue/tree/HEAD/packages/plugin-vue) from 5.1.0 to 5.1.1. - [Release notes](https://github.com/vitejs/vite-plugin-vue/releases) - [Changelog](https://github.com/vitejs/vite-plugin-vue/blob/main/packages/plugin-vue/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite-plugin-vue/commits/plugin-vue@5.1.1/packages/plugin-vue) --- updated-dependencies: - dependency-name: "@vitejs/plugin-vue" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index aeb21b15e797..002dea65fd69 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -27,7 +27,7 @@ "@tsconfig/node18": "18.2.4", "@types/node": "20.11.25", "@types/sinon": "17.0.3", - "@vitejs/plugin-vue": "5.1.0", + "@vitejs/plugin-vue": "5.1.1", "@vue/test-utils": "2.4.6", "@vue/tsconfig": "0.5.1", "autoprefixer": "10.4.19", From 6427d64990a23e661fd6619a932779c9e64a4865 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 02:45:31 +0000 Subject: [PATCH 094/938] Bump @pinia/testing from 0.1.3 to 0.1.4 in /generators/vue/resources Bumps [@pinia/testing](https://github.com/vuejs/pinia) from 0.1.3 to 0.1.4. - [Release notes](https://github.com/vuejs/pinia/releases) - [Commits](https://github.com/vuejs/pinia/compare/@pinia/testing@0.1.3...@pinia/testing@0.1.4) --- updated-dependencies: - dependency-name: "@pinia/testing" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index e28dcbd556f2..ebfcc59ad906 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -23,7 +23,7 @@ "devDependencies": { "@eslint/js": "9.8.0", "@module-federation/utilities": "3.0.3-0", - "@pinia/testing": "0.1.3", + "@pinia/testing": "0.1.4", "@tsconfig/node18": "18.2.4", "@types/node": "20.11.25", "@types/sinon": "17.0.3", From f89f1a09ca747a60e3983480047107f4a6e31494 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 03:25:21 +0000 Subject: [PATCH 095/938] Bump eslint in /generators/angular/resources in the eslint group Bumps the eslint group in /generators/angular/resources with 1 update: [eslint](https://github.com/eslint/eslint). Updates `eslint` from 9.7.0 to 9.8.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.7.0...v9.8.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 178ccfa76c48..aeb1b05e08f3 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -32,7 +32,7 @@ "browser-sync-webpack-plugin": "2.3.0", "buffer": "6.0.3", "copy-webpack-plugin": "12.0.2", - "eslint": "9.7.0", + "eslint": "9.8.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", "eslint-webpack-plugin": "4.2.0", From fcf8826c0fc10fc0124c6991558c3f1da6f07b7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 03:25:33 +0000 Subject: [PATCH 096/938] Bump typescript-eslint in /generators/angular/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.54 to 8.0.0-alpha.55. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/HEAD/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 178ccfa76c48..6dd851190460 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -48,7 +48,7 @@ "rimraf": "5.0.8", "ts-jest": "29.2.3", "typescript": "5.4.5", - "typescript-eslint": "8.0.0-alpha.54", + "typescript-eslint": "8.0.0-alpha.55", "webpack": "5.93.0", "webpack-bundle-analyzer": "4.10.2", "webpack-merge": "6.0.1", From a3a0005ddbdf2e00fa29a586085afaa23a578b55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 08:58:08 +0000 Subject: [PATCH 097/938] Bump eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter Bumps eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter from 2.10.4 to 2.11.0. --- updated-dependencies: - dependency-name: eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/server/resources/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/gradle/libs.versions.toml b/generators/server/resources/gradle/libs.versions.toml index 5e8c4b238f37..69ef0f91215b 100644 --- a/generators/server/resources/gradle/libs.versions.toml +++ b/generators/server/resources/gradle/libs.versions.toml @@ -11,7 +11,7 @@ cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.18.1' } mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.4.4' } -neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.10.4' } +neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.11.0' } # Cassandra lz4-java = { module = 'org.lz4:lz4-java', version = '1.8.0' } From a157c98a5e7d97523c482db7e0aae2936b2334ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 12:28:17 +0000 Subject: [PATCH 098/938] Bump eslint in /generators/generate-blueprint/resources Bumps [eslint](https://github.com/eslint/eslint) from 9.7.0 to 9.8.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.7.0...v9.8.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/generate-blueprint/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generate-blueprint/resources/package.json b/generators/generate-blueprint/resources/package.json index 9a56e8abdc76..60423e24e06c 100644 --- a/generators/generate-blueprint/resources/package.json +++ b/generators/generate-blueprint/resources/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "eslint": "9.7.0", + "eslint": "9.8.0", "globals": "15.8.0", "vitest": "2.0.4" } From b0f2edc8134067bbc670720a511b40b5b9406895 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 22:36:53 +0000 Subject: [PATCH 099/938] Bump fast-xml-parser from 4.4.0 to 4.4.1 Bumps [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) from 4.4.0 to 4.4.1. - [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases) - [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/NaturalIntelligence/fast-xml-parser/compare/v4.4.0...v4.4.1) --- updated-dependencies: - dependency-name: fast-xml-parser dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0eb177ed9fe7..c9867e71ae17 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,7 @@ "eslint-plugin-import": "2.29.1", "eslint-plugin-unused-imports": "3.2.0", "execa": "9.3.0", - "fast-xml-parser": "4.4.0", + "fast-xml-parser": "4.4.1", "glob": "10.4.2", "isbinaryfile": "5.0.2", "java-lint": "0.3.0", @@ -6583,9 +6583,9 @@ "license": "MIT" }, "node_modules/fast-xml-parser": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.0.tgz", - "integrity": "sha512-kLY3jFlwIYwBNDojclKsNAC12sfD6NwW74QB2CoNGPvtVxjliYehVunB3HYyNi+n4Tt1dAcgwYvmKF/Z18flqg==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz", + "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==", "funding": [ { "type": "github", @@ -6596,7 +6596,6 @@ "url": "https://paypal.me/naturalintelligence" } ], - "license": "MIT", "dependencies": { "strnum": "^1.0.5" }, diff --git a/package.json b/package.json index 4016a48b2663..a4d7a03bcd04 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "eslint-plugin-import": "2.29.1", "eslint-plugin-unused-imports": "3.2.0", "execa": "9.3.0", - "fast-xml-parser": "4.4.0", + "fast-xml-parser": "4.4.1", "glob": "10.4.2", "isbinaryfile": "5.0.2", "java-lint": "0.3.0", From 1a4b93868a7d5b2e890ab2c244ffcfb46f775ac3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 23:18:20 +0000 Subject: [PATCH 100/938] Bump the typescript-eslint group with 2 updates Bumps the typescript-eslint group with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser). Updates `@typescript-eslint/eslint-plugin` from 7.17.0 to 7.18.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.18.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 7.17.0 to 7.18.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.18.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: typescript-eslint - dependency-name: "@typescript-eslint/parser" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: typescript-eslint ... Signed-off-by: dependabot[bot] --- package-lock.json | 98 ++++++++++++++++++++++------------------------- package.json | 4 +- 2 files changed, 47 insertions(+), 55 deletions(-) diff --git a/package-lock.json b/package-lock.json index c9867e71ae17..ae58d9fd7291 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,8 +14,8 @@ "@iarna/toml": "3.0.0", "@types/ejs": "3.1.5", "@types/lodash": "4.17.6", - "@typescript-eslint/eslint-plugin": "7.17.0", - "@typescript-eslint/parser": "7.17.0", + "@typescript-eslint/eslint-plugin": "7.18.0", + "@typescript-eslint/parser": "7.18.0", "@yeoman/adapter": "1.4.0", "@yeoman/conflicter": "2.0.0", "@yeoman/namespace": "1.0.0", @@ -3173,16 +3173,15 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.17.0.tgz", - "integrity": "sha512-pyiDhEuLM3PuANxH7uNYan1AaFs5XE0zw1hq69JBvGvE7gSuEoQl1ydtEe/XQeoC3GQxLXyOVa5kNOATgM638A==", - "license": "MIT", + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz", + "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.17.0", - "@typescript-eslint/type-utils": "7.17.0", - "@typescript-eslint/utils": "7.17.0", - "@typescript-eslint/visitor-keys": "7.17.0", + "@typescript-eslint/scope-manager": "7.18.0", + "@typescript-eslint/type-utils": "7.18.0", + "@typescript-eslint/utils": "7.18.0", + "@typescript-eslint/visitor-keys": "7.18.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -3206,15 +3205,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.17.0.tgz", - "integrity": "sha512-puiYfGeg5Ydop8eusb/Hy1k7QmOU6X3nvsqCgzrB2K4qMavK//21+PzNE8qeECgNOIoertJPUC1SpegHDI515A==", - "license": "BSD-2-Clause", - "dependencies": { - "@typescript-eslint/scope-manager": "7.17.0", - "@typescript-eslint/types": "7.17.0", - "@typescript-eslint/typescript-estree": "7.17.0", - "@typescript-eslint/visitor-keys": "7.17.0", + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz", + "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==", + "dependencies": { + "@typescript-eslint/scope-manager": "7.18.0", + "@typescript-eslint/types": "7.18.0", + "@typescript-eslint/typescript-estree": "7.18.0", + "@typescript-eslint/visitor-keys": "7.18.0", "debug": "^4.3.4" }, "engines": { @@ -3234,13 +3232,12 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.17.0.tgz", - "integrity": "sha512-0P2jTTqyxWp9HiKLu/Vemr2Rg1Xb5B7uHItdVZ6iAenXmPo4SZ86yOPCJwMqpCyaMiEHTNqizHfsbmCFT1x9SA==", - "license": "MIT", + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz", + "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==", "dependencies": { - "@typescript-eslint/types": "7.17.0", - "@typescript-eslint/visitor-keys": "7.17.0" + "@typescript-eslint/types": "7.18.0", + "@typescript-eslint/visitor-keys": "7.18.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3251,13 +3248,12 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.17.0.tgz", - "integrity": "sha512-XD3aaBt+orgkM/7Cei0XNEm1vwUxQ958AOLALzPlbPqb8C1G8PZK85tND7Jpe69Wualri81PLU+Zc48GVKIMMA==", - "license": "MIT", + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz", + "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==", "dependencies": { - "@typescript-eslint/typescript-estree": "7.17.0", - "@typescript-eslint/utils": "7.17.0", + "@typescript-eslint/typescript-estree": "7.18.0", + "@typescript-eslint/utils": "7.18.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -3278,10 +3274,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.17.0.tgz", - "integrity": "sha512-a29Ir0EbyKTKHnZWbNsrc/gqfIBqYPwj3F2M+jWE/9bqfEHg0AMtXzkbUkOG6QgEScxh2+Pz9OXe11jHDnHR7A==", - "license": "MIT", + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz", + "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==", "engines": { "node": "^18.18.0 || >=20.0.0" }, @@ -3291,13 +3286,12 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.17.0.tgz", - "integrity": "sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw==", - "license": "BSD-2-Clause", + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz", + "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==", "dependencies": { - "@typescript-eslint/types": "7.17.0", - "@typescript-eslint/visitor-keys": "7.17.0", + "@typescript-eslint/types": "7.18.0", + "@typescript-eslint/visitor-keys": "7.18.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3319,15 +3313,14 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.17.0.tgz", - "integrity": "sha512-r+JFlm5NdB+JXc7aWWZ3fKSm1gn0pkswEwIYsrGPdsT2GjsRATAKXiNtp3vgAAO1xZhX8alIOEQnNMl3kbTgJw==", - "license": "MIT", + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz", + "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "7.17.0", - "@typescript-eslint/types": "7.17.0", - "@typescript-eslint/typescript-estree": "7.17.0" + "@typescript-eslint/scope-manager": "7.18.0", + "@typescript-eslint/types": "7.18.0", + "@typescript-eslint/typescript-estree": "7.18.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3341,12 +3334,11 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.17.0.tgz", - "integrity": "sha512-RVGC9UhPOCsfCdI9pU++K4nD7to+jTcMIbXTSOcrLqUEW6gF2pU1UUbYJKc9cvcRSK1UDeMJ7pdMxf4bhMpV/A==", - "license": "MIT", + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz", + "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==", "dependencies": { - "@typescript-eslint/types": "7.17.0", + "@typescript-eslint/types": "7.18.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { diff --git a/package.json b/package.json index a4d7a03bcd04..577c5617fa03 100644 --- a/package.json +++ b/package.json @@ -122,8 +122,8 @@ "@iarna/toml": "3.0.0", "@types/ejs": "3.1.5", "@types/lodash": "4.17.6", - "@typescript-eslint/eslint-plugin": "7.17.0", - "@typescript-eslint/parser": "7.17.0", + "@typescript-eslint/eslint-plugin": "7.18.0", + "@typescript-eslint/parser": "7.18.0", "@yeoman/adapter": "1.4.0", "@yeoman/conflicter": "2.0.0", "@yeoman/namespace": "1.0.0", From ead7bc13bfc94da682587742f28613d902f78ddf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 23:19:01 +0000 Subject: [PATCH 101/938] Bump eslint-plugin-mocha from 10.4.3 to 10.5.0 Bumps [eslint-plugin-mocha](https://github.com/lo1tuma/eslint-plugin-mocha) from 10.4.3 to 10.5.0. - [Release notes](https://github.com/lo1tuma/eslint-plugin-mocha/releases) - [Changelog](https://github.com/lo1tuma/eslint-plugin-mocha/blob/10.5.0/CHANGELOG.md) - [Commits](https://github.com/lo1tuma/eslint-plugin-mocha/compare/10.4.3...10.5.0) --- updated-dependencies: - dependency-name: eslint-plugin-mocha dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index c9867e71ae17..c84cf1538748 100644 --- a/package-lock.json +++ b/package-lock.json @@ -80,7 +80,7 @@ "ejs-lint": "2.0.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-chai-friendly": "1.0.0", - "eslint-plugin-mocha": "10.4.3", + "eslint-plugin-mocha": "10.5.0", "eslint-plugin-prettier": "5.2.1", "esmocha": "1.2.0", "jest-extended": "4.0.2", @@ -5893,11 +5893,10 @@ } }, "node_modules/eslint-plugin-mocha": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.4.3.tgz", - "integrity": "sha512-emc4TVjq5Ht0/upR+psftuz6IBG5q279p+1dSRDeHf+NS9aaerBi3lXKo1SEzwC29hFIW21gO89CEWSvRsi8IQ==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.5.0.tgz", + "integrity": "sha512-F2ALmQVPT1GoP27O1JTZGrV9Pqg8k79OeIuvw63UxMtQKREZtmkK1NFgkZQ2TW7L2JSSFKHFPTtHu5z8R9QNRw==", "dev": true, - "license": "MIT", "dependencies": { "eslint-utils": "^3.0.0", "globals": "^13.24.0", diff --git a/package.json b/package.json index a4d7a03bcd04..84281b70996c 100644 --- a/package.json +++ b/package.json @@ -185,7 +185,7 @@ "ejs-lint": "2.0.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-chai-friendly": "1.0.0", - "eslint-plugin-mocha": "10.4.3", + "eslint-plugin-mocha": "10.5.0", "eslint-plugin-prettier": "5.2.1", "esmocha": "1.2.0", "jest-extended": "4.0.2", From 16b0be77123c2259821f0ec56a162778b40b9d6f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 23:19:18 +0000 Subject: [PATCH 102/938] Bump debug from 4.3.5 to 4.3.6 Bumps [debug](https://github.com/debug-js/debug) from 4.3.5 to 4.3.6. - [Release notes](https://github.com/debug-js/debug/releases) - [Commits](https://github.com/debug-js/debug/compare/4.3.5...4.3.6) --- updated-dependencies: - dependency-name: debug dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index c9867e71ae17..582a94815b0c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "chevrotain": "11.0.3", "commander": "12.1.0", "conf": "13.0.1", - "debug": "4.3.5", + "debug": "4.3.6", "didyoumean": "1.2.2", "dockerfile-ast": "0.6.1", "dot-properties": "1.0.1", @@ -4988,10 +4988,9 @@ } }, "node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", - "license": "MIT", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "dependencies": { "ms": "2.1.2" }, diff --git a/package.json b/package.json index a4d7a03bcd04..5e6dfbabaae1 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "chevrotain": "11.0.3", "commander": "12.1.0", "conf": "13.0.1", - "debug": "4.3.5", + "debug": "4.3.6", "didyoumean": "1.2.2", "dockerfile-ast": "0.6.1", "dot-properties": "1.0.1", From e7337d14c9dc06284c7ad4daeef5ec6390034dc5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 00:19:29 +0000 Subject: [PATCH 103/938] Bump husky from 9.1.3 to 9.1.4 in /generators/javascript/resources Bumps [husky](https://github.com/typicode/husky) from 9.1.3 to 9.1.4. - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v9.1.3...v9.1.4) --- updated-dependencies: - dependency-name: husky dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/javascript/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/javascript/resources/package.json b/generators/javascript/resources/package.json index ce5013ac9990..dfe95bb1d3e7 100644 --- a/generators/javascript/resources/package.json +++ b/generators/javascript/resources/package.json @@ -2,7 +2,7 @@ "dependencies": { "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", - "husky": "9.1.3", + "husky": "9.1.4", "lint-staged": "15.2.7" } } From ceff1d2e95b93c6e1bd48875bb7d077a1bdf975c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 01:39:21 +0000 Subject: [PATCH 104/938] Bump postcss-rtlcss from 5.3.0 to 5.3.1 in /generators/react/resources Bumps [postcss-rtlcss](https://github.com/elchininet/postcss-rtlcss) from 5.3.0 to 5.3.1. - [Release notes](https://github.com/elchininet/postcss-rtlcss/releases) - [Changelog](https://github.com/elchininet/postcss-rtlcss/blob/master/CHANGELOG.md) - [Commits](https://github.com/elchininet/postcss-rtlcss/compare/v5.3.0...v5.3.1) --- updated-dependencies: - dependency-name: postcss-rtlcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index 09face2c4070..025a5caeb63a 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -65,7 +65,7 @@ "merge-jsons-webpack-plugin": "2.0.1", "mini-css-extract-plugin": "2.9.0", "postcss-loader": "8.1.1", - "postcss-rtlcss": "5.3.0", + "postcss-rtlcss": "5.3.1", "react-infinite-scroll-component": "6.1.0", "redux-mock-store": "1.5.4", "rimraf": "5.0.8", From fb0fa32e3229faf53c899dbf9a531a4a062e4ff1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 01:39:45 +0000 Subject: [PATCH 105/938] Bump typescript-eslint in /generators/react/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.54 to 8.0.0-alpha.58. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/HEAD/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index 09face2c4070..3a1d01adf2a6 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -81,7 +81,7 @@ "ts-jest": "29.2.3", "ts-loader": "9.5.1", "typescript": "5.5.4", - "typescript-eslint": "8.0.0-alpha.54", + "typescript-eslint": "8.0.0-alpha.58", "webpack": "5.93.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", From be7715456eefea4be65996714085b8920fe10453 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 02:58:45 +0000 Subject: [PATCH 106/938] Bump typescript-eslint in /generators/vue/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.55 to 8.0.0-alpha.58. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/HEAD/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 2f11277c0eb2..ffebc0bcf701 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -56,7 +56,7 @@ "terser-webpack-plugin": "5.3.10", "ts-loader": "9.5.1", "typescript": "5.5.4", - "typescript-eslint": "8.0.0-alpha.55", + "typescript-eslint": "8.0.0-alpha.58", "vite": "5.3.5", "vite-plugin-static-copy": "1.0.6", "vitest": "2.0.4", From 3d4c4b8d38511f112d0b8d9ec1a39a2804f65078 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 03:19:33 +0000 Subject: [PATCH 107/938] Bump typescript-eslint in /generators/angular/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.55 to 8.0.0-alpha.58. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/HEAD/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index f8417bcdebc3..05480b95eb6b 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -48,7 +48,7 @@ "rimraf": "5.0.8", "ts-jest": "29.2.3", "typescript": "5.4.5", - "typescript-eslint": "8.0.0-alpha.55", + "typescript-eslint": "8.0.0-alpha.58", "webpack": "5.93.0", "webpack-bundle-analyzer": "4.10.2", "webpack-merge": "6.0.1", From 5baa33393d9593594a2dfb134fc56dc77bd982a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 03:19:39 +0000 Subject: [PATCH 108/938] Bump postcss-rtlcss from 5.3.0 to 5.3.1 in /generators/angular/resources Bumps [postcss-rtlcss](https://github.com/elchininet/postcss-rtlcss) from 5.3.0 to 5.3.1. - [Release notes](https://github.com/elchininet/postcss-rtlcss/releases) - [Changelog](https://github.com/elchininet/postcss-rtlcss/blob/master/CHANGELOG.md) - [Commits](https://github.com/elchininet/postcss-rtlcss/compare/v5.3.0...v5.3.1) --- updated-dependencies: - dependency-name: postcss-rtlcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index f8417bcdebc3..8e093f65e74c 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -44,7 +44,7 @@ "jest-preset-angular": "14.2.0", "jest-sonar": "0.2.16", "merge-jsons-webpack-plugin": "2.0.1", - "postcss-rtlcss": "5.3.0", + "postcss-rtlcss": "5.3.1", "rimraf": "5.0.8", "ts-jest": "29.2.3", "typescript": "5.4.5", From 4ec74e002bfaf6dc12032730dc2a721f1c3b735d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 08:59:06 +0000 Subject: [PATCH 109/938] Bump org.redisson:redisson in /generators/spring-cache/resources Bumps [org.redisson:redisson](https://github.com/redisson/redisson) from 3.33.0 to 3.34.0. - [Release notes](https://github.com/redisson/redisson/releases) - [Changelog](https://github.com/redisson/redisson/blob/master/CHANGELOG.md) - [Commits](https://github.com/redisson/redisson/compare/redisson-3.33.0...redisson-3.34.0) --- updated-dependencies: - dependency-name: org.redisson:redisson dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/spring-cache/resources/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/spring-cache/resources/gradle/libs.versions.toml b/generators/spring-cache/resources/gradle/libs.versions.toml index 494d37d8007f..c25c36cf077f 100644 --- a/generators/spring-cache/resources/gradle/libs.versions.toml +++ b/generators/spring-cache/resources/gradle/libs.versions.toml @@ -12,4 +12,4 @@ xmemcached-provider = { module = 'com.google.code.simple-spring-memcached:xmemca xmemcached = { module = 'com.googlecode.xmemcached:xmemcached', version = '2.4.8' } -redisson = { module = 'org.redisson:redisson', version = '3.33.0' } +redisson = { module = 'org.redisson:redisson', version = '3.34.0' } From 4c3cda27d31c110f62c107b092003c26452efc85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 00:58:28 +0000 Subject: [PATCH 110/938] Bump grafana/grafana in /generators/server/resources Bumps grafana/grafana from 11.1.1 to 11.1.3. --- updated-dependencies: - dependency-name: grafana/grafana dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/server/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile index 76db73f4744c..be489be8944e 100644 --- a/generators/server/resources/Dockerfile +++ b/generators/server/resources/Dockerfile @@ -64,7 +64,7 @@ LABEL ALIAS=prometheus-alertmanager FROM quay.io/coreos/prometheus-operator:v0.42.1 LABEL ALIAS=prometheus-operator -FROM grafana/grafana:11.1.1 +FROM grafana/grafana:11.1.3 LABEL ALIAS=grafana FROM quay.io/coreos/grafana-watcher:v0.0.8 From 810f55fdd4d65f54fddec7328de289f91f381c0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 00:58:32 +0000 Subject: [PATCH 111/938] Bump redis from 7.2.5 to 7.4.0 in /generators/server/resources Bumps redis from 7.2.5 to 7.4.0. --- updated-dependencies: - dependency-name: redis dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/server/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile index 76db73f4744c..367a3b6ef8ea 100644 --- a/generators/server/resources/Dockerfile +++ b/generators/server/resources/Dockerfile @@ -38,7 +38,7 @@ LABEL ALIAS=hazelcast FROM memcached:1.6.29-alpine -FROM redis:7.2.5 +FROM redis:7.4.0 FROM confluentinc/cp-kafka:7.7.0 LABEL ALIAS=kafka From fadc36441ad346a8a5c5913c38d5d239dc604197 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 01:45:57 +0000 Subject: [PATCH 112/938] Bump typescript-eslint in /generators/react/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.58 to 8.0.0-alpha.60. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/HEAD/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index 23f963e7ffbc..4a62b1ae4771 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -81,7 +81,7 @@ "ts-jest": "29.2.3", "ts-loader": "9.5.1", "typescript": "5.5.4", - "typescript-eslint": "8.0.0-alpha.58", + "typescript-eslint": "8.0.0-alpha.60", "webpack": "5.93.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", From 6657dcc91d48d74980e9b1a471c692ff4c57328f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 02:52:24 +0000 Subject: [PATCH 113/938] Bump typescript-eslint in /generators/vue/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.58 to 8.0.0-alpha.60. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/HEAD/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index ffebc0bcf701..e84bd7130e0d 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -56,7 +56,7 @@ "terser-webpack-plugin": "5.3.10", "ts-loader": "9.5.1", "typescript": "5.5.4", - "typescript-eslint": "8.0.0-alpha.58", + "typescript-eslint": "8.0.0-alpha.60", "vite": "5.3.5", "vite-plugin-static-copy": "1.0.6", "vitest": "2.0.4", From b5331698539583e79173c7d93dd83336ab4f83b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 03:30:43 +0000 Subject: [PATCH 114/938] Bump jest-preset-angular Bumps the angular group in /generators/angular/resources with 1 update: [jest-preset-angular](https://github.com/thymikee/jest-preset-angular). Updates `jest-preset-angular` from 14.2.0 to 14.2.1 - [Release notes](https://github.com/thymikee/jest-preset-angular/releases) - [Changelog](https://github.com/thymikee/jest-preset-angular/blob/main/CHANGELOG.md) - [Commits](https://github.com/thymikee/jest-preset-angular/compare/v14.2.0...v14.2.1) --- updated-dependencies: - dependency-name: jest-preset-angular dependency-type: direct:development update-type: version-update:semver-patch dependency-group: angular ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index f7883b015ed8..66a741db32a4 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -41,7 +41,7 @@ "jest": "29.7.0", "jest-date-mock": "1.0.10", "jest-junit": "16.0.0", - "jest-preset-angular": "14.2.0", + "jest-preset-angular": "14.2.1", "jest-sonar": "0.2.16", "merge-jsons-webpack-plugin": "2.0.1", "postcss-rtlcss": "5.3.1", From f03324c1239c1a06e060b3b03d0214ba6a51f740 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 03:30:58 +0000 Subject: [PATCH 115/938] Bump typescript-eslint in /generators/angular/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.58 to 8.0.0-alpha.60. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/HEAD/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index f7883b015ed8..11739cc1a393 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -48,7 +48,7 @@ "rimraf": "5.0.8", "ts-jest": "29.2.3", "typescript": "5.4.5", - "typescript-eslint": "8.0.0-alpha.58", + "typescript-eslint": "8.0.0-alpha.60", "webpack": "5.93.0", "webpack-bundle-analyzer": "4.10.2", "webpack-merge": "6.0.1", From 330ccfdd08d3aee841a2160d074617f191c4e1fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 12:48:04 +0000 Subject: [PATCH 116/938] Bump vitest in /generators/generate-blueprint/resources Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 2.0.4 to 2.0.5. - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Commits](https://github.com/vitest-dev/vitest/commits/v2.0.5/packages/vitest) --- updated-dependencies: - dependency-name: vitest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/generate-blueprint/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generate-blueprint/resources/package.json b/generators/generate-blueprint/resources/package.json index 60423e24e06c..3d913b25590d 100644 --- a/generators/generate-blueprint/resources/package.json +++ b/generators/generate-blueprint/resources/package.json @@ -2,6 +2,6 @@ "dependencies": { "eslint": "9.8.0", "globals": "15.8.0", - "vitest": "2.0.4" + "vitest": "2.0.5" } } From 17b3b8829215a5f3ccbe994bb59d6e1fe1d986bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 18:15:28 +0000 Subject: [PATCH 117/938] Bump eslint-plugin-chai-friendly from 1.0.0 to 1.0.1 Bumps [eslint-plugin-chai-friendly](https://github.com/ihordiachenko/eslint-plugin-chai-friendly) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/ihordiachenko/eslint-plugin-chai-friendly/releases) - [Commits](https://github.com/ihordiachenko/eslint-plugin-chai-friendly/compare/v1.0.0...v1.0.1) --- updated-dependencies: - dependency-name: eslint-plugin-chai-friendly dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4c870b7bcceb..2dc7df3dc00c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -79,7 +79,7 @@ "cpy-cli": "5.0.0", "ejs-lint": "2.0.0", "eslint-config-prettier": "9.1.0", - "eslint-plugin-chai-friendly": "1.0.0", + "eslint-plugin-chai-friendly": "1.0.1", "eslint-plugin-mocha": "10.5.0", "eslint-plugin-prettier": "5.2.1", "esmocha": "1.2.0", @@ -5788,11 +5788,10 @@ } }, "node_modules/eslint-plugin-chai-friendly": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-chai-friendly/-/eslint-plugin-chai-friendly-1.0.0.tgz", - "integrity": "sha512-M7pDQ/H5IiMz1LsfNi7Js4LvKx7cx0VMJHT/u1d35GOXxkQdJ2vAeaLC5q6GW126KVOnUMJ8WvBMWWLxtfdcog==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-chai-friendly/-/eslint-plugin-chai-friendly-1.0.1.tgz", + "integrity": "sha512-dxD/uz1YKJ8U4yah1i+V/p/u+kHRy3YxTPe2nJGqb5lCR+ucan/KIexfZ5+q4X+tkllyMe86EBbAkdlwxNy3oQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" }, diff --git a/package.json b/package.json index 5eac1ed47051..914f2942768d 100644 --- a/package.json +++ b/package.json @@ -184,7 +184,7 @@ "cpy-cli": "5.0.0", "ejs-lint": "2.0.0", "eslint-config-prettier": "9.1.0", - "eslint-plugin-chai-friendly": "1.0.0", + "eslint-plugin-chai-friendly": "1.0.1", "eslint-plugin-mocha": "10.5.0", "eslint-plugin-prettier": "5.2.1", "esmocha": "1.2.0", From 33dab767d24bc5480831de6bb24718737c1dffab Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Wed, 31 Jul 2024 16:28:37 -0300 Subject: [PATCH 118/938] export jhipster7deprecatedProperties --- generators/base/support/index.ts | 2 +- generators/base/support/jhipster7-context.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/generators/base/support/index.ts b/generators/base/support/index.ts index 8776111c8956..de275e8387bc 100644 --- a/generators/base/support/index.ts +++ b/generators/base/support/index.ts @@ -22,7 +22,7 @@ export * from './config.js'; export * from './contents.js'; export * from './faker.js'; export { default as getHipster } from './hipster.js'; -export { default as createJHipster7Context } from './jhipster7-context.js'; +export * from './jhipster7-context.js'; export * from './logger.js'; export * from './namespace.js'; export * from './needles.js'; diff --git a/generators/base/support/jhipster7-context.js b/generators/base/support/jhipster7-context.js index 14ba76ec7b56..ce1efc630eea 100644 --- a/generators/base/support/jhipster7-context.js +++ b/generators/base/support/jhipster7-context.js @@ -17,7 +17,7 @@ import { upperFirstCamelCase } from './string.js'; const { BYTES, BYTE_BUFFER } = fieldTypes.RelationalOnlyDBTypes; -const deprecatedProperties = { +export const jhipster7deprecatedProperties = { GRADLE_VERSION: { replacement: 'gradleVersion', get: ({ data }) => data.gradleVersion, @@ -248,7 +248,7 @@ const deprecatedProperties = { data.prettierExtensions, }, _generateSqlSafeName: { - replacement: 'relationshipSqlSafeName', + replacement: 'relationshipSqlSafeName property', get: () => name => (isReservedTableName(name, 'sql') ? `e_${name}` : name), }, isFilterableType: { @@ -260,7 +260,7 @@ const deprecatedProperties = { get: () => getSpecificationBuildForType, }, getColumnName: { - replacement: 'entityTableName || relationship.columnName', + replacement: 'entityTableName || relationship.columnName property', get: () => hibernateSnakeCase, }, isUsingBuiltInUser: { @@ -299,8 +299,8 @@ const getPropertBuilder = const { generator, data } = context; const value = prop in data ? data[prop] : undefined; - if (prop in deprecatedProperties) { - const { replacement, get } = deprecatedProperties[prop]; + if (prop in jhipster7deprecatedProperties) { + const { replacement, get } = jhipster7deprecatedProperties[prop]; const fallBackValue = get(context); const valueDesc = prop in data ? `Value: ${value}, ` : ''; log( @@ -378,6 +378,6 @@ const createHandler = ({ log } = {}) => { }; }; -export default function createJHipster7Context(generator, data, options) { +export function createJHipster7Context(generator, data, options) { return new Proxy({ generator, data }, createHandler(options)); } From 782576511a4c9605a9b6ca96fd906882abcf1fac Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Wed, 31 Jul 2024 16:30:16 -0300 Subject: [PATCH 119/938] fail after customizeTemplatePaths if template is not found --- generators/base-core/generator.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/generators/base-core/generator.ts b/generators/base-core/generator.ts index b329a9b80111..f253c6ab2352 100644 --- a/generators/base-core/generator.ts +++ b/generators/base-core/generator.ts @@ -897,10 +897,6 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`; } } sourceFileFrom = existingTemplates.shift(); - - if (sourceFileFrom === undefined) { - throw new Error(`Template file ${sourceFile} was not found at ${rootTemplatesAbsolutePath}`); - } } else if (typeof rootTemplatesAbsolutePath === 'string') { sourceFileFrom = this.templatePath(rootTemplatesAbsolutePath, sourceFile); } else { @@ -931,6 +927,10 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`; templatesRoots = file.templatesRoots; } + if (sourceFileFrom === undefined) { + throw new Error(`Template file ${sourceFile} was not found at ${rootTemplatesAbsolutePath}`); + } + try { if (!appendEjs && extname(sourceFileFrom) !== '.ejs') { await (this as any).copyTemplateAsync(sourceFileFrom, targetFile); From 389cf66723f75815810e31e0be7032449c04f40f Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Wed, 31 Jul 2024 16:30:54 -0300 Subject: [PATCH 120/938] pass application to enum writeFiles --- generators/java/generators/domain/generator.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/java/generators/domain/generator.ts b/generators/java/generators/domain/generator.ts index 91e5b0877ebb..43f0681b8093 100644 --- a/generators/java/generators/domain/generator.ts +++ b/generators/java/generators/domain/generator.ts @@ -152,6 +152,7 @@ export default class DomainGenerator extends BaseApplicationGenerator { for (const entity of entities.filter(entity => !entity.skipServer)) { for (const field of entity.fields.filter(field => field.fieldIsEnum)) { const enumInfo = { + ...application, ...getEnumInfo(field, (entity as any).clientRootFolder), frontendAppName: (entity as any).frontendAppName, packageName: application.packageName, From 1cf62276e1ba1bfc918d38cf36c473545b19185f Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Wed, 31 Jul 2024 16:32:51 -0300 Subject: [PATCH 121/938] pass this and context to contextCustomizeTemplatePath, cascade file object. --- generators/base-application/types.d.ts | 19 ++++++++++++------- generators/base-core/generator.ts | 20 ++++++++++++-------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/generators/base-application/types.d.ts b/generators/base-application/types.d.ts index b2ed95ece4e9..b63e22762c61 100644 --- a/generators/base-application/types.d.ts +++ b/generators/base-application/types.d.ts @@ -1,3 +1,4 @@ +import CoreGenerator from '../base-core/generator.ts'; import { ClientApplication } from '../client/types.js'; import { I18nApplication } from '../languages/types.js'; import { SpringBootApplication } from '../server/types.js'; @@ -36,13 +37,17 @@ export type BaseApplication = { /** Customize templates sourceFile and destinationFile */ customizeTemplatePaths: Array< - (file: { - namespace: string; - sourceFile: string; - resolvedSourceFile: string; - destinationFile: string; - templatesRoots: string[]; - }) => undefined | { sourceFile: string; resolvedSourceFile: string; destinationFile: string; templatesRoots: string[] } + ( + this: CoreGenerator, + file: { + namespace: string; + sourceFile: string; + resolvedSourceFile: string; + destinationFile: string; + templatesRoots: string[]; + }, + context: any, + ) => undefined | { sourceFile: string; resolvedSourceFile: string; destinationFile: string; templatesRoots: string[] } >; } & I18nApplication; diff --git a/generators/base-core/generator.ts b/generators/base-core/generator.ts index f253c6ab2352..8a9286222549 100644 --- a/generators/base-core/generator.ts +++ b/generators/base-core/generator.ts @@ -903,7 +903,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`; sourceFileFrom = this.templatePath(sourceFile); } - const file = customizeTemplatePath({ sourceFile, resolvedSourceFile: sourceFileFrom, destinationFile: targetFile }); + const file = customizeTemplatePath.call(this, { sourceFile, resolvedSourceFile: sourceFileFrom, destinationFile: targetFile }); if (!file) { return undefined; } @@ -912,13 +912,17 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`; let templatesRoots: string[] = [].concat(rootTemplatesAbsolutePath); for (const contextCustomizeTemplatePath of contextCustomizeTemplatePaths) { - const file = contextCustomizeTemplatePath({ - namespace: this.options.namespace, - sourceFile, - resolvedSourceFile: sourceFileFrom, - destinationFile: targetFile, - templatesRoots, - }); + const file = contextCustomizeTemplatePath.call( + this, + { + namespace: this.options.namespace, + sourceFile, + resolvedSourceFile: sourceFileFrom, + destinationFile: targetFile, + templatesRoots, + }, + context, + ); if (!file) { return undefined; } From 526cd470e401995a466408fccf24c9b350f94a96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 01:17:17 +0000 Subject: [PATCH 122/938] Bump typescript-eslint in /generators/react/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.60 to 8.0.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.0.0/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index 4a62b1ae4771..0adbcbdf3d86 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -81,7 +81,7 @@ "ts-jest": "29.2.3", "ts-loader": "9.5.1", "typescript": "5.5.4", - "typescript-eslint": "8.0.0-alpha.60", + "typescript-eslint": "8.0.0", "webpack": "5.93.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", From 6909fc421c94403bf5f9bbe96cb730242dd4b639 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Wed, 31 Jul 2024 22:37:08 -0300 Subject: [PATCH 123/938] sort pom file using transform --- generators/maven/generator.ts | 31 +++- generators/maven/internal/pom-project-sort.ts | 134 ++++++++++++++++++ generators/maven/internal/xml-store.ts | 4 +- generators/maven/support/index.ts | 1 + generators/maven/support/pom-file-sort.ts | 33 +++++ generators/maven/support/pom-store.ts | 113 +-------------- 6 files changed, 201 insertions(+), 115 deletions(-) create mode 100644 generators/maven/internal/pom-project-sort.ts create mode 100644 generators/maven/support/pom-file-sort.ts diff --git a/generators/maven/generator.ts b/generators/maven/generator.ts index 32b5bd51cf3d..4ccfd53a8221 100644 --- a/generators/maven/generator.ts +++ b/generators/maven/generator.ts @@ -17,7 +17,10 @@ * limitations under the License. */ /* eslint-disable consistent-return */ -import assert from 'assert/strict'; +import assert from 'node:assert/strict'; +import { basename } from 'node:path'; +import { passthrough } from '@yeoman/transform'; +import { isFileStateModified } from 'mem-fs-editor/state'; import BaseApplicationGenerator from '../base-application/index.js'; @@ -25,7 +28,7 @@ import { type GeneratorDefinition as SpringBootGeneratorDefinition } from '../se import files from './files.js'; import { MAVEN } from './constants.js'; import cleanupOldServerFilesTask from './cleanup.js'; -import { createPomStorage, type PomStorage } from './support/index.js'; +import { createPomStorage, sortPomFile, type PomStorage } from './support/index.js'; export default class MavenGenerator extends BaseApplicationGenerator { pomStorage!: PomStorage; @@ -127,6 +130,30 @@ export default class MavenGenerator extends BaseApplicationGenerator this.preparing); } + get default() { + return this.asDefaultTaskGroup({ + queueTranslateTransform() { + if (this.sortMavenPom) { + this.queueTransformStream( + { + name: 'translating angular application', + filter: file => + isFileStateModified(file) && file.path.startsWith(this.destinationPath()) && basename(file.path) === 'pom.xml', + refresh: false, + }, + passthrough(file => { + file.contents = Buffer.from(sortPomFile(file.contents.toString())); + }), + ); + } + }, + }); + } + + get [BaseApplicationGenerator.DEFAULT]() { + return this.delegateTasksToBlueprint(() => this.default); + } + get writing() { return this.asWritingTaskGroup({ cleanupOldServerFilesTask, diff --git a/generators/maven/internal/pom-project-sort.ts b/generators/maven/internal/pom-project-sort.ts new file mode 100644 index 000000000000..1ddec902c0ab --- /dev/null +++ b/generators/maven/internal/pom-project-sort.ts @@ -0,0 +1,134 @@ +/** + * Copyright 2013-2024 the original author or authors from the JHipster project. + * + * This file is part of the JHipster project, see https://www.jhipster.tech/ + * for more information. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import sortKeys from 'sort-keys'; + +import { MavenArtifact, MavenProfile } from '../types.js'; + +const rootOrder = [ + 'modelVersion', + 'groupId', + 'artifactId', + 'version', + 'packaging', + 'name', + 'description', + 'parent', + 'repositories', + 'pluginRepositories', + 'distributionManagement', + 'properties', + 'dependencyManagement', + 'dependencies', + 'build', + 'profiles', +]; + +const propertiesOrder = [ + 'maven.version', + 'java.version', + 'node.version', + 'npm.version', + 'project.build.sourceEncoding', + 'project.reporting.outputEncoding', + 'maven.build.timestamp.format', + 'maven.compiler.source', + 'maven.compiler.target', + 'start-class', + 'argLine', + 'm2e.apt.activation', + 'run.addResources', + 'jhipster-dependencies.version', + 'spring-boot.version', +]; + +const groupIdOrder = ['tech.jhipster', 'org.springframework.boot', 'org.springframework.security', 'org.springdoc']; + +const sortSection = section => { + return Object.fromEntries( + Object.entries(section).sort(([key1, value1], [key2, value2]) => { + if (typeof value1 === typeof value2) key1.localeCompare(key2); + if (typeof value1 === 'string') return -1; + if (typeof value2 === 'string') return 1; + return 0; + }), + ); +}; + +const isComment = name => name.startsWith('#'); + +const toMaxInt = nr => (nr === -1 ? Number.MAX_SAFE_INTEGER : nr); + +const sortWithTemplate = (template: string[], a: string, b: string) => { + if (isComment(a)) return -1; + if (isComment(b)) return 1; + const indexOfA = toMaxInt(template.findIndex(item => item === a)); + const indexOfB = toMaxInt(template.findIndex(item => item === b)); + if (indexOfA === indexOfB) { + return a.localeCompare(b); + } + return indexOfA - indexOfB; +}; + +const comparator = (order: string[]) => (a: string, b: string) => sortWithTemplate(order, a, b); + +const sortProperties = properties => sortKeys(properties, { compare: comparator(propertiesOrder) }); + +const sortArtifacts = (artifacts: MavenArtifact[]) => + artifacts.sort((a: MavenArtifact, b: MavenArtifact) => { + if (a.groupId !== b.groupId) { + if (a.groupId === undefined) { + return -1; + } + if (b.groupId === undefined) { + return 1; + } + const groupIdCompared = sortWithTemplate(groupIdOrder, a.groupId, b.groupId); + if (groupIdCompared) return groupIdCompared; + } + return a.artifactId.localeCompare(b.artifactId); + }); + +const sortProfiles = (profiles: MavenProfile[]) => profiles.sort((a, b) => a.id?.localeCompare(b.id) ?? 1); + +export const sortPomProject = project => { + project = sortKeys(project, { compare: comparator(rootOrder) }); + if (project.properties) { + project.properties = sortProperties(project.properties); + } + if (Array.isArray(project.dependencies?.dependency)) { + project.dependencies.dependency = sortArtifacts(project.dependencies.dependency); + } + if (Array.isArray(project.dependencyManagement?.dependencies?.dependency)) { + project.dependencyManagement.dependencies.dependency = sortArtifacts(project.dependencyManagement.dependencies.dependency); + } + if (project.build) { + project.build = sortSection(project.build); + + if (Array.isArray(project.build.plugins?.plugin)) { + project.build.plugins.plugin = sortArtifacts(project.build.plugins.plugin); + } + if (Array.isArray(project.build.pluginManagement?.plugins?.plugin)) { + project.build.pluginManagement.plugins.plugin = sortArtifacts(project.build.pluginManagement.plugins.plugin); + } + } + if (Array.isArray(project.profiles?.profile)) { + project.profiles.profile = sortProfiles(project.profiles.profile); + } + return project; +}; diff --git a/generators/maven/internal/xml-store.ts b/generators/maven/internal/xml-store.ts index be39af73984e..ddf534f08fdb 100644 --- a/generators/maven/internal/xml-store.ts +++ b/generators/maven/internal/xml-store.ts @@ -28,11 +28,11 @@ const defaultXmlCommonOptions: Partial = { parseAttributeValue: false, }; -const defaultXmlParserOptions: Partial = { +export const defaultXmlParserOptions: Partial = { ...defaultXmlCommonOptions, }; -const defaultXmlBuildOptions: Partial = { +export const defaultXmlBuildOptions: Partial = { ...defaultXmlCommonOptions, suppressBooleanAttributes: false, suppressEmptyNode: true, diff --git a/generators/maven/support/index.ts b/generators/maven/support/index.ts index c3e3449ffe37..1f72e5fbc627 100644 --- a/generators/maven/support/index.ts +++ b/generators/maven/support/index.ts @@ -19,4 +19,5 @@ export * from './dependabot-maven.js'; export { default as PomStorage } from './pom-store.js'; +export * from './pom-file-sort.js'; export * from './pom-store.js'; diff --git a/generators/maven/support/pom-file-sort.ts b/generators/maven/support/pom-file-sort.ts new file mode 100644 index 000000000000..5173ccf36c08 --- /dev/null +++ b/generators/maven/support/pom-file-sort.ts @@ -0,0 +1,33 @@ +/** + * Copyright 2013-2024 the original author or authors from the JHipster project. + * + * This file is part of the JHipster project, see https://www.jhipster.tech/ + * for more information. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { XMLParser, XMLBuilder, XmlBuilderOptions, X2jOptions } from 'fast-xml-parser'; + +import { defaultXmlBuildOptions, defaultXmlParserOptions } from '../internal/xml-store.js'; +import { sortPomProject } from '../internal/pom-project-sort.js'; + +type SortPomFileOptions = { xmlParserOptions?: Partial; xmlBuildOptions?: Partial }; + +export const sortPomFile = (pomFile: string, { xmlParserOptions, xmlBuildOptions }: SortPomFileOptions = {}): string => { + const parser = new XMLParser({ ...defaultXmlParserOptions, ...xmlParserOptions }); + const pomObject = parser.parse(pomFile); + pomObject.project = sortPomProject(pomObject.project); + + const builder = new XMLBuilder({ ...defaultXmlBuildOptions, ...xmlBuildOptions }); + return builder.build(pomObject); +}; diff --git a/generators/maven/support/pom-store.ts b/generators/maven/support/pom-store.ts index 1721494998ac..b05ce5091ecd 100644 --- a/generators/maven/support/pom-store.ts +++ b/generators/maven/support/pom-store.ts @@ -18,7 +18,6 @@ */ import { set, get } from 'lodash-es'; -import sortKeys from 'sort-keys'; import CoreGenerator from '../../base-core/index.js'; import XmlStorage from '../internal/xml-store.js'; @@ -32,43 +31,7 @@ import { MavenProperty, MavenRepository, } from '../types.js'; - -const rootOrder = [ - 'modelVersion', - 'groupId', - 'artifactId', - 'version', - 'packaging', - 'name', - 'description', - 'parent', - 'repositories', - 'pluginRepositories', - 'distributionManagement', - 'properties', - 'dependencyManagement', - 'dependencies', - 'build', - 'profiles', -]; - -const propertiesOrder = [ - 'maven.version', - 'java.version', - 'node.version', - 'npm.version', - 'project.build.sourceEncoding', - 'project.reporting.outputEncoding', - 'maven.build.timestamp.format', - 'maven.compiler.source', - 'maven.compiler.target', - 'start-class', - 'argLine', - 'm2e.apt.activation', - 'run.addResources', - 'jhipster-dependencies.version', - 'spring-boot.version', -]; +import { sortPomProject } from '../internal/pom-project-sort.js'; const formatFirstXmlLevel = content => content.replace( @@ -76,36 +39,6 @@ const formatFirstXmlLevel = content => '\n$1', ); -const sortSection = section => { - return Object.fromEntries( - Object.entries(section).sort(([key1, value1], [key2, value2]) => { - if (typeof value1 === typeof value2) key1.localeCompare(key2); - if (typeof value1 === 'string') return -1; - if (typeof value2 === 'string') return 1; - return 0; - }), - ); -}; - -const isComment = name => name.startsWith('#'); - -const toMaxInt = nr => (nr === -1 ? Number.MAX_SAFE_INTEGER : nr); - -const sortWithTemplate = (template: string[], a: string, b: string) => { - if (isComment(a)) return -1; - if (isComment(b)) return 1; - const indexOfA = toMaxInt(template.findIndex(item => item === a)); - const indexOfB = toMaxInt(template.findIndex(item => item === b)); - if (indexOfA === indexOfB) { - return a.localeCompare(b); - } - return indexOfA - indexOfB; -}; - -const comparator = (order: string[]) => (a: string, b: string) => sortWithTemplate(order, a, b); - -const sortProperties = properties => sortKeys(properties, { compare: comparator(propertiesOrder) }); - const artifactEquals = (a: MavenArtifact, b: MavenArtifact) => { return a.groupId === b.groupId && a.artifactId === b.artifactId; }; @@ -154,25 +87,6 @@ const ensureProfile = (project, profileId: string) => { return appendOrGet(profileArray, { id: profileId }, idEquals); }; -const groupIdOrder = ['tech.jhipster', 'org.springframework.boot', 'org.springframework.security', 'org.springdoc']; - -const sortArtifacts = (artifacts: MavenArtifact[]) => - artifacts.sort((a: MavenArtifact, b: MavenArtifact) => { - if (a.groupId !== b.groupId) { - if (a.groupId === undefined) { - return -1; - } - if (b.groupId === undefined) { - return 1; - } - const groupIdCompared = sortWithTemplate(groupIdOrder, a.groupId, b.groupId); - if (groupIdCompared) return groupIdCompared; - } - return a.artifactId.localeCompare(b.artifactId); - }); - -const sortProfiles = (profiles: MavenProfile[]) => profiles.sort((a, b) => a.id?.localeCompare(b.id) ?? 1); - const ensureChildPath = (node: any, childPath) => { let child = get(node, childPath); if (child) return child; @@ -334,30 +248,7 @@ export default class PomStorage extends XmlStorage { protected sort() { if (this.store.project) { - const project = sortKeys(this.store.project, { compare: comparator(rootOrder) }); - this.store.project = project; - if (project.properties) { - project.properties = sortProperties(project.properties); - } - if (Array.isArray(project.dependencies?.dependency)) { - project.dependencies.dependency = sortArtifacts(project.dependencies.dependency); - } - if (Array.isArray(project.dependencyManagement?.dependencies?.dependency)) { - project.dependencyManagement.dependencies.dependency = sortArtifacts(project.dependencyManagement.dependencies.dependency); - } - if (project.build) { - project.build = sortSection(project.build); - - if (Array.isArray(project.build.plugins?.plugin)) { - project.build.plugins.plugin = sortArtifacts(project.build.plugins.plugin); - } - if (Array.isArray(project.build.pluginManagement?.plugins?.plugin)) { - project.build.pluginManagement.plugins.plugin = sortArtifacts(project.build.pluginManagement.plugins.plugin); - } - } - if (Array.isArray(project.profiles?.profile)) { - project.profiles.profile = sortProfiles(project.profiles.profile); - } + this.store.project = sortPomProject(this.store.project); } } } From 9b8687f7c6324058018817ad6debca376c1779ac Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Wed, 31 Jul 2024 22:51:29 -0300 Subject: [PATCH 124/938] sort each pom profile --- generators/maven/generator.ts | 2 +- generators/maven/internal/pom-project-sort.ts | 37 +++++++++++-------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/generators/maven/generator.ts b/generators/maven/generator.ts index 4ccfd53a8221..e197a0cfc58b 100644 --- a/generators/maven/generator.ts +++ b/generators/maven/generator.ts @@ -136,7 +136,7 @@ export default class MavenGenerator extends BaseApplicationGenerator isFileStateModified(file) && file.path.startsWith(this.destinationPath()) && basename(file.path) === 'pom.xml', refresh: false, diff --git a/generators/maven/internal/pom-project-sort.ts b/generators/maven/internal/pom-project-sort.ts index 1ddec902c0ab..99413840d6a9 100644 --- a/generators/maven/internal/pom-project-sort.ts +++ b/generators/maven/internal/pom-project-sort.ts @@ -106,29 +106,36 @@ const sortArtifacts = (artifacts: MavenArtifact[]) => const sortProfiles = (profiles: MavenProfile[]) => profiles.sort((a, b) => a.id?.localeCompare(b.id) ?? 1); -export const sortPomProject = project => { - project = sortKeys(project, { compare: comparator(rootOrder) }); - if (project.properties) { - project.properties = sortProperties(project.properties); +const sortProjectLike = (projectLike: any): any => { + projectLike = sortKeys(projectLike, { compare: comparator(rootOrder) }); + if (projectLike.properties) { + projectLike.properties = sortProperties(projectLike.properties); } - if (Array.isArray(project.dependencies?.dependency)) { - project.dependencies.dependency = sortArtifacts(project.dependencies.dependency); + if (Array.isArray(projectLike.dependencies?.dependency)) { + projectLike.dependencies.dependency = sortArtifacts(projectLike.dependencies.dependency); } - if (Array.isArray(project.dependencyManagement?.dependencies?.dependency)) { - project.dependencyManagement.dependencies.dependency = sortArtifacts(project.dependencyManagement.dependencies.dependency); + if (Array.isArray(projectLike.dependencyManagement?.dependencies?.dependency)) { + projectLike.dependencyManagement.dependencies.dependency = sortArtifacts(projectLike.dependencyManagement.dependencies.dependency); } - if (project.build) { - project.build = sortSection(project.build); + if (projectLike.build) { + projectLike.build = sortSection(projectLike.build); - if (Array.isArray(project.build.plugins?.plugin)) { - project.build.plugins.plugin = sortArtifacts(project.build.plugins.plugin); + if (Array.isArray(projectLike.build.plugins?.plugin)) { + projectLike.build.plugins.plugin = sortArtifacts(projectLike.build.plugins.plugin); } - if (Array.isArray(project.build.pluginManagement?.plugins?.plugin)) { - project.build.pluginManagement.plugins.plugin = sortArtifacts(project.build.pluginManagement.plugins.plugin); + if (Array.isArray(projectLike.build.pluginManagement?.plugins?.plugin)) { + projectLike.build.pluginManagement.plugins.plugin = sortArtifacts(projectLike.build.pluginManagement.plugins.plugin); } } + return projectLike; +}; + +export const sortPomProject = (project: any): any => { + project = sortProjectLike(project); if (Array.isArray(project.profiles?.profile)) { - project.profiles.profile = sortProfiles(project.profiles.profile); + project.profiles.profile = sortProfiles(project.profiles.profile.map(profile => sortProjectLike(profile))); + } else if (project.profiles?.profile) { + project.profiles.profile = sortProjectLike(project.profiles.profile); } return project; }; From f89a4e2e93a0c8be05f01c4dfd6e00a9c2c3df72 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Wed, 31 Jul 2024 23:14:28 -0300 Subject: [PATCH 125/938] set pom profile id and activation order --- generators/maven/internal/pom-project-sort.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/generators/maven/internal/pom-project-sort.ts b/generators/maven/internal/pom-project-sort.ts index 99413840d6a9..9a87b2925674 100644 --- a/generators/maven/internal/pom-project-sort.ts +++ b/generators/maven/internal/pom-project-sort.ts @@ -20,7 +20,9 @@ import sortKeys from 'sort-keys'; import { MavenArtifact, MavenProfile } from '../types.js'; -const rootOrder = [ +const rootAndProfileOrder = [ + 'id', + 'activation', 'modelVersion', 'groupId', 'artifactId', @@ -107,7 +109,7 @@ const sortArtifacts = (artifacts: MavenArtifact[]) => const sortProfiles = (profiles: MavenProfile[]) => profiles.sort((a, b) => a.id?.localeCompare(b.id) ?? 1); const sortProjectLike = (projectLike: any): any => { - projectLike = sortKeys(projectLike, { compare: comparator(rootOrder) }); + projectLike = sortKeys(projectLike, { compare: comparator(rootAndProfileOrder) }); if (projectLike.properties) { projectLike.properties = sortProperties(projectLike.properties); } From 8f551ffe52ef4345a86cf60bfe4ca4e35f43749e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 02:15:31 +0000 Subject: [PATCH 126/938] Bump typescript-eslint in /generators/vue/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.60 to 8.0.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.0.0/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index e84bd7130e0d..78eb3d519308 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -56,7 +56,7 @@ "terser-webpack-plugin": "5.3.10", "ts-loader": "9.5.1", "typescript": "5.5.4", - "typescript-eslint": "8.0.0-alpha.60", + "typescript-eslint": "8.0.0", "vite": "5.3.5", "vite-plugin-static-copy": "1.0.6", "vitest": "2.0.4", From 12a69607865450721db1eb5410a8adf33a886836 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 02:15:48 +0000 Subject: [PATCH 127/938] Bump vue-router from 4.4.0 to 4.4.1 in /generators/vue/resources Bumps [vue-router](https://github.com/vuejs/router) from 4.4.0 to 4.4.1. - [Release notes](https://github.com/vuejs/router/releases) - [Commits](https://github.com/vuejs/router/compare/v4.4.0...v4.4.1) --- updated-dependencies: - dependency-name: vue-router dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index e84bd7130e0d..19d6c870f9b7 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -18,7 +18,7 @@ "sockjs-client": "1.6.1", "vue": "3.4.21", "vue-i18n": "9.13.1", - "vue-router": "4.4.0" + "vue-router": "4.4.1" }, "devDependencies": { "@eslint/js": "9.8.0", From 5dac3fe2b4412cfca523e607d9e6972a2e84dfad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 02:36:35 +0000 Subject: [PATCH 128/938] Bump vitest from 2.0.4 to 2.0.5 in /generators/vue/resources Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 2.0.4 to 2.0.5. - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Commits](https://github.com/vitest-dev/vitest/commits/v2.0.5/packages/vitest) --- updated-dependencies: - dependency-name: vitest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 78eb3d519308..3fbfce844cb8 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -59,7 +59,7 @@ "typescript-eslint": "8.0.0", "vite": "5.3.5", "vite-plugin-static-copy": "1.0.6", - "vitest": "2.0.4", + "vitest": "2.0.5", "vitest-sonar-reporter": "2.0.0", "vue-loader": "17.4.2", "vue-style-loader": "4.1.3", From 6f1b74cd3f0d47d5910ba44f9f4019b7c3f6b456 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 03:08:59 +0000 Subject: [PATCH 129/938] Bump the angular group in /generators/angular/resources with 3 updates Bumps the angular group in /generators/angular/resources with 3 updates: [@angular/common](https://github.com/angular/angular/tree/HEAD/packages/common), [@angular/cli](https://github.com/angular/angular-cli) and [jest-preset-angular](https://github.com/thymikee/jest-preset-angular). Updates `@angular/common` from 18.1.2 to 18.1.3 - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/18.1.3/packages/common) Updates `@angular/cli` from 18.1.2 to 18.1.3 - [Release notes](https://github.com/angular/angular-cli/releases) - [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular-cli/compare/18.1.2...18.1.3) Updates `jest-preset-angular` from 14.2.1 to 14.2.2 - [Release notes](https://github.com/thymikee/jest-preset-angular/releases) - [Changelog](https://github.com/thymikee/jest-preset-angular/blob/main/CHANGELOG.md) - [Commits](https://github.com/thymikee/jest-preset-angular/compare/v14.2.1...v14.2.2) --- updated-dependencies: - dependency-name: "@angular/common" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: angular - dependency-name: "@angular/cli" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: angular - dependency-name: jest-preset-angular dependency-type: direct:development update-type: version-update:semver-patch dependency-group: angular ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 5861bb36acec..3778efcb0651 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "@angular/common": "18.1.2", + "@angular/common": "18.1.3", "@fortawesome/angular-fontawesome": "0.15.0", "@fortawesome/fontawesome-svg-core": "6.6.0", "@fortawesome/free-solid-svg-icons": "6.6.0", @@ -23,7 +23,7 @@ "@angular-architects/module-federation-runtime": "18.0.4", "@angular-builders/custom-webpack": "18.0.0", "@angular-builders/jest": "18.0.0", - "@angular/cli": "18.1.2", + "@angular/cli": "18.1.3", "@types/jest": "29.5.12", "@types/node": "20.11.25", "@types/sockjs-client": "1.5.4", @@ -41,7 +41,7 @@ "jest": "29.7.0", "jest-date-mock": "1.0.10", "jest-junit": "16.0.0", - "jest-preset-angular": "14.2.1", + "jest-preset-angular": "14.2.2", "jest-sonar": "0.2.16", "merge-jsons-webpack-plugin": "2.0.1", "postcss-rtlcss": "5.3.1", From 7487c50797e1b81647991b0bf662766675925b35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 03:09:16 +0000 Subject: [PATCH 130/938] Bump typescript-eslint in /generators/angular/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0-alpha.60 to 8.0.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.0.0/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 5861bb36acec..30f3119c7f95 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -48,7 +48,7 @@ "rimraf": "5.0.8", "ts-jest": "29.2.3", "typescript": "5.4.5", - "typescript-eslint": "8.0.0-alpha.60", + "typescript-eslint": "8.0.0", "webpack": "5.93.0", "webpack-bundle-analyzer": "4.10.2", "webpack-merge": "6.0.1", From ba549740f77c7dc9fcf79ac46e56ba2f4914417e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 07:56:05 +0000 Subject: [PATCH 131/938] Bump cypress from 13.13.1 to 13.13.2 in /generators/client/resources Bumps [cypress](https://github.com/cypress-io/cypress) from 13.13.1 to 13.13.2. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](https://github.com/cypress-io/cypress/compare/v13.13.1...v13.13.2) --- updated-dependencies: - dependency-name: cypress dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/client/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/resources/package.json b/generators/client/resources/package.json index 926576ddfecb..c971ab1c3ca4 100644 --- a/generators/client/resources/package.json +++ b/generators/client/resources/package.json @@ -6,7 +6,7 @@ "@cypress/code-coverage": "3.12.44", "babel-loader": "9.1.3", "babel-plugin-istanbul": "7.0.0", - "cypress": "13.13.1", + "cypress": "13.13.2", "cypress-audit": "1.1.0", "eslint-plugin-cypress": "3.4.0", "lighthouse": "12.1.0", From 7f9423c69fa5049c510e7d825dfd4d1b80f29da3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 09:07:30 +0000 Subject: [PATCH 132/938] Bump org.redisson:redisson in /generators/spring-cache/resources Bumps [org.redisson:redisson](https://github.com/redisson/redisson) from 3.34.0 to 3.34.1. - [Release notes](https://github.com/redisson/redisson/releases) - [Changelog](https://github.com/redisson/redisson/blob/master/CHANGELOG.md) - [Commits](https://github.com/redisson/redisson/compare/redisson-3.34.0...redisson-3.34.1) --- updated-dependencies: - dependency-name: org.redisson:redisson dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/spring-cache/resources/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/spring-cache/resources/gradle/libs.versions.toml b/generators/spring-cache/resources/gradle/libs.versions.toml index c25c36cf077f..a7b6e1b30a98 100644 --- a/generators/spring-cache/resources/gradle/libs.versions.toml +++ b/generators/spring-cache/resources/gradle/libs.versions.toml @@ -12,4 +12,4 @@ xmemcached-provider = { module = 'com.google.code.simple-spring-memcached:xmemca xmemcached = { module = 'com.googlecode.xmemcached:xmemcached', version = '2.4.8' } -redisson = { module = 'org.redisson:redisson', version = '3.34.0' } +redisson = { module = 'org.redisson:redisson', version = '3.34.1' } From aaa14ea3d5a1d50b8d824c5857d5e4a1dd58e29d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 12:25:53 +0000 Subject: [PATCH 133/938] Bump globals in /generators/generate-blueprint/resources Bumps [globals](https://github.com/sindresorhus/globals) from 15.8.0 to 15.9.0. - [Release notes](https://github.com/sindresorhus/globals/releases) - [Commits](https://github.com/sindresorhus/globals/compare/v15.8.0...v15.9.0) --- updated-dependencies: - dependency-name: globals dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/generate-blueprint/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generate-blueprint/resources/package.json b/generators/generate-blueprint/resources/package.json index 3d913b25590d..df2a78524cc0 100644 --- a/generators/generate-blueprint/resources/package.json +++ b/generators/generate-blueprint/resources/package.json @@ -1,7 +1,7 @@ { "dependencies": { "eslint": "9.8.0", - "globals": "15.8.0", + "globals": "15.9.0", "vitest": "2.0.5" } } From e0f6603cf069d0a8d27f5cc2e8252f9548e6c7fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 14:16:54 +0000 Subject: [PATCH 134/938] Bump angular-eslint in /generators/angular/resources Bumps [angular-eslint](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/angular-eslint) from 18.1.0 to 18.2.0. - [Release notes](https://github.com/angular-eslint/angular-eslint/releases) - [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/angular-eslint/CHANGELOG.md) - [Commits](https://github.com/angular-eslint/angular-eslint/commits/v18.2.0/packages/angular-eslint) --- updated-dependencies: - dependency-name: angular-eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index f99c5f039bb7..9dfa3ef4a4cc 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -27,7 +27,7 @@ "@types/jest": "29.5.12", "@types/node": "20.11.25", "@types/sockjs-client": "1.5.4", - "angular-eslint": "18.1.0", + "angular-eslint": "18.2.0", "browser-sync": "3.0.2", "browser-sync-webpack-plugin": "2.3.0", "buffer": "6.0.3", From 9ca252f08f7cd090cbaf04bf74a136e86cc5282d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 23:19:56 +0000 Subject: [PATCH 135/938] Bump axios from 1.7.2 to 1.7.3 Bumps [axios](https://github.com/axios/axios) from 1.7.2 to 1.7.3. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.7.2...v1.7.3) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2dc7df3dc00c..4c42c8625475 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "@yeoman/namespace": "1.0.0", "@yeoman/transform": "1.2.0", "@yeoman/types": "1.2.0", - "axios": "1.7.2", + "axios": "1.7.3", "chalk": "5.3.0", "chevrotain": "11.0.3", "commander": "12.1.0", @@ -3885,10 +3885,9 @@ } }, "node_modules/axios": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", - "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", - "license": "MIT", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.3.tgz", + "integrity": "sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", diff --git a/package.json b/package.json index 914f2942768d..ae644434b6f6 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "@yeoman/namespace": "1.0.0", "@yeoman/transform": "1.2.0", "@yeoman/types": "1.2.0", - "axios": "1.7.2", + "axios": "1.7.3", "chalk": "5.3.0", "chevrotain": "11.0.3", "commander": "12.1.0", From 5e08a360773163dc444ce91c0c24a9bb150047f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 00:25:33 +0000 Subject: [PATCH 136/938] Bump apachepulsar/pulsar in /generators/server/resources Bumps apachepulsar/pulsar from 3.2.3 to 3.3.1. --- updated-dependencies: - dependency-name: apachepulsar/pulsar dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/server/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile index 87c86eb15a07..f41c7df7affd 100644 --- a/generators/server/resources/Dockerfile +++ b/generators/server/resources/Dockerfile @@ -46,7 +46,7 @@ LABEL ALIAS=kafka FROM confluentinc/cp-zookeeper:7.7.0 LABEL ALIAS=zookeeper -FROM apachepulsar/pulsar:3.2.3 +FROM apachepulsar/pulsar:3.3.1 LABEL ALIAS=pulsar FROM sonarqube:10.6.0-community From e5ec3bd5e8ce0caf7fe270c1615318cfcc2dc931 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 01:35:55 +0000 Subject: [PATCH 137/938] Bump axios from 1.7.2 to 1.7.3 in /generators/react/resources Bumps [axios](https://github.com/axios/axios) from 1.7.2 to 1.7.3. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.7.2...v1.7.3) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index 0adbcbdf3d86..71657d215fc9 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -4,7 +4,7 @@ "@fortawesome/free-solid-svg-icons": "6.6.0", "@fortawesome/react-fontawesome": "0.2.2", "@reduxjs/toolkit": "2.2.7", - "axios": "1.7.2", + "axios": "1.7.3", "bootstrap": "5.3.3", "bootswatch": "5.3.3", "lodash": "4.17.21", From 17fe36dd3d24c32e3f3ccbcce109fddb3eadc4ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 01:37:55 +0000 Subject: [PATCH 138/938] Bump react-router-dom in /generators/react/resources Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.25.1 to 6.26.0. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@6.26.0/packages/react-router-dom) --- updated-dependencies: - dependency-name: react-router-dom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index 0adbcbdf3d86..7cf07e470fae 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -16,7 +16,7 @@ "react-loadable": "5.5.0", "react-redux": "9.1.2", "react-redux-loading-bar": "5.0.8", - "react-router-dom": "6.25.1", + "react-router-dom": "6.26.0", "react-toastify": "10.0.5", "react-transition-group": "4.4.5", "reactstrap": "9.2.2", From d12351af45010e6c0e69cd82929d227bb53b85aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 02:59:27 +0000 Subject: [PATCH 139/938] Bump @vitejs/plugin-vue from 5.1.1 to 5.1.2 in /generators/vue/resources Bumps [@vitejs/plugin-vue](https://github.com/vitejs/vite-plugin-vue/tree/HEAD/packages/plugin-vue) from 5.1.1 to 5.1.2. - [Release notes](https://github.com/vitejs/vite-plugin-vue/releases) - [Changelog](https://github.com/vitejs/vite-plugin-vue/blob/main/packages/plugin-vue/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite-plugin-vue/commits/plugin-vue@5.1.2/packages/plugin-vue) --- updated-dependencies: - dependency-name: "@vitejs/plugin-vue" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 795afda3d53c..658b4dba8988 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -27,7 +27,7 @@ "@tsconfig/node18": "18.2.4", "@types/node": "20.11.25", "@types/sinon": "17.0.3", - "@vitejs/plugin-vue": "5.1.1", + "@vitejs/plugin-vue": "5.1.2", "@vue/test-utils": "2.4.6", "@vue/tsconfig": "0.5.1", "autoprefixer": "10.4.19", From af1b260ce35f82a008cc341b51d7e5be7cdb93c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 02:59:40 +0000 Subject: [PATCH 140/938] Bump vue-router from 4.4.1 to 4.4.2 in /generators/vue/resources Bumps [vue-router](https://github.com/vuejs/router) from 4.4.1 to 4.4.2. - [Release notes](https://github.com/vuejs/router/releases) - [Commits](https://github.com/vuejs/router/compare/v4.4.1...v4.4.2) --- updated-dependencies: - dependency-name: vue-router dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 795afda3d53c..337ddb8e36df 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -18,7 +18,7 @@ "sockjs-client": "1.6.1", "vue": "3.4.21", "vue-i18n": "9.13.1", - "vue-router": "4.4.1" + "vue-router": "4.4.2" }, "devDependencies": { "@eslint/js": "9.8.0", From 45673f0a0ae5f279758957ebb5deafec682d850e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 03:33:05 +0000 Subject: [PATCH 141/938] Bump globals from 15.8.0 to 15.9.0 in /generators/angular/resources Bumps [globals](https://github.com/sindresorhus/globals) from 15.8.0 to 15.9.0. - [Release notes](https://github.com/sindresorhus/globals/releases) - [Commits](https://github.com/sindresorhus/globals/compare/v15.8.0...v15.9.0) --- updated-dependencies: - dependency-name: globals dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 9dfa3ef4a4cc..ce625ceb2ded 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -37,7 +37,7 @@ "eslint-plugin-prettier": "5.2.1", "eslint-webpack-plugin": "4.2.0", "folder-hash": "4.0.4", - "globals": "15.8.0", + "globals": "15.9.0", "jest": "29.7.0", "jest-date-mock": "1.0.10", "jest-junit": "16.0.0", From 63759b0d044f2104537766a74682273841c0b4db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 03:33:14 +0000 Subject: [PATCH 142/938] Bump ts-jest from 29.2.3 to 29.2.4 in /generators/angular/resources Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 29.2.3 to 29.2.4. - [Release notes](https://github.com/kulshekhar/ts-jest/releases) - [Changelog](https://github.com/kulshekhar/ts-jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/kulshekhar/ts-jest/compare/v29.2.3...v29.2.4) --- updated-dependencies: - dependency-name: ts-jest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 9dfa3ef4a4cc..93dee9bd6cb6 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -46,7 +46,7 @@ "merge-jsons-webpack-plugin": "2.0.1", "postcss-rtlcss": "5.3.1", "rimraf": "5.0.8", - "ts-jest": "29.2.3", + "ts-jest": "29.2.4", "typescript": "5.4.5", "typescript-eslint": "8.0.0", "webpack": "5.93.0", From d91d3c98687f5c109150ac6929c47e36d664a1cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 08:00:37 +0000 Subject: [PATCH 143/938] Bump ts-jest from 29.2.3 to 29.2.4 in /generators/react/resources Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 29.2.3 to 29.2.4. - [Release notes](https://github.com/kulshekhar/ts-jest/releases) - [Changelog](https://github.com/kulshekhar/ts-jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/kulshekhar/ts-jest/compare/v29.2.3...v29.2.4) --- updated-dependencies: - dependency-name: ts-jest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index dd62880c8fa4..f29f5ab78813 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -78,7 +78,7 @@ "style-loader": "4.0.0", "terser-webpack-plugin": "5.3.10", "thread-loader": "4.0.2", - "ts-jest": "29.2.3", + "ts-jest": "29.2.4", "ts-loader": "9.5.1", "typescript": "5.5.4", "typescript-eslint": "8.0.0", From 7e01c103bccd9964bf4bd66e3b01d079131a9f56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 08:01:03 +0000 Subject: [PATCH 144/938] Bump axios from 1.7.2 to 1.7.3 in /generators/vue/resources Bumps [axios](https://github.com/axios/axios) from 1.7.2 to 1.7.3. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.7.2...v1.7.3) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 96cd37853f55..8eabfa6104d7 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -7,7 +7,7 @@ "@vuelidate/core": "2.0.3", "@vuelidate/validators": "2.0.4", "@vueuse/core": "10.11.0", - "axios": "1.7.2", + "axios": "1.7.3", "bootstrap": "4.6.2", "bootstrap-vue": "2.23.1", "bootswatch": "4.6.2", From 215e72ef0516d656f7f8b01c42acf29774f32c17 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 2 Aug 2024 06:54:15 -0300 Subject: [PATCH 145/938] don't sort pom in pomStore --- generators/maven/generator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/maven/generator.ts b/generators/maven/generator.ts index e197a0cfc58b..51f19a7946de 100644 --- a/generators/maven/generator.ts +++ b/generators/maven/generator.ts @@ -47,7 +47,7 @@ export default class MavenGenerator extends BaseApplicationGenerator Date: Fri, 2 Aug 2024 08:15:08 -0300 Subject: [PATCH 146/938] clarify config default --- generators/base/api.d.ts | 3 +++ lib/internal/config-def.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/generators/base/api.d.ts b/generators/base/api.d.ts index 3c164ea41c24..f20a105d4e12 100644 --- a/generators/base/api.d.ts +++ b/generators/base/api.d.ts @@ -235,6 +235,9 @@ export type ConfigSpec = { * The callback receives the generator as input for 'generator' scope. * The callback receives jhipsterConfigWithDefaults as input for 'storage' (default) scope. * The callback receives blueprintStorage contents as input for 'blueprint' scope. + * + * Default value will not be applied to generator (using 'generator' scope) in initializing priority. Use cli.default instead. + * Default value will be application to templates context object (application) in loading priority. */ default?: string | boolean | number | string[] | ((this: CoreGenerator | void, ctx: any) => string | boolean | number | string[]); /** diff --git a/lib/internal/config-def.ts b/lib/internal/config-def.ts index 7f17acd74899..63e02d783ada 100644 --- a/lib/internal/config-def.ts +++ b/lib/internal/config-def.ts @@ -36,7 +36,7 @@ export function loadConfig( } value = application[name] = source[name] ?? undefined; - if (value === undefined && def.default) { + if (value === undefined && def.default !== undefined) { application[name] = typeof def.default === 'function' ? def.default.call(this, source) : def.default; } } From 0e98f6ecf39bb029eaa12b0510b47cef48149852 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 2 Aug 2024 08:15:13 -0300 Subject: [PATCH 147/938] adjusts --- .../jib/__snapshots__/generator.spec.ts.snap | 3 --- .../__snapshots__/generator.spec.ts.snap | 6 ----- .../maven/__snapshots__/needles.spec.ts.snap | 26 +++++++++---------- generators/maven/command.ts | 1 + generators/maven/generator.ts | 4 +-- .../{pom-project-sort.ts => pom-sort.ts} | 10 +++++-- generators/maven/support/pom-file-sort.ts | 4 +-- generators/maven/support/pom-store.ts | 10 ++----- 8 files changed, 27 insertions(+), 37 deletions(-) rename generators/maven/internal/{pom-project-sort.ts => pom-sort.ts} (93%) diff --git a/generators/java/generators/jib/__snapshots__/generator.spec.ts.snap b/generators/java/generators/jib/__snapshots__/generator.spec.ts.snap index 2612874bd86a..8f46339ea545 100644 --- a/generators/java/generators/jib/__snapshots__/generator.spec.ts.snap +++ b/generators/java/generators/jib/__snapshots__/generator.spec.ts.snap @@ -23,9 +23,6 @@ exports[`generator - java:jib with defaults options should match files snapshot "package.json": { "stateCleared": "modified", }, - "pom.xml": { - "stateCleared": "modified", - }, "src/main/docker/jib/entrypoint.sh": { "stateCleared": "modified", }, diff --git a/generators/maven/__snapshots__/generator.spec.ts.snap b/generators/maven/__snapshots__/generator.spec.ts.snap index 8bef0f57c3e0..abc08bb33575 100644 --- a/generators/maven/__snapshots__/generator.spec.ts.snap +++ b/generators/maven/__snapshots__/generator.spec.ts.snap @@ -66,9 +66,6 @@ exports[`generator - maven with empty configuration should generate only maven f "mvnw.cmd": { "stateCleared": "modified", }, - "pom.xml": { - "stateCleared": "modified", - }, } `; @@ -92,8 +89,5 @@ exports[`generator - maven with valid configuration should generate only maven f "mvnw.cmd": { "stateCleared": "modified", }, - "pom.xml": { - "stateCleared": "modified", - }, } `; diff --git a/generators/maven/__snapshots__/needles.spec.ts.snap b/generators/maven/__snapshots__/needles.spec.ts.snap index b27eb55d7461..9b668428f2c3 100644 --- a/generators/maven/__snapshots__/needles.spec.ts.snap +++ b/generators/maven/__snapshots__/needles.spec.ts.snap @@ -30,6 +30,19 @@ exports[`generator - maven - needles prod profile should match generated pom 1`] prod + + + snapshotsId + snapshotsUrl + + + releasesId + releasesUrl + + + + propertyValue + @@ -47,19 +60,6 @@ exports[`generator - maven - needles prod profile should match generated pom 1`] - - - snapshotsId - snapshotsUrl - - - releasesId - releasesUrl - - - - propertyValue - dependencyGroupId diff --git a/generators/maven/command.ts b/generators/maven/command.ts index 2ada75a961a8..dc30a7d0311b 100644 --- a/generators/maven/command.ts +++ b/generators/maven/command.ts @@ -26,6 +26,7 @@ const command: JHipsterCommandDefinition = { cli: { type: Boolean, hide: true, + default: true, }, scope: 'generator', }, diff --git a/generators/maven/generator.ts b/generators/maven/generator.ts index 51f19a7946de..4e5d58bb5f87 100644 --- a/generators/maven/generator.ts +++ b/generators/maven/generator.ts @@ -18,7 +18,6 @@ */ /* eslint-disable consistent-return */ import assert from 'node:assert/strict'; -import { basename } from 'node:path'; import { passthrough } from '@yeoman/transform'; import { isFileStateModified } from 'mem-fs-editor/state'; @@ -137,8 +136,7 @@ export default class MavenGenerator extends BaseApplicationGenerator - isFileStateModified(file) && file.path.startsWith(this.destinationPath()) && basename(file.path) === 'pom.xml', + filter: file => isFileStateModified(file) && file.path === this.destinationPath('pom.xml'), refresh: false, }, passthrough(file => { diff --git a/generators/maven/internal/pom-project-sort.ts b/generators/maven/internal/pom-sort.ts similarity index 93% rename from generators/maven/internal/pom-project-sort.ts rename to generators/maven/internal/pom-sort.ts index 9a87b2925674..518d4433c501 100644 --- a/generators/maven/internal/pom-project-sort.ts +++ b/generators/maven/internal/pom-sort.ts @@ -20,6 +20,12 @@ import sortKeys from 'sort-keys'; import { MavenArtifact, MavenProfile } from '../types.js'; +export const formatPomFirstLevel = content => + content.replace( + /(\n {4}<(?:groupId|distributionManagement|repositories|pluginRepositories|properties|dependencyManagement|dependencies|build|profiles)>)/g, + '\n$1', + ); + const rootAndProfileOrder = [ 'id', 'activation', @@ -79,8 +85,8 @@ const toMaxInt = nr => (nr === -1 ? Number.MAX_SAFE_INTEGER : nr); const sortWithTemplate = (template: string[], a: string, b: string) => { if (isComment(a)) return -1; if (isComment(b)) return 1; - const indexOfA = toMaxInt(template.findIndex(item => item === a)); - const indexOfB = toMaxInt(template.findIndex(item => item === b)); + const indexOfA = toMaxInt(template.indexOf(a)); + const indexOfB = toMaxInt(template.indexOf(b)); if (indexOfA === indexOfB) { return a.localeCompare(b); } diff --git a/generators/maven/support/pom-file-sort.ts b/generators/maven/support/pom-file-sort.ts index 5173ccf36c08..0536357b010f 100644 --- a/generators/maven/support/pom-file-sort.ts +++ b/generators/maven/support/pom-file-sort.ts @@ -19,7 +19,7 @@ import { XMLParser, XMLBuilder, XmlBuilderOptions, X2jOptions } from 'fast-xml-parser'; import { defaultXmlBuildOptions, defaultXmlParserOptions } from '../internal/xml-store.js'; -import { sortPomProject } from '../internal/pom-project-sort.js'; +import { formatPomFirstLevel, sortPomProject } from '../internal/pom-sort.js'; type SortPomFileOptions = { xmlParserOptions?: Partial; xmlBuildOptions?: Partial }; @@ -29,5 +29,5 @@ export const sortPomFile = (pomFile: string, { xmlParserOptions, xmlBuildOptions pomObject.project = sortPomProject(pomObject.project); const builder = new XMLBuilder({ ...defaultXmlBuildOptions, ...xmlBuildOptions }); - return builder.build(pomObject); + return formatPomFirstLevel(builder.build(pomObject)); }; diff --git a/generators/maven/support/pom-store.ts b/generators/maven/support/pom-store.ts index b05ce5091ecd..3464b5b3d5a9 100644 --- a/generators/maven/support/pom-store.ts +++ b/generators/maven/support/pom-store.ts @@ -31,13 +31,7 @@ import { MavenProperty, MavenRepository, } from '../types.js'; -import { sortPomProject } from '../internal/pom-project-sort.js'; - -const formatFirstXmlLevel = content => - content.replace( - /(\n {4}<(?:groupId|distributionManagement|repositories|pluginRepositories|properties|dependencyManagement|dependencies|build|profiles)>)/g, - '\n$1', - ); +import { sortPomProject, formatPomFirstLevel } from '../internal/pom-sort.js'; const artifactEquals = (a: MavenArtifact, b: MavenArtifact) => { return a.groupId === b.groupId && a.artifactId === b.artifactId; @@ -264,7 +258,7 @@ export const createPomStorage = (generator: CoreGenerator, { sortFile }: { sortF const loadFile = () => generator.readDestination('pom.xml', { defaults: emptyPomFile })?.toString() ?? ''; const pomStorage = new PomStorage({ loadFile, - saveFile: content => generator.writeDestination('pom.xml', formatFirstXmlLevel(content)), + saveFile: content => generator.writeDestination('pom.xml', formatPomFirstLevel(content)), sortFile, }); generator.fs.store.on('change', filename => { From a05ad79d453f401a3b0e07f3a651cd720a576305 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 2 Aug 2024 09:24:57 -0300 Subject: [PATCH 148/938] update snapshot --- generators/app/__snapshots__/generator.spec.ts.snap | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/generators/app/__snapshots__/generator.spec.ts.snap b/generators/app/__snapshots__/generator.spec.ts.snap index 75173630f55b..654289992775 100644 --- a/generators/app/__snapshots__/generator.spec.ts.snap +++ b/generators/app/__snapshots__/generator.spec.ts.snap @@ -453,7 +453,7 @@ exports[`generator - app with default config should match snapshot 1`] = ` "entitySuffix": "", "eslintConfigFile": "eslint.config.mjs", "fakerSeed": undefined, - "feignClient": undefined, + "feignClient": false, "fromInit": undefined, "frontendAppName": "jhipsterApp", "gatewayRoutes": undefined, @@ -777,7 +777,7 @@ exports[`generator - app with default config should match snapshot 1`] = ` "skipJhipsterDependencies": undefined, "skipServer": undefined, "skipUserManagement": false, - "sortMavenPom": undefined, + "sortMavenPom": true, "springBootDependencies": Any, "srcMainDir": "src/main/", "srcMainJava": "src/main/java/", @@ -1071,7 +1071,7 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "entitySuffix": "", "eslintConfigFile": "eslint.config.mjs", "fakerSeed": undefined, - "feignClient": undefined, + "feignClient": false, "fromInit": undefined, "frontendAppName": "jhipsterApp", "gatewayRoutes": [], @@ -1391,7 +1391,7 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "skipJhipsterDependencies": undefined, "skipServer": undefined, "skipUserManagement": false, - "sortMavenPom": undefined, + "sortMavenPom": true, "springBootDependencies": Any, "srcMainDir": "src/main/", "srcMainJava": "src/main/java/", @@ -1683,7 +1683,7 @@ exports[`generator - app with microservice should match snapshot 1`] = ` ], "entitySuffix": "", "fakerSeed": undefined, - "feignClient": undefined, + "feignClient": false, "fromInit": undefined, "frontendAppName": "jhipsterApp", "gatewayRoutes": undefined, @@ -1948,7 +1948,7 @@ exports[`generator - app with microservice should match snapshot 1`] = ` "skipJhipsterDependencies": undefined, "skipServer": undefined, "skipUserManagement": true, - "sortMavenPom": undefined, + "sortMavenPom": true, "springBootDependencies": Any, "srcMainDir": "src/main/", "srcMainJava": "src/main/java/", From f420965dc5a995a47892faf8a564a162f6df2830 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 2 Aug 2024 10:11:13 -0300 Subject: [PATCH 149/938] sort build.gradle dependencies --- generators/gradle/generator.ts | 17 ++++++++++++++ generators/gradle/internal/needles.ts | 32 ++++++++++++++++----------- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/generators/gradle/generator.ts b/generators/gradle/generator.ts index 0d97d52b8333..48e57708d035 100644 --- a/generators/gradle/generator.ts +++ b/generators/gradle/generator.ts @@ -23,6 +23,7 @@ import BaseApplicationGenerator from '../base-application/index.js'; import { GRADLE_BUILD_SRC_DIR } from '../generator-constants.js'; import { mutateData } from '../base/support/config.js'; +import { QUEUES } from '../base/priorities.js'; import files from './files.js'; import { GRADLE } from './constants.js'; import cleanupOldServerFilesTask from './cleanup.js'; @@ -42,6 +43,8 @@ import { gradleNeedleOptionsWithDefaults, } from './internal/needles.js'; +const { PRE_CONFLICTS_QUEUE } = QUEUES; + export default class GradleGenerator extends BaseApplicationGenerator { gradleVersionFromWrapper; @@ -103,6 +106,20 @@ export default class GradleGenerator extends BaseApplicationGenerator { source.applyFromGradle = script => this.editFile('build.gradle', applyFromGradleCallback(script)); source.addGradleDependencies = (dependencies, options = {}) => { const { gradleFile } = gradleNeedleOptionsWithDefaults(options); + if (gradleFile === 'build.gradle') { + (source as any)._gradleDependencies = source._gradleDependencies ?? []; + (source as any)._gradleDependencies.push(...dependencies); + this.queueTask({ + method: () => { + this.editFile(gradleFile, addGradleDependenciesCallback((source as any)._gradleDependencies.sort(sortDependencies))); + (source as any)._gradleDependencies = []; + }, + taskName: '_persiteGradleDependencies', + once: true, + queueName: PRE_CONFLICTS_QUEUE, + }); + return; + } dependencies = [...dependencies].sort(sortDependencies); this.editFile(gradleFile, addGradleDependenciesCallback(dependencies)); }; diff --git a/generators/gradle/internal/needles.ts b/generators/gradle/internal/needles.ts index e34cbd936cab..f31ace1c0b1c 100644 --- a/generators/gradle/internal/needles.ts +++ b/generators/gradle/internal/needles.ts @@ -43,6 +43,8 @@ const scopeSortOrder = { implementation: 2, compileOnly: 3, runtimeOnly: 4, + testImplementation: 5, + testRuntimeOnly: 6, }; const wrapScope = (scope: string, dependency: string) => @@ -55,21 +57,25 @@ export const gradleNeedleOptionsWithDefaults = (options: GradleNeedleOptions): R export const sortDependencies = (a: GradleDependency, b: GradleDependency): number => { let ret = (scopeSortOrder[a.scope] ?? 100) - (scopeSortOrder[b.scope] ?? 100); - if (ret === 0) { - ret = a.groupId.localeCompare(b.groupId); - if (ret !== 0) { - // Keep Spring dependencies on top - const aIsSpring = a.groupId.startsWith('org.springframework.'); - const bIsSpring = b.groupId.startsWith('org.springframework.'); - if (aIsSpring !== bIsSpring && (aIsSpring || bIsSpring)) { - return aIsSpring ? -1 : 1; - } - } + // Keep implementation platform scope dependencies in the order they were added + if (ret !== 0 || a.scope === 'implementation platform') { + return ret; + } + ret = a.scope.localeCompare(b.scope); + if (ret !== 0) { + return ret; } - if (ret === 0) { - ret = a.artifactId.localeCompare(b.artifactId); + ret = a.groupId.localeCompare(b.groupId); + if (ret !== 0) { + // Keep Spring dependencies on top + const aIsSpring = a.groupId.startsWith('org.springframework.'); + const bIsSpring = b.groupId.startsWith('org.springframework.'); + if (aIsSpring !== bIsSpring && (aIsSpring || bIsSpring)) { + return aIsSpring ? -1 : 1; + } + return ret; } - return ret; + return ret === 0 ? a.artifactId.localeCompare(b.artifactId) : ret; }; export const applyFromGradleCallback = ({ script }: GradleScript) => From 6395ccc2b5285a861aa0809c4f34cfed6dc61c0c Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 2 Aug 2024 12:51:24 -0300 Subject: [PATCH 150/938] sort catalog dependencies --- generators/gradle/generator.ts | 4 +-- generators/gradle/internal/needles.ts | 46 +++++++++++++++------------ generators/gradle/types.d.ts | 11 ++++--- 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/generators/gradle/generator.ts b/generators/gradle/generator.ts index 48e57708d035..6e0e8eaafd1b 100644 --- a/generators/gradle/generator.ts +++ b/generators/gradle/generator.ts @@ -37,11 +37,11 @@ import { addGradleDependenciesCatalogVersionCallback, addGradleDependencyCatalogLibrariesCallback, addGradleDependencyCatalogPluginsCallback, - addGradleDependencyFromCatalogCallback, addGradlePluginFromCatalogCallback, sortDependencies, gradleNeedleOptionsWithDefaults, } from './internal/needles.js'; +import { GradleDependency } from './types.js'; const { PRE_CONFLICTS_QUEUE } = QUEUES; @@ -138,7 +138,7 @@ export default class GradleGenerator extends BaseApplicationGenerator { const { gradleFile, gradleVersionCatalogFile } = gradleNeedleOptionsWithDefaults(options); libs = [...libs].sort((a, b) => a.libraryName.localeCompare(b.libraryName)); this.editFile(gradleVersionCatalogFile, addGradleDependencyCatalogLibrariesCallback(libs)); - this.editFile(gradleFile, addGradleDependencyFromCatalogCallback(libs)); + source.addGradleDependencies!(libs.filter(lib => lib.scope) as GradleDependency[], { gradleFile }); }; source.addGradleDependencyCatalogLibrary = (lib, options) => source.addGradleDependencyCatalogLibraries!([lib], options); source.addGradleDependencyCatalogPlugins = plugins => { diff --git a/generators/gradle/internal/needles.ts b/generators/gradle/internal/needles.ts index f31ace1c0b1c..6d6dd23f21f9 100644 --- a/generators/gradle/internal/needles.ts +++ b/generators/gradle/internal/needles.ts @@ -24,10 +24,10 @@ import type { GradleProperty, GradleRepository, GradleTomlVersion, - GradleLibrary, GradleTomlPlugin, GradleComment, GradleNeedleOptions, + GradleLibraryDependency, } from '../types.js'; const tomlItemToString = (item: Record) => @@ -50,6 +50,20 @@ const scopeSortOrder = { const wrapScope = (scope: string, dependency: string) => `${scope}${scope === 'implementation platform' ? '(' : ' '}${dependency}${scope === 'implementation platform' ? ')' : ''}`; +const serializeDependency = (dependency: GradleDependency) => { + if ('libraryName' in dependency) { + return wrapScope(dependency.scope, `libs.${gradleNameToReference(dependency.libraryName)}`); + } + + const { groupId, artifactId, version, classifier, scope } = dependency; + return wrapScope( + scope, + classifier && !version + ? `group: "${groupId}", name: "${artifactId}", classifier: "${classifier}"` + : `"${groupId}:${artifactId}${version ? `:${version}` : ''}${classifier ? `:${classifier}` : ''}"`, + ); +}; + export const gradleNeedleOptionsWithDefaults = (options: GradleNeedleOptions): Required => { const { gradleFile = 'build.gradle', gradleVersionCatalogFile = 'gradle/libs.versions.toml' } = options; return { gradleFile, gradleVersionCatalogFile }; @@ -65,6 +79,13 @@ export const sortDependencies = (a: GradleDependency, b: GradleDependency): numb if (ret !== 0) { return ret; } + if ('libraryName' in a || 'libraryName' in b) { + // Keep catalog dependencies on top + if ('libraryName' in a && 'libraryName' in b) { + return a.libraryName.localeCompare(b.libraryName); + } + return 'libraryName' in a ? -1 : 1; + } ret = a.groupId.localeCompare(b.groupId); if (ret !== 0) { // Keep Spring dependencies on top @@ -87,21 +108,14 @@ export const applyFromGradleCallback = ({ script }: GradleScript) => export const addGradleDependenciesCallback = (dependencies: GradleDependency[]) => createNeedleCallback({ needle: 'gradle-dependency', - contentToAdd: dependencies.map(({ groupId, artifactId, version, scope, classifier }) => - wrapScope( - scope, - classifier && !version - ? `group: "${groupId}", name: "${artifactId}", classifier: "${classifier}"` - : `"${groupId}:${artifactId}${version ? `:${version}` : ''}${classifier ? `:${classifier}` : ''}"`, - ), - ), + contentToAdd: dependencies.map(serializeDependency), }); /** @deprecated use addGradleDependenciesCallback */ -export const addGradleBuildSrcDependencyCallback = ({ groupId, artifactId, version, scope }: GradleDependency) => +export const addGradleBuildSrcDependencyCallback = (dependency: GradleDependency) => createNeedleCallback({ needle: 'gradle-build-src-dependency', - contentToAdd: wrapScope(scope, `"${groupId}:${artifactId}${version ? `:${version}` : ''}"`), + contentToAdd: serializeDependency(dependency), }); export const addGradleDependenciesCatalogVersionCallback = (versions: GradleTomlVersion[]) => @@ -110,7 +124,7 @@ export const addGradleDependenciesCatalogVersionCallback = (versions: GradleToml contentToAdd: versions.map(({ name, version }) => `${name} = "${version}"`), }); -export const addGradleDependencyCatalogLibrariesCallback = (libraries: GradleLibrary[]) => +export const addGradleDependencyCatalogLibrariesCallback = (libraries: GradleLibraryDependency[]) => createNeedleCallback({ needle: 'gradle-dependency-catalog-libraries', contentToAdd: libraries.map(({ libraryName, scope: _scope, ...others }) => @@ -118,14 +132,6 @@ export const addGradleDependencyCatalogLibrariesCallback = (libraries: GradleLib ), }); -export const addGradleDependencyFromCatalogCallback = (libraries: GradleLibrary[]) => - createNeedleCallback({ - needle: 'gradle-dependency', - contentToAdd: libraries - .filter(({ scope }) => scope) - .map(({ libraryName, scope }) => wrapScope(scope!, `libs.${gradleNameToReference(libraryName)}`)), - }); - export const addGradleDependencyCatalogPluginsCallback = (plugins: GradleTomlPlugin[]) => createNeedleCallback({ needle: 'gradle-dependency-catalog-plugins', diff --git a/generators/gradle/types.d.ts b/generators/gradle/types.d.ts index f488f15fb771..e8850a27e3b4 100644 --- a/generators/gradle/types.d.ts +++ b/generators/gradle/types.d.ts @@ -4,7 +4,11 @@ export type GradleComment = { comment?: string }; export type GradleScript = { script: string }; -export type GradleDependency = { groupId: string; artifactId: string; version?: string; scope: string; classifier?: string }; +export type GradleLibraryDependency = { libraryName: string; scope?: string }; + +export type GradleDependency = + | { groupId: string; artifactId: string; version?: string; scope: string; classifier?: string } + | Required; export type GradlePlugin = { id: string; version?: string }; @@ -18,10 +22,7 @@ export type GradleTomlAnyItemVersion = RequireOneOrNone<{ version: string; 'vers export type GradleTomlLibraryId = { module: string } | { group: string; name: string }; -export type GradleLibrary = { libraryName: string; scope?: string } & ( - | { library: string } - | (GradleTomlLibraryId & GradleTomlAnyItemVersion) -); +export type GradleLibrary = GradleLibraryDependency & ({ library: string } | (GradleTomlLibraryId & GradleTomlAnyItemVersion)); export type GradleTomlPlugin = { pluginName: string; addToBuild?: boolean } & ( | { plugin: string } From 86949fe9415eaf0877096e4451389e0d805b8976 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 2 Aug 2024 13:02:56 -0300 Subject: [PATCH 151/938] change needle position --- generators/server/templates/build.gradle.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs index 1aa987efbefb..ae1b71aa4ceb 100644 --- a/generators/server/templates/build.gradle.ejs +++ b/generators/server/templates/build.gradle.ejs @@ -246,6 +246,7 @@ if (addSpringMilestoneRepository) { _%> implementation "org.springframework.retry:spring-retry" <%_ } _%> testImplementation "org.springframework.security:spring-security-test" + // jhipster-needle-gradle-dependency - JHipster will add additional dependencies here <%_ if (reactive) { _%> OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurrentOperatingSystem(); Architecture arch = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurrentArchitecture(); @@ -257,7 +258,6 @@ if (addSpringMilestoneRepository) { _%> } } <%_ } _%> - // jhipster-needle-gradle-dependency - JHipster will add additional dependencies here } task cleanResources(type: Delete) { From ebd77e7890eaf1426bc168e30f55c857882e30d1 Mon Sep 17 00:00:00 2001 From: JHipster Bot Date: Sat, 3 Aug 2024 00:20:09 +0000 Subject: [PATCH 152/938] Bump transitional dependencies --- package-lock.json | 124 ++++++++++++++++++++++++++-------------------- 1 file changed, 70 insertions(+), 54 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4c42c8625475..4f0adfe482a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -160,9 +160,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.0.tgz", - "integrity": "sha512-P4fwKI2mjEb3ZU5cnMJzvRsRKGBUcs8jvxIoRmr6ufAY9Xk2Bz7JubRTTivkw55c7WQJfTECeqYVa+HZ0FzREg==", + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.2.tgz", + "integrity": "sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==", "dev": true, "license": "MIT", "engines": { @@ -170,22 +170,22 @@ } }, "node_modules/@babel/core": { - "version": "7.24.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz", - "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==", + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", + "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.24.9", - "@babel/helper-compilation-targets": "^7.24.8", - "@babel/helper-module-transforms": "^7.24.9", - "@babel/helpers": "^7.24.8", - "@babel/parser": "^7.24.8", - "@babel/template": "^7.24.7", - "@babel/traverse": "^7.24.8", - "@babel/types": "^7.24.9", + "@babel/generator": "^7.25.0", + "@babel/helper-compilation-targets": "^7.25.2", + "@babel/helper-module-transforms": "^7.25.2", + "@babel/helpers": "^7.25.0", + "@babel/parser": "^7.25.0", + "@babel/template": "^7.25.0", + "@babel/traverse": "^7.25.2", + "@babel/types": "^7.25.2", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -227,13 +227,13 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz", - "integrity": "sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==", + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", + "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.24.8", + "@babel/compat-data": "^7.25.2", "@babel/helper-validator-option": "^7.24.8", "browserslist": "^4.23.1", "lru-cache": "^5.1.1", @@ -268,16 +268,16 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.0.tgz", - "integrity": "sha512-bIkOa2ZJYn7FHnepzr5iX9Kmz8FjIz4UKzJ9zhX3dnYuVW0xul9RuR3skBfoLu+FPTQw90EHW9rJsSZhyLQ3fQ==", + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz", + "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==", "dev": true, "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.24.7", "@babel/helper-simple-access": "^7.24.7", "@babel/helper-validator-identifier": "^7.24.7", - "@babel/traverse": "^7.25.0" + "@babel/traverse": "^7.25.2" }, "engines": { "node": ">=6.9.0" @@ -425,11 +425,14 @@ } }, "node_modules/@babel/parser": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.0.tgz", - "integrity": "sha512-CzdIU9jdP0dg7HdyB+bHvDJGagUv+qtzZt5rYCWwW6tITNqV9odjp6Qu41gkG0ca5UfdDUWrKkiAnHHdGRnOrA==", + "version": "7.25.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.3.tgz", + "integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==", "dev": true, "license": "MIT", + "dependencies": { + "@babel/types": "^7.25.2" + }, "bin": { "parser": "bin/babel-parser.js" }, @@ -644,17 +647,17 @@ } }, "node_modules/@babel/traverse": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.0.tgz", - "integrity": "sha512-ubALThHQy4GCf6mbb+5ZRNmLLCI7bJ3f8Q6LHBSRlSKSWj5a7dSUzJBLv3VuIhFrFPgjF4IzPF567YG/HSCdZA==", + "version": "7.25.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.3.tgz", + "integrity": "sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.24.7", "@babel/generator": "^7.25.0", - "@babel/parser": "^7.25.0", + "@babel/parser": "^7.25.3", "@babel/template": "^7.25.0", - "@babel/types": "^7.25.0", + "@babel/types": "^7.25.2", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -673,9 +676,9 @@ } }, "node_modules/@babel/types": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.0.tgz", - "integrity": "sha512-LcnxQSsd9aXOIgmmSpvZ/1yo46ra2ESYyqLcryaBZOghxy5qqOBjvCWP5JfkI8yl9rlxRgdLTTMCQQRcN2hdCg==", + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.2.tgz", + "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==", "dev": true, "license": "MIT", "dependencies": { @@ -3176,6 +3179,7 @@ "version": "7.18.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz", "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==", + "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "7.18.0", @@ -3208,6 +3212,7 @@ "version": "7.18.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz", "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==", + "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/scope-manager": "7.18.0", "@typescript-eslint/types": "7.18.0", @@ -3235,6 +3240,7 @@ "version": "7.18.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz", "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==", + "license": "MIT", "dependencies": { "@typescript-eslint/types": "7.18.0", "@typescript-eslint/visitor-keys": "7.18.0" @@ -3251,6 +3257,7 @@ "version": "7.18.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz", "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==", + "license": "MIT", "dependencies": { "@typescript-eslint/typescript-estree": "7.18.0", "@typescript-eslint/utils": "7.18.0", @@ -3277,6 +3284,7 @@ "version": "7.18.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz", "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==", + "license": "MIT", "engines": { "node": "^18.18.0 || >=20.0.0" }, @@ -3289,6 +3297,7 @@ "version": "7.18.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz", "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==", + "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/types": "7.18.0", "@typescript-eslint/visitor-keys": "7.18.0", @@ -3316,6 +3325,7 @@ "version": "7.18.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz", "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==", + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@typescript-eslint/scope-manager": "7.18.0", @@ -3337,6 +3347,7 @@ "version": "7.18.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz", "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==", + "license": "MIT", "dependencies": { "@typescript-eslint/types": "7.18.0", "eslint-visitor-keys": "^3.4.3" @@ -3888,6 +3899,7 @@ "version": "1.7.3", "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.3.tgz", "integrity": "sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==", + "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", @@ -4094,9 +4106,9 @@ "peer": true }, "node_modules/browserslist": { - "version": "4.23.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz", - "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==", + "version": "4.23.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", + "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", "dev": true, "funding": [ { @@ -4114,9 +4126,9 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001640", - "electron-to-chromium": "^1.4.820", - "node-releases": "^2.0.14", + "caniuse-lite": "^1.0.30001646", + "electron-to-chromium": "^1.5.4", + "node-releases": "^2.0.18", "update-browserslist-db": "^1.1.0" }, "bin": { @@ -4298,9 +4310,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001643", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz", - "integrity": "sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==", + "version": "1.0.30001646", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001646.tgz", + "integrity": "sha512-dRg00gudiBDDTmUhClSdv3hqRfpbOnU28IpI1T6PBTLWa+kOj0681C8uML3PifYfREuBrVjDGhL3adYpBT6spw==", "dev": true, "funding": [ { @@ -4982,6 +4994,7 @@ "version": "4.3.6", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -5396,9 +5409,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.2.tgz", - "integrity": "sha512-kc4r3U3V3WLaaZqThjYz/Y6z8tJe+7K0bbjUVo3i+LWIypVdMx5nXCkwRe6SWbY6ILqLdc1rKcKmr3HoH7wjSQ==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz", + "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==", "dev": true, "license": "ISC" }, @@ -5791,6 +5804,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-chai-friendly/-/eslint-plugin-chai-friendly-1.0.1.tgz", "integrity": "sha512-dxD/uz1YKJ8U4yah1i+V/p/u+kHRy3YxTPe2nJGqb5lCR+ucan/KIexfZ5+q4X+tkllyMe86EBbAkdlwxNy3oQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" }, @@ -5886,6 +5900,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.5.0.tgz", "integrity": "sha512-F2ALmQVPT1GoP27O1JTZGrV9Pqg8k79OeIuvw63UxMtQKREZtmkK1NFgkZQ2TW7L2JSSFKHFPTtHu5z8R9QNRw==", "dev": true, + "license": "MIT", "dependencies": { "eslint-utils": "^3.0.0", "globals": "^13.24.0", @@ -6584,6 +6599,7 @@ "url": "https://paypal.me/naturalintelligence" } ], + "license": "MIT", "dependencies": { "strnum": "^1.0.5" }, @@ -9537,9 +9553,9 @@ } }, "node_modules/mem-fs-editor/node_modules/@types/node": { - "version": "18.19.42", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.42.tgz", - "integrity": "sha512-d2ZFc/3lnK2YCYhos8iaNIYu9Vfhr92nHiyJHRltXWjXUBjEE+A4I58Tdbnw4VhggSW+2j5y5gTrLs4biNnubg==", + "version": "18.19.43", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.43.tgz", + "integrity": "sha512-Mw/YlgXnyJdEwLoFv2dpuJaDFriX+Pc+0qOBJ57jC1H6cDxIj2xc5yUrdtArDVG0m+KV6622a4p2tenEqB3C/g==", "license": "MIT", "dependencies": { "undici-types": "~5.26.4" @@ -13831,9 +13847,9 @@ } }, "node_modules/vscode-languageserver-textdocument": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz", - "integrity": "sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==", + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz", + "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==", "license": "MIT" }, "node_modules/vscode-languageserver-types": { @@ -14624,9 +14640,9 @@ } }, "node_modules/yeoman-generator/node_modules/@types/node": { - "version": "18.19.42", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.42.tgz", - "integrity": "sha512-d2ZFc/3lnK2YCYhos8iaNIYu9Vfhr92nHiyJHRltXWjXUBjEE+A4I58Tdbnw4VhggSW+2j5y5gTrLs4biNnubg==", + "version": "18.19.43", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.43.tgz", + "integrity": "sha512-Mw/YlgXnyJdEwLoFv2dpuJaDFriX+Pc+0qOBJ57jC1H6cDxIj2xc5yUrdtArDVG0m+KV6622a4p2tenEqB3C/g==", "license": "MIT", "dependencies": { "undici-types": "~5.26.4" From dc74777b2c2af43feee72268bc460eb07cf52656 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 00:33:06 +0000 Subject: [PATCH 153/938] Bump lint-staged in /generators/javascript/resources Bumps [lint-staged](https://github.com/lint-staged/lint-staged) from 15.2.7 to 15.2.8. - [Release notes](https://github.com/lint-staged/lint-staged/releases) - [Changelog](https://github.com/lint-staged/lint-staged/blob/master/CHANGELOG.md) - [Commits](https://github.com/lint-staged/lint-staged/compare/v15.2.7...v15.2.8) --- updated-dependencies: - dependency-name: lint-staged dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/javascript/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/javascript/resources/package.json b/generators/javascript/resources/package.json index dfe95bb1d3e7..704e1da6f0cc 100644 --- a/generators/javascript/resources/package.json +++ b/generators/javascript/resources/package.json @@ -3,6 +3,6 @@ "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", "husky": "9.1.4", - "lint-staged": "15.2.7" + "lint-staged": "15.2.8" } } From 0c7d6362fdcea1247ccc1764363d2da13dc87d30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 00:58:12 +0000 Subject: [PATCH 154/938] Bump docker/setup-buildx-action from 3.5.0 to 3.6.1 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.5.0 to 3.6.1. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3.5.0...v3.6.1) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-image-publish-github-registry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-publish-github-registry.yml b/.github/workflows/docker-image-publish-github-registry.yml index d9851f918c94..63e5d7e6e64e 100644 --- a/.github/workflows/docker-image-publish-github-registry.yml +++ b/.github/workflows/docker-image-publish-github-registry.yml @@ -45,7 +45,7 @@ jobs: platforms: arm64 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3.5.0 + uses: docker/setup-buildx-action@v3.6.1 - name: Login to GitHub Container Registry if: github.event_name != 'pull_request' From 4a70183f0a386177697f428a050bd0f9bbb7ee9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 02:01:00 +0000 Subject: [PATCH 155/938] Bump react-hook-form in /generators/react/resources Bumps [react-hook-form](https://github.com/react-hook-form/react-hook-form) from 7.52.1 to 7.52.2. - [Release notes](https://github.com/react-hook-form/react-hook-form/releases) - [Changelog](https://github.com/react-hook-form/react-hook-form/blob/master/CHANGELOG.md) - [Commits](https://github.com/react-hook-form/react-hook-form/compare/v7.52.1...v7.52.2) --- updated-dependencies: - dependency-name: react-hook-form dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index f29f5ab78813..220e95128574 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -11,7 +11,7 @@ "path-browserify": "1.0.1", "react": "18.3.1", "react-dom": "18.3.1", - "react-hook-form": "7.52.1", + "react-hook-form": "7.52.2", "react-jhipster": "0.25.3", "react-loadable": "5.5.0", "react-redux": "9.1.2", From 1a63fa966323aee59fcbf092291a50a388a8a804 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 02:01:14 +0000 Subject: [PATCH 156/938] Bump autoprefixer from 10.4.19 to 10.4.20 in /generators/react/resources Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.4.19 to 10.4.20. - [Release notes](https://github.com/postcss/autoprefixer/releases) - [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/autoprefixer/compare/10.4.19...10.4.20) --- updated-dependencies: - dependency-name: autoprefixer dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index f29f5ab78813..b6de32b1b0e7 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -40,7 +40,7 @@ "@types/react-redux": "7.1.33", "@types/redux": "3.6.31", "@types/webpack-env": "1.18.5", - "autoprefixer": "10.4.19", + "autoprefixer": "10.4.20", "browser-sync": "2.29.3", "browser-sync-webpack-plugin": "2.3.0", "copy-webpack-plugin": "12.0.2", From 84ac1bf4d02c326b34052daf0760489f03f9ac4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 02:02:00 +0000 Subject: [PATCH 157/938] Bump core-js from 3.37.1 to 3.38.0 in /generators/react/resources Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.37.1 to 3.38.0. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/commits/v3.38.0/packages/core-js) --- updated-dependencies: - dependency-name: core-js dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index f29f5ab78813..b50a47cd739b 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -44,7 +44,7 @@ "browser-sync": "2.29.3", "browser-sync-webpack-plugin": "2.3.0", "copy-webpack-plugin": "12.0.2", - "core-js": "3.37.1", + "core-js": "3.38.0", "cross-env": "7.0.3", "css-loader": "7.1.2", "css-minimizer-webpack-plugin": "7.0.0", From c13464779b30f8d025c1c36375e3bd9a955c794c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 02:34:30 +0000 Subject: [PATCH 158/938] Bump autoprefixer from 10.4.19 to 10.4.20 in /generators/vue/resources Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.4.19 to 10.4.20. - [Release notes](https://github.com/postcss/autoprefixer/releases) - [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/autoprefixer/compare/10.4.19...10.4.20) --- updated-dependencies: - dependency-name: autoprefixer dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 8eabfa6104d7..072053e54498 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -30,7 +30,7 @@ "@vitejs/plugin-vue": "5.1.2", "@vue/test-utils": "2.4.6", "@vue/tsconfig": "0.5.1", - "autoprefixer": "10.4.19", + "autoprefixer": "10.4.20", "axios-mock-adapter": "1.22.0", "browser-sync-webpack-plugin": "2.3.0", "copy-webpack-plugin": "12.0.2", From dda81fe69b7789b9cfe6f32039717edbfb50cb2d Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 5 Aug 2024 09:11:14 -0300 Subject: [PATCH 159/938] don't sort maven pom imports --- generators/maven/internal/pom-sort.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/generators/maven/internal/pom-sort.ts b/generators/maven/internal/pom-sort.ts index 518d4433c501..f2c1d56c5e85 100644 --- a/generators/maven/internal/pom-sort.ts +++ b/generators/maven/internal/pom-sort.ts @@ -18,7 +18,7 @@ */ import sortKeys from 'sort-keys'; -import { MavenArtifact, MavenProfile } from '../types.js'; +import { MavenDependency, MavenProfile } from '../types.js'; export const formatPomFirstLevel = content => content.replace( @@ -97,8 +97,14 @@ const comparator = (order: string[]) => (a: string, b: string) => sortWithTempla const sortProperties = properties => sortKeys(properties, { compare: comparator(propertiesOrder) }); -const sortArtifacts = (artifacts: MavenArtifact[]) => - artifacts.sort((a: MavenArtifact, b: MavenArtifact) => { +const sortArtifacts = (artifacts: MavenDependency[]) => + artifacts.sort((a: MavenDependency, b: MavenDependency) => { + if (a.scope === 'import' || b.scope === 'import') { + if (a.scope === b.scope) { + return 1; + } + return a.scope === 'import' ? -1 : 1; + } if (a.groupId !== b.groupId) { if (a.groupId === undefined) { return -1; From dae92d623a3f89872a9b5ee351cda30f35aea9f8 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 5 Aug 2024 09:01:59 -0300 Subject: [PATCH 160/938] add jhipster 7 behavior change --- generators/base/support/jhipster7-context.js | 34 +++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/generators/base/support/jhipster7-context.js b/generators/base/support/jhipster7-context.js index ce1efc630eea..971ace70b13a 100644 --- a/generators/base/support/jhipster7-context.js +++ b/generators/base/support/jhipster7-context.js @@ -18,6 +18,30 @@ import { upperFirstCamelCase } from './string.js'; const { BYTES, BYTE_BUFFER } = fieldTypes.RelationalOnlyDBTypes; export const jhipster7deprecatedProperties = { + devDatabaseType: { + behaviorOnlyReason: 'v8: devDatabaseType is only used in jhipster:spring-data-relational generator', + get: ({ data }) => { + if (data.devDatabaseType === undefined) return data.devDatabaseType; + const fallbackValue = data.prodDatabaseType ?? data.databaseType; + // eslint-disable-next-line no-console + console.log( + `JHipster v8 behavior change(devDatabaseType is only used in jhipster:spring-data-relational generator): devDatabaseType is not set, using fallback: ${fallbackValue}`, + ); + return fallbackValue; + }, + }, + prodDatabaseType: { + behaviorOnlyReason: 'v8: prodDatabaseType is only used in jhipster:spring-data-relational generator', + get: ({ data }) => data.prodDatabaseType ?? data.databaseType, + get: ({ data }) => { + if (data.prodDatabaseType === undefined) return data.prodDatabaseType; + // eslint-disable-next-line no-console + console.log( + `JHipster v8 behavior change(prodDatabaseType is only used in jhipster:spring-data-relational generator): devDatabaseType is not set, using fallback: ${data.databaseType}`, + ); + return data.databaseType; + }, + }, GRADLE_VERSION: { replacement: 'gradleVersion', get: ({ data }) => data.gradleVersion, @@ -300,12 +324,14 @@ const getPropertBuilder = const { generator, data } = context; const value = prop in data ? data[prop] : undefined; if (prop in jhipster7deprecatedProperties) { - const { replacement, get } = jhipster7deprecatedProperties[prop]; + const { replacement, get, behaviorOnlyReason } = jhipster7deprecatedProperties[prop]; const fallBackValue = get(context); const valueDesc = prop in data ? `Value: ${value}, ` : ''; - log( - `Template data ${chalk.yellow(String(prop))} was removed and should be replaced with ${chalk.yellow(replacement)}. ${valueDesc}FallbackValue: ${fallBackValue}`, - ); + if (!behaviorOnlyReason) { + log( + `Template data ${chalk.yellow(String(prop))} was removed and should be replaced with ${chalk.yellow(replacement)}. ${valueDesc}FallbackValue: ${fallBackValue}`, + ); + } return value ?? fallBackValue; } if (prop?.startsWith?.('DOCKER_')) { From b060cd6bfbfa6fc16dcff9ac6ae433e332106cbb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 01:54:01 +0000 Subject: [PATCH 161/938] Bump typescript-eslint in /generators/react/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0 to 8.0.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.0.1/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index c595fd5b4426..70ea032813fe 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -81,7 +81,7 @@ "ts-jest": "29.2.4", "ts-loader": "9.5.1", "typescript": "5.5.4", - "typescript-eslint": "8.0.0", + "typescript-eslint": "8.0.1", "webpack": "5.93.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", From 9afea2875ec019d6193458147b6d17944cfab62b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 02:10:44 +0000 Subject: [PATCH 162/938] Bump typescript-eslint from 8.0.0 to 8.0.1 in /generators/vue/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0 to 8.0.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.0.1/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 072053e54498..727a4c34c74a 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -56,7 +56,7 @@ "terser-webpack-plugin": "5.3.10", "ts-loader": "9.5.1", "typescript": "5.5.4", - "typescript-eslint": "8.0.0", + "typescript-eslint": "8.0.1", "vite": "5.3.5", "vite-plugin-static-copy": "1.0.6", "vitest": "2.0.5", From 2c69569e274758d8bff20bd3d591864101c17d17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 02:11:04 +0000 Subject: [PATCH 163/938] Bump axios-mock-adapter in /generators/vue/resources Bumps [axios-mock-adapter](https://github.com/ctimmerm/axios-mock-adapter) from 1.22.0 to 2.0.0. - [Release notes](https://github.com/ctimmerm/axios-mock-adapter/releases) - [Changelog](https://github.com/ctimmerm/axios-mock-adapter/blob/master/CHANGELOG.md) - [Commits](https://github.com/ctimmerm/axios-mock-adapter/compare/v1.22.0...v2.0.0) --- updated-dependencies: - dependency-name: axios-mock-adapter dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 072053e54498..0d179caec3ca 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -31,7 +31,7 @@ "@vue/test-utils": "2.4.6", "@vue/tsconfig": "0.5.1", "autoprefixer": "10.4.20", - "axios-mock-adapter": "1.22.0", + "axios-mock-adapter": "2.0.0", "browser-sync-webpack-plugin": "2.3.0", "copy-webpack-plugin": "12.0.2", "css-loader": "7.1.2", From 6dbafa03245f7f52a00f138909fe22ed5e6d8081 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 03:34:05 +0000 Subject: [PATCH 164/938] Bump zone.js in /generators/angular/resources in the angular group Bumps the angular group in /generators/angular/resources with 1 update: [zone.js](https://github.com/angular/angular/tree/HEAD/packages/zone.js). Updates `zone.js` from 0.14.8 to 0.14.10 - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/main/packages/zone.js/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/zone.js-0.14.10/packages/zone.js) --- updated-dependencies: - dependency-name: zone.js dependency-type: direct:production update-type: version-update:semver-patch dependency-group: angular ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 76a8c519279d..ea781b60a2b1 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -16,7 +16,7 @@ "rxjs": "7.8.1", "sockjs-client": "1.6.1", "tslib": "2.6.3", - "zone.js": "0.14.8" + "zone.js": "0.14.10" }, "devDependencies": { "@angular-architects/module-federation": "18.0.4", From be59b8dd8ea35895dce5997d87819afda21fc1f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 03:34:16 +0000 Subject: [PATCH 165/938] Bump typescript-eslint in /generators/angular/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.0 to 8.0.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.0.1/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 76a8c519279d..edba5a0786d3 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -48,7 +48,7 @@ "rimraf": "5.0.8", "ts-jest": "29.2.4", "typescript": "5.4.5", - "typescript-eslint": "8.0.0", + "typescript-eslint": "8.0.1", "webpack": "5.93.0", "webpack-bundle-analyzer": "4.10.2", "webpack-merge": "6.0.1", From acc46e408ed8904f221a6f96f7455f451b287332 Mon Sep 17 00:00:00 2001 From: Jan Wedding Date: Tue, 6 Aug 2024 11:52:35 +0200 Subject: [PATCH 166/938] Correct issue with invalid contraint being generated for ManyToMany relationships when updating constraints Fix #26910 --- .../incremental-liquibase.spec.ts.snap | 168 ++++++++++++++++++ .../liquibase/incremental-liquibase.spec.ts | 87 +++++++++ .../updated_entity_constraints.xml.ejs | 2 +- 3 files changed, 256 insertions(+), 1 deletion(-) diff --git a/generators/liquibase/__snapshots__/incremental-liquibase.spec.ts.snap b/generators/liquibase/__snapshots__/incremental-liquibase.spec.ts.snap index c76ae36465f0..dbdad1329644 100644 --- a/generators/liquibase/__snapshots__/incremental-liquibase.spec.ts.snap +++ b/generators/liquibase/__snapshots__/incremental-liquibase.spec.ts.snap @@ -339,6 +339,174 @@ ROLE_USER } `; +exports[`generator - app - --incremental-changelog when adding a many-to-many relationship should match snapshot 1`] = ` +{ + "src/main/resources/config/liquibase/changelog/20200102000100_updated_entity_One.xml": { + "contents": " + + + + + + + + + + + + + + + + + + + + + +", + "stateCleared": "modified", + }, + "src/main/resources/config/liquibase/changelog/20200102000100_updated_entity_constraints_One.xml": { + "contents": " + + + + + + + + + + + +", + "stateCleared": "modified", + }, + "src/main/resources/config/liquibase/changelog/20200102000100_updated_entity_migrate_One.xml": { + "contents": " + + + + + + + + + + + + +", + "stateCleared": "modified", + }, + "src/main/resources/config/liquibase/data/authority.csv": { + "contents": "name +ROLE_ADMIN +ROLE_USER +", + "stateCleared": "modified", + }, + "src/main/resources/config/liquibase/data/user.csv": { + "contents": "id;login;password_hash;first_name;last_name;email;image_url;activated;lang_key;created_by;last_modified_by +1;admin;$2a$10$gSAhZrxMllrbgj/kkK9UceBPpChGWJA7SYIb1Mqo.n5aNLq1/oRrC;Administrator;Administrator;admin@localhost;;true;en;system;system +2;user;$2a$10$VEjxo0jq2YG9Rbk2HmX9S.k1uZBGYUHdUcid3g/vfiEl7lwWgOH/K;User;User;user@localhost;;true;en;system;system +", + "stateCleared": "modified", + }, + "src/main/resources/config/liquibase/data/user_authority.csv": { + "contents": "user_id;authority_name +1;ROLE_ADMIN +1;ROLE_USER +2;ROLE_USER +", + "stateCleared": "modified", + }, + "src/main/resources/config/liquibase/fake-data/20200102000100_entity_one.csv": { + "contents": "one_id +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +", + "stateCleared": "modified", + }, + "src/main/resources/config/liquibase/master.xml": { + "contents": " + + + + + + + + + + + + + + + + + + +", + "stateCleared": "modified", + }, +} +`; + exports[`generator - app - --incremental-changelog when adding a relationship should match snapshot 1`] = ` { "src/main/resources/config/liquibase/changelog/20200102000100_updated_entity_One.xml": { diff --git a/generators/liquibase/incremental-liquibase.spec.ts b/generators/liquibase/incremental-liquibase.spec.ts index 5bcea2cddbe1..06bfea5aa103 100644 --- a/generators/liquibase/incremental-liquibase.spec.ts +++ b/generators/liquibase/incremental-liquibase.spec.ts @@ -159,6 +159,12 @@ relationship ManyToOne { } `; +const jdlApplicationWithEntitiesAndAddedNewMnyToManyRelationship = ` +${jdlApplicationWithEntities} +relationship ManyToMany { + One to Another +}`; + const generatorPath = join(__dirname, '../server/index.js'); const mockedGenerators = ['jhipster:common']; @@ -730,6 +736,87 @@ entity Customer { expect(runResult.getSnapshot('**/src/main/resources/config/liquibase/**')).toMatchSnapshot(); }); }); + + describe('when adding a many-to-many relationship', () => { + let runResult; + before(async () => { + const baseName = 'JhipsterApp'; + const initialState = createImporterFromContent(jdlApplicationWithEntities, { + ...options, + creationTimestampConfig: options.creationTimestamp, + }).import(); + const applicationWithEntities = initialState.exportedApplicationsWithEntities[baseName]; + expect(applicationWithEntities).toBeTruthy(); + expect(applicationWithEntities.entities.length).toBe(2); + runResult = await helpers + .create(generatorPath) + .withJHipsterConfig(config) + .withOptions({ ...options, applicationWithEntities }) + .run(); + + const state = createImporterFromContent(jdlApplicationWithEntitiesAndAddedNewMnyToManyRelationship, { + ...options, + }).import(); + runResult = await runResult + .create(generatorPath) + .withOptions({ + ...options, + applicationWithEntities: state.exportedApplicationsWithEntities[baseName], + creationTimestamp: '2020-01-02', + }) + .run(); + }); + + after(() => runResult.cleanup()); + + it('should create application', () => { + runResult.assertFile(['.yo-rc.json']); + }); + it('should create entity config file', () => { + runResult.assertFile([join('.jhipster', 'One.json'), join('.jhipster', 'Another.json')]); + }); + it('should create entity initial changelog', () => { + runResult.assertFile([ + `${SERVER_MAIN_RES_DIR}config/liquibase/changelog/20200101000100_added_entity_One.xml`, + `${SERVER_MAIN_RES_DIR}config/liquibase/changelog/20200101000200_added_entity_Another.xml`, + ]); + }); + it('should create entity initial fake data', () => { + runResult.assertFile([`${SERVER_MAIN_RES_DIR}config/liquibase/fake-data/20200101000100_entity_one.csv`]); + }); + it('should create relationship table', () => { + runResult.assertFile([`${SERVER_MAIN_RES_DIR}config/liquibase/changelog/20200102000100_updated_entity_One.xml`]); + runResult.assertFileContent( + `${SERVER_MAIN_RES_DIR}config/liquibase/changelog/20200102000100_updated_entity_One.xml`, + 'createTable tableName="rel_one__another"', + ); + runResult.assertFileContent( + `${SERVER_MAIN_RES_DIR}config/liquibase/changelog/20200102000100_updated_entity_One.xml`, + 'column name="another_another_id" type="bigint"', + ); + runResult.assertFileContent( + `${SERVER_MAIN_RES_DIR}config/liquibase/changelog/20200102000100_updated_entity_One.xml`, + 'column name="one_one_id" type="bigint"', + ); + }); + it('should create the entity constraint update changelog referencing both columns of the join table', () => { + runResult.assertFile([`${SERVER_MAIN_RES_DIR}config/liquibase/changelog/20200102000100_updated_entity_constraints_One.xml`]); + + runResult.assertFileContent( + `${SERVER_MAIN_RES_DIR}config/liquibase/changelog/20200102000100_updated_entity_constraints_One.xml`, + 'baseColumnNames="one_one_id"', + ); + + runResult.assertFileContent( + `${SERVER_MAIN_RES_DIR}config/liquibase/changelog/20200102000100_updated_entity_constraints_One.xml`, + 'baseColumnNames="another_another_id"', + ); + }); + it('should match snapshot', () => { + expect(runResult.getSnapshot('**/src/main/resources/config/liquibase/**')).toMatchSnapshot(); + }); + }); + describe('when adding a relationship with on handlers', () => { let runResult; before(async () => { diff --git a/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs b/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs index 8936a0c18643..b522a24a9383 100644 --- a/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs +++ b/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs @@ -134,7 +134,7 @@ if (hasFieldConstraint) { _%> const otherEntityConstraintName = this.getFKConstraintName(relationship.joinTable.name, relationship.columnName, prodDatabaseType); _%> - Date: Wed, 31 Jul 2024 23:06:25 -0300 Subject: [PATCH 167/938] update eslint to v9 --- .eslintignore | 11 - .eslintrc.json | 105 ---- .github/dependabot.yml | 5 +- eslint.config.js | 93 +++ lib/eslint/{recommended.ts => recommended.js} | 0 package-lock.json | 574 +++++++----------- package.json | 16 +- test-integration/scripts/99-write-matrix.js | 2 +- tsconfig.spec.json | 13 +- 9 files changed, 331 insertions(+), 488 deletions(-) delete mode 100644 .eslintignore delete mode 100644 .eslintrc.json create mode 100644 eslint.config.js rename lib/eslint/{recommended.ts => recommended.js} (100%) diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index aabe916debee..000000000000 --- a/.eslintignore +++ /dev/null @@ -1,11 +0,0 @@ -.vscode-test -coverage -generators/**/templates -node_modules -node_modules_container -test-integration -docs -test/templates -jdl/bundling -test/fixtures/** -dist diff --git a/.eslintrc.json b/.eslintrc.json deleted file mode 100644 index 920b4c9d8987..000000000000 --- a/.eslintrc.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "env": { - "node": true, - "es2022": true - }, - "extends": ["plugin:prettier/recommended", "plugin:@typescript-eslint/recommended"], - "parser": "@typescript-eslint/parser", - "plugins": ["mocha", "prettier", "chai-friendly", "@typescript-eslint", "unused-imports", "import"], - "settings": { - "import/core-modules": ["generator-jhipster", "generator-jhipster/support"] - }, - "parserOptions": { - "ecmaVersion": 13 - }, - "overrides": [ - { - "files": ["**/*.{c,m,}{js,ts}"], - "rules": { - "import/extensions": [0, { "pattern": { "{c,m,}{js,ts}": "always" } }] - } - }, - { - "files": ["**/*.spec.{c,m,}{js,ts}", "**/__test-support/*.{c,m,}{js,ts}", "test/**/*.{c,m,}{js,ts}"], - "rules": { - "@typescript-eslint/ban-ts-comment": "off", - "import/first": "off" - } - }, - { - "files": ["**/*.{c,m,}js", "**/*.{c,m,}js"], - "rules": { - "@typescript-eslint/no-var-requires": "off", - "@typescript-eslint/no-empty-function": "off", - "@typescript-eslint/no-this-alias": "off", - "import/no-unresolved": "off" - } - }, - { - "files": ["**/*.{c,m,}ts"], - "rules": { - "import/extensions": "off", - "import/no-unresolved": "off" - } - } - ], - "rules": { - "default-param-last": "off", - "import/no-unresolved": [2, { "ignore": ["^#[\\w\\d/\\-]+$"] }], - "import/prefer-default-export": "off", - "prettier/prettier": "error", - "prefer-regex-literals": "off", - "linebreak-style": 0, - "eol-last": 2, - "quotes": [2, "single", { "avoidEscape": true }], - "semi": [2, "always"], - "eqeqeq": [2, "smart"], - "no-restricted-globals": ["off"], - "no-restricted-exports": "off", - "no-use-before-define": [2, "nofunc"], - "no-confusing-arrow": "off", - "no-multi-str": 2, - "no-promise-executor-return": "off", - "no-irregular-whitespace": 2, - "@typescript-eslint/no-empty-function": "off", - "@typescript-eslint/no-unused-vars": "off", - "unused-imports/no-unused-imports": "error", - "unused-imports/no-unused-vars": [ - "error", - { "vars": "all", "varsIgnorePattern": "^_", "args": "after-used", "argsIgnorePattern": "^_" } - ], - "@typescript-eslint/no-explicit-any": "off", - "comma-dangle": "off", - "max-len": "off", - "import/order": "error", - "import/no-duplicates": "error", - "func-names": "off", - "class-methods-use-this": "off", - "no-underscore-dangle": "off", - "no-plusplus": "off", - "no-unused-expressions": 0, - "chai-friendly/no-unused-expressions": [2, { "allowShortCircuit": true, "allowTernary": true }], - "prefer-destructuring": "off", - "no-multi-assign": "off", - "no-param-reassign": "off", - "lines-between-class-members": [2, "always", { "exceptAfterSingleLine": true }], - "import/no-extraneous-dependencies": "off", - "no-await-in-loop": "off", - "no-restricted-syntax": [ - "error", - { - "selector": "ForInStatement", - "message": "for..in loops iterate over the entire prototype chain, which is virtually never what you want. Use Object.{keys,values,entries}, and iterate over the resulting array." - }, - { - "selector": "LabeledStatement", - "message": "Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand." - }, - { - "selector": "WithStatement", - "message": "`with` is disallowed in strict mode because it makes code impossible to predict and optimize." - } - ], - "no-shadow": "off" - } -} diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 581792f5ff40..cfb53d5344ab 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -36,9 +36,10 @@ updates: - dependency-name: '@types/node' versions: ['>=19'] groups: - typescript-eslint: + eslint: patterns: - - '@typescript-eslint/*' + - '@eslint/*' + - 'eslint' - package-ecosystem: 'npm' directory: '/generators/generate-blueprint/resources/' diff --git a/eslint.config.js b/eslint.config.js new file mode 100644 index 000000000000..02ed5cdfc218 --- /dev/null +++ b/eslint.config.js @@ -0,0 +1,93 @@ +import globals from 'globals'; +import ts from 'typescript-eslint'; +import prettier from 'eslint-plugin-prettier/recommended'; +import chai from 'eslint-plugin-chai-friendly'; +import jhipster from './lib/eslint/recommended.js'; + +export default ts.config( + { + languageOptions: { + globals: { + ...globals.node, + }, + }, + }, + { ignores: ['dist'] }, + jhipster, + { + files: ['**/*.ts'], + extends: [...ts.configs.stylistic], + languageOptions: { + parserOptions: { + project: ['./tsconfig.spec.json'], + }, + }, + rules: { + '@typescript-eslint/consistent-type-definitions': 'off', + '@typescript-eslint/no-empty-function': 'off', + '@typescript-eslint/no-unused-vars': 'off', + '@typescript-eslint/no-explicit-any': 'off', + '@typescript-eslint/prefer-for-of': 'off', + }, + }, + { + files: ['**/*.spec.ts', 'testing/**/*', 'test/**/*'], + rules: { + 'import/no-unresolved': 'off', + }, + }, + { + rules: { + 'default-param-last': 'off', + 'prefer-regex-literals': 'off', + 'linebreak-style': 0, + 'eol-last': 2, + quotes: [2, 'single', { avoidEscape: true }], + semi: [2, 'always'], + eqeqeq: [2, 'smart'], + 'no-restricted-globals': ['off'], + 'no-restricted-exports': 'off', + 'no-use-before-define': [2, 'nofunc'], + 'no-confusing-arrow': 'off', + 'no-multi-str': 2, + 'no-promise-executor-return': 'off', + 'no-irregular-whitespace': 2, + 'comma-dangle': 'off', + 'max-len': 'off', + 'func-names': 'off', + 'class-methods-use-this': 'off', + 'no-underscore-dangle': 'off', + 'no-plusplus': 'off', + 'no-unused-expressions': 0, + 'prefer-destructuring': 'off', + 'no-multi-assign': 'off', + 'no-param-reassign': 'off', + 'lines-between-class-members': [2, 'always', { exceptAfterSingleLine: true }], + 'no-await-in-loop': 'off', + 'no-restricted-syntax': [ + 'error', + { + selector: 'ForInStatement', + message: + 'for..in loops iterate over the entire prototype chain, which is virtually never what you want. Use Object.{keys,values,entries}, and iterate over the resulting array.', + }, + { + selector: 'LabeledStatement', + message: 'Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand.', + }, + { + selector: 'WithStatement', + message: '`with` is disallowed in strict mode because it makes code impossible to predict and optimize.', + }, + ], + 'no-shadow': 'off', + 'import/extensions': [0, { pattern: { '{c,m,}{js,ts}': 'always' } }], + 'import/prefer-default-export': 'off', + }, + }, + { + ...chai.configs.recommendedFlat, + files: ['jdl/**/*.spec.{js,ts}'], + }, + prettier, +); diff --git a/lib/eslint/recommended.ts b/lib/eslint/recommended.js similarity index 100% rename from lib/eslint/recommended.ts rename to lib/eslint/recommended.js diff --git a/package-lock.json b/package-lock.json index 4f0adfe482a0..965c0fe2ad5d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,8 +14,6 @@ "@iarna/toml": "3.0.0", "@types/ejs": "3.1.5", "@types/lodash": "4.17.6", - "@typescript-eslint/eslint-plugin": "7.18.0", - "@typescript-eslint/parser": "7.18.0", "@yeoman/adapter": "1.4.0", "@yeoman/conflicter": "2.0.0", "@yeoman/namespace": "1.0.0", @@ -31,12 +29,13 @@ "dockerfile-ast": "0.6.1", "dot-properties": "1.0.1", "ejs": "3.1.10", - "eslint": "8.57.0", + "eslint": "9.8.0", "eslint-plugin-import": "2.29.1", - "eslint-plugin-unused-imports": "3.2.0", + "eslint-plugin-unused-imports": "4.0.1", "execa": "9.3.0", "fast-xml-parser": "4.4.1", "glob": "10.4.2", + "globals": "15.9.0", "isbinaryfile": "5.0.2", "java-lint": "0.3.0", "js-yaml": "4.1.0", @@ -61,6 +60,7 @@ "sort-keys": "5.0.0", "type-fest": "4.23.0", "typescript": "5.4.5", + "typescript-eslint": "8.0.1", "winston": "3.13.1", "yaml": "2.5.0", "yeoman-environment": "4.4.1", @@ -80,7 +80,6 @@ "ejs-lint": "2.0.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-chai-friendly": "1.0.1", - "eslint-plugin-mocha": "10.5.0", "eslint-plugin-prettier": "5.2.1", "esmocha": "1.2.0", "jest-extended": "4.0.2", @@ -1164,16 +1163,48 @@ "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, + "node_modules/@eslint/config-array": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz", + "integrity": "sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA==", + "dependencies": { + "@eslint/object-schema": "^2.1.4", + "debug": "^4.3.1", + "minimatch": "^3.1.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/config-array/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/config-array/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", - "license": "MIT", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz", + "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", + "espree": "^10.0.1", + "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", @@ -1181,7 +1212,7 @@ "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -1191,7 +1222,6 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1207,23 +1237,31 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "license": "MIT" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, "node_modules/@eslint/eslintrc/node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -1240,6 +1278,14 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@eslint/object-schema": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", + "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@faker-js/faker": { "version": "8.4.1", "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.4.1.tgz", @@ -1266,43 +1312,6 @@ "node": ">=14" } }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", - "deprecated": "Use @eslint/config-array instead", - "license": "Apache-2.0", - "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", - "debug": "^4.3.1", - "minimatch": "^3.0.5" - }, - "engines": { - "node": ">=10.10.0" - } - }, - "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -1316,12 +1325,17 @@ "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "deprecated": "Use @eslint/object-schema instead", - "license": "BSD-3-Clause" + "node_modules/@humanwhocodes/retry": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", + "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } }, "node_modules/@iarna/toml": { "version": "3.0.0", @@ -3176,31 +3190,30 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz", - "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==", - "license": "MIT", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.0.1.tgz", + "integrity": "sha512-5g3Y7GDFsJAnY4Yhvk8sZtFfV6YNF2caLzjrRPUBzewjPCaj0yokePB4LJSobyCzGMzjZZYFbwuzbfDHlimXbQ==", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.18.0", - "@typescript-eslint/type-utils": "7.18.0", - "@typescript-eslint/utils": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0", + "@typescript-eslint/scope-manager": "8.0.1", + "@typescript-eslint/type-utils": "8.0.1", + "@typescript-eslint/utils": "8.0.1", + "@typescript-eslint/visitor-keys": "8.0.1", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^7.0.0", - "eslint": "^8.56.0" + "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", + "eslint": "^8.57.0 || ^9.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -3209,26 +3222,25 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz", - "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==", - "license": "BSD-2-Clause", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.0.1.tgz", + "integrity": "sha512-5IgYJ9EO/12pOUwiBKFkpU7rS3IU21mtXzB81TNwq2xEybcmAZrE9qwDtsb5uQd9aVO9o0fdabFyAmKveXyujg==", "dependencies": { - "@typescript-eslint/scope-manager": "7.18.0", - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/typescript-estree": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0", + "@typescript-eslint/scope-manager": "8.0.1", + "@typescript-eslint/types": "8.0.1", + "@typescript-eslint/typescript-estree": "8.0.1", + "@typescript-eslint/visitor-keys": "8.0.1", "debug": "^4.3.4" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^8.56.0" + "eslint": "^8.57.0 || ^9.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -3237,16 +3249,15 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz", - "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==", - "license": "MIT", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.0.1.tgz", + "integrity": "sha512-NpixInP5dm7uukMiRyiHjRKkom5RIFA4dfiHvalanD2cF0CLUuQqxfg8PtEUo9yqJI2bBhF+pcSafqnG3UBnRQ==", "dependencies": { - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0" + "@typescript-eslint/types": "8.0.1", + "@typescript-eslint/visitor-keys": "8.0.1" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -3254,26 +3265,22 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz", - "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==", - "license": "MIT", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.0.1.tgz", + "integrity": "sha512-+/UT25MWvXeDX9YaHv1IS6KI1fiuTto43WprE7pgSMswHbn1Jm9GEM4Txp+X74ifOWV8emu2AWcbLhpJAvD5Ng==", "dependencies": { - "@typescript-eslint/typescript-estree": "7.18.0", - "@typescript-eslint/utils": "7.18.0", + "@typescript-eslint/typescript-estree": "8.0.1", + "@typescript-eslint/utils": "8.0.1", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, - "peerDependencies": { - "eslint": "^8.56.0" - }, "peerDependenciesMeta": { "typescript": { "optional": true @@ -3281,12 +3288,11 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz", - "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==", - "license": "MIT", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.0.1.tgz", + "integrity": "sha512-PpqTVT3yCA/bIgJ12czBuE3iBlM3g4inRSC5J0QOdQFAn07TYrYEQBBKgXH1lQpglup+Zy6c1fxuwTk4MTNKIw==", "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -3294,13 +3300,12 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz", - "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==", - "license": "BSD-2-Clause", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.0.1.tgz", + "integrity": "sha512-8V9hriRvZQXPWU3bbiUV4Epo7EvgM6RTs+sUmxp5G//dBGy402S7Fx0W0QkB2fb4obCF8SInoUzvTYtc3bkb5w==", "dependencies": { - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0", + "@typescript-eslint/types": "8.0.1", + "@typescript-eslint/visitor-keys": "8.0.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3309,7 +3314,7 @@ "ts-api-utils": "^1.3.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -3322,50 +3327,42 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz", - "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==", - "license": "MIT", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.0.1.tgz", + "integrity": "sha512-CBFR0G0sCt0+fzfnKaciu9IBsKvEKYwN9UZ+eeogK1fYHg4Qxk1yf/wLQkLXlq8wbU2dFlgAesxt8Gi76E8RTA==", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "7.18.0", - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/typescript-estree": "7.18.0" + "@typescript-eslint/scope-manager": "8.0.1", + "@typescript-eslint/types": "8.0.1", + "@typescript-eslint/typescript-estree": "8.0.1" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^8.56.0" + "eslint": "^8.57.0 || ^9.0.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz", - "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==", - "license": "MIT", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.0.1.tgz", + "integrity": "sha512-W5E+o0UfUcK5EgchLZsyVWqARmsM7v54/qEq6PY3YI5arkgmCzHiuk0zKSJJbm71V0xdRna4BGomkCTXz2/LkQ==", "dependencies": { - "@typescript-eslint/types": "7.18.0", + "@typescript-eslint/types": "8.0.1", "eslint-visitor-keys": "^3.4.3" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "license": "ISC" - }, "node_modules/@yeoman/adapter": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@yeoman/adapter/-/adapter-1.4.0.tgz", @@ -3512,7 +3509,6 @@ "version": "8.12.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", - "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -3524,7 +3520,6 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -3754,7 +3749,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "license": "MIT", "engines": { "node": ">=8" } @@ -4294,7 +4288,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "license": "MIT", "engines": { "node": ">=6" } @@ -5269,18 +5262,6 @@ "node": "*" } }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "license": "Apache-2.0", - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/dot-prop": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-9.0.0.tgz", @@ -5686,41 +5667,36 @@ } }, "node_modules/eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", - "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", - "license": "MIT", + "version": "9.8.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.8.0.tgz", + "integrity": "sha512-K8qnZ/QJzT2dLKdZJVX6W4XOwBzutMYmt0lqUS+JdXgd+HTYFlonFgkJ8s44d/zMPPCnOOk0kMWCApCPhiOy9A==", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", + "@eslint-community/regexpp": "^4.11.0", + "@eslint/config-array": "^0.17.1", + "@eslint/eslintrc": "^3.1.0", + "@eslint/js": "9.8.0", "@humanwhocodes/module-importer": "^1.0.1", + "@humanwhocodes/retry": "^0.3.0", "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", - "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", + "eslint-scope": "^8.0.2", + "eslint-visitor-keys": "^4.0.0", + "espree": "^10.1.0", + "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", @@ -5734,10 +5710,10 @@ "eslint": "bin/eslint.js" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { - "url": "https://opencollective.com/eslint" + "url": "https://eslint.org/donate" } }, "node_modules/eslint-config-prettier": { @@ -5895,24 +5871,6 @@ "semver": "bin/semver.js" } }, - "node_modules/eslint-plugin-mocha": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.5.0.tgz", - "integrity": "sha512-F2ALmQVPT1GoP27O1JTZGrV9Pqg8k79OeIuvw63UxMtQKREZtmkK1NFgkZQ2TW7L2JSSFKHFPTtHu5z8R9QNRw==", - "dev": true, - "license": "MIT", - "dependencies": { - "eslint-utils": "^3.0.0", - "globals": "^13.24.0", - "rambda": "^7.4.0" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "eslint": ">=7.0.0" - } - }, "node_modules/eslint-plugin-prettier": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz", @@ -5945,19 +5903,18 @@ } }, "node_modules/eslint-plugin-unused-imports": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.2.0.tgz", - "integrity": "sha512-6uXyn6xdINEpxE1MtDjxQsyXB37lfyO2yKGVVgtD7WEWQGORSOZjgrD6hBhvGv4/SO+TOlS+UnC6JppRqbuwGQ==", - "license": "MIT", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.0.1.tgz", + "integrity": "sha512-rax76s05z64uQgG9YXsWFmXrgjkaK79AvfeAWiSxhPP6RVGxeRaj4+2u+wxxu/mDy2pmJoOy1QTOEALMia2xGQ==", "dependencies": { "eslint-rule-composer": "^0.3.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "peerDependencies": { - "@typescript-eslint/eslint-plugin": "6 - 7", - "eslint": "8" + "@typescript-eslint/eslint-plugin": "^8.0.0-0", + "eslint": "^9.0.0" }, "peerDependenciesMeta": { "@typescript-eslint/eslint-plugin": { @@ -5975,50 +5932,20 @@ } }, "node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "license": "BSD-2-Clause", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz", + "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eslint-visitor-keys": "^2.0.0" - }, - "engines": { - "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=5" - } - }, - "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=10" - } - }, "node_modules/eslint-visitor-keys": { "version": "3.4.3", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", @@ -6031,15 +5958,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/@eslint/js": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", - "license": "MIT", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, "node_modules/eslint/node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -6115,6 +6033,17 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "license": "MIT" }, + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", + "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/eslint/node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -6361,17 +6290,27 @@ } }, "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "license": "BSD-2-Clause", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", + "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", "dependencies": { - "acorn": "^8.9.0", + "acorn": "^8.12.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" + "eslint-visitor-keys": "^4.0.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", + "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -6407,7 +6346,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -6648,15 +6586,14 @@ } }, "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "license": "MIT", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "dependencies": { - "flat-cache": "^3.0.4" + "flat-cache": "^4.0.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=16.0.0" } }, "node_modules/file-type": { @@ -6762,83 +6699,21 @@ } }, "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", - "license": "MIT", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "dependencies": { "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" + "keyv": "^4.5.4" }, "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/flat-cache/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/flat-cache/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/flat-cache/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/flat-cache/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "license": "ISC", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">=16" } }, "node_modules/flatted": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", - "license": "ISC" + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==" }, "node_modules/fly-import": { "version": "0.4.0", @@ -6944,6 +6819,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, "license": "ISC" }, "node_modules/fsevents": { @@ -7174,27 +7050,11 @@ } }, "node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "license": "MIT", - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globals/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "license": "(MIT OR CC0-1.0)", + "version": "15.9.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.9.0.tgz", + "integrity": "sha512-SmSKyLLKFbSr6rptvP8izbyxJL4ILwqO9Jg23UA0sDlGlu58V59D1//I3vlc0KJphVdUR7vMjHIplYnzBxorQA==", "engines": { - "node": ">=10" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -7220,7 +7080,6 @@ "version": "11.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "license": "MIT", "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", @@ -7240,7 +7099,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "license": "MIT", "engines": { "node": ">=8" } @@ -7303,8 +7161,7 @@ "node_modules/graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "license": "MIT" + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" }, "node_modules/grouped-queue": { "version": "2.0.0", @@ -7551,7 +7408,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -7598,6 +7454,7 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, "license": "ISC", "dependencies": { "once": "^1.3.0", @@ -11258,7 +11115,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -11342,6 +11198,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -11791,13 +11648,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/rambda": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/rambda/-/rambda-7.5.0.tgz", - "integrity": "sha512-y/M9weqWAH4iopRd7EHDEQQvpFPHj1AA3oHozE9tfITHUtTR7Z9PSlIRRG2l1GuW7sefC1cXFfIcF+cgnShdBA==", - "dev": true, - "license": "MIT" - }, "node_modules/randexp": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.5.3.tgz", @@ -12217,7 +12067,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "license": "MIT", "engines": { "node": ">=4" } @@ -13428,7 +13277,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==", - "license": "MIT", "engines": { "node": ">=16" }, @@ -13610,6 +13458,28 @@ "node": ">=14.17" } }, + "node_modules/typescript-eslint": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.0.1.tgz", + "integrity": "sha512-V3Y+MdfhawxEjE16dWpb7/IOgeXnLwAEEkS7v8oDqNcR1oYlqWhGH/iHqHdKVdpWme1VPZ0SoywXAkCqawj2eQ==", + "dependencies": { + "@typescript-eslint/eslint-plugin": "8.0.1", + "@typescript-eslint/parser": "8.0.1", + "@typescript-eslint/utils": "8.0.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, "node_modules/uc.micro": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", diff --git a/package.json b/package.json index ae644434b6f6..37b4ddddc884 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "copy-files": "cpy \"jdl/*.json\" \"dist/jdl\" && cpy \"generators/**\" \"!**/*.(js|cjs|mjs|ts|cts|mts|snap)\" \"!**/__*/*\" dist/generators", "copy-types": "cpy \"generators/**/*.d.(|c|m)ts\" dist/types/generators && cpy \"jdl/**/*.d.(|c|m)ts\" dist/types/jdl", "ejslint": "ejslint generators/**/*.ejs", - "eslint": "eslint . --ext .js,.cjs,.mjs,.ts,.cts,.mts --max-warnings 5", + "eslint": "eslint . --max-warnings 5", "jdl:test": "esmocha jdl --no-insight --forbid-only -p", "jdl:test-watch": "npm run jdl:test -- --watch", "jsdoc": "jsdoc --configure jsdoc-conf.json", @@ -122,8 +122,6 @@ "@iarna/toml": "3.0.0", "@types/ejs": "3.1.5", "@types/lodash": "4.17.6", - "@typescript-eslint/eslint-plugin": "7.18.0", - "@typescript-eslint/parser": "7.18.0", "@yeoman/adapter": "1.4.0", "@yeoman/conflicter": "2.0.0", "@yeoman/namespace": "1.0.0", @@ -139,12 +137,13 @@ "dockerfile-ast": "0.6.1", "dot-properties": "1.0.1", "ejs": "3.1.10", - "eslint": "8.57.0", + "eslint": "9.8.0", "eslint-plugin-import": "2.29.1", - "eslint-plugin-unused-imports": "3.2.0", + "eslint-plugin-unused-imports": "4.0.1", "execa": "9.3.0", "fast-xml-parser": "4.4.1", "glob": "10.4.2", + "globals": "15.9.0", "isbinaryfile": "5.0.2", "java-lint": "0.3.0", "js-yaml": "4.1.0", @@ -169,6 +168,7 @@ "sort-keys": "5.0.0", "type-fest": "4.23.0", "typescript": "5.4.5", + "typescript-eslint": "8.0.1", "winston": "3.13.1", "yaml": "2.5.0", "yeoman-environment": "4.4.1", @@ -185,7 +185,6 @@ "ejs-lint": "2.0.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-chai-friendly": "1.0.1", - "eslint-plugin-mocha": "10.5.0", "eslint-plugin-prettier": "5.2.1", "esmocha": "1.2.0", "jest-extended": "4.0.2", @@ -214,5 +213,10 @@ "type": "opencollective", "url": "https://opencollective.com/generator-jhipster", "logo": "https://opencollective.com/opencollective/logo.txt" + }, + "overrides": { + "eslint-plugin-import": { + "eslint": "$eslint" + } } } diff --git a/test-integration/scripts/99-write-matrix.js b/test-integration/scripts/99-write-matrix.js index dbd0c9981b03..c0e5f36f252b 100755 --- a/test-integration/scripts/99-write-matrix.js +++ b/test-integration/scripts/99-write-matrix.js @@ -17,7 +17,7 @@ const MATRIX_FILE = 'matrix.json'; let existing = {}; try { existing = JSON.parse(readFileSync(MATRIX_FILE)); -} catch (_) { +} catch { console.log(`File ${MATRIX_FILE} not found`); existing = { include: [] }; } diff --git a/tsconfig.spec.json b/tsconfig.spec.json index 78ff50dcc4f4..c8bd752d052f 100644 --- a/tsconfig.spec.json +++ b/tsconfig.spec.json @@ -1,15 +1,6 @@ { - "include": ["cli/**/*", "generators/**/*", "jdl/**/*", "lib/**/*", "testing/**/*"], - "exclude": [ - "generators/base-application/*.spec.*", - "generators/base-core/*.spec.*", - "generators/base/**/*.spec.*", - "generators/base-application/*.spec.*", - "generators/bootstrap-application/*.spec.*", - "generators/bootstrap-application-base/*.spec.*", - "generators/java/generators/domain/*.spec.*", - "generators/server/support/needles.spec.ts" - ], + "include": ["cli/**/*", "generators/**/*", "jdl/**/*", "lib/**/*", "testing/**/*", "test/**/*", ".blueprint/**/*"], + "exclude": [], "extends": "./tsconfig.json", "compilerOptions": { "noEmit": true, From b2a994525f37dd7dfcefb0f0a4676337e2f2777c Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 6 Aug 2024 18:24:15 -0300 Subject: [PATCH 168/938] rework eslint exported config. --- lib/eslint/base.js | 38 +++++++++++++++++++++----------------- lib/eslint/index.js | 6 ++++++ lib/eslint/recommended.js | 1 + package.json | 4 ++-- 4 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 lib/eslint/index.js diff --git a/lib/eslint/base.js b/lib/eslint/base.js index db61a6c2e3ec..69322712ec6a 100644 --- a/lib/eslint/base.js +++ b/lib/eslint/base.js @@ -1,28 +1,32 @@ import unusedImports from 'eslint-plugin-unused-imports'; import imports from 'eslint-plugin-import'; -export const baseRules = { - 'no-unused-vars': 'off', - 'import/no-duplicates': 'error', - 'import/order': 'error', - 'unused-imports/no-unused-imports': 'error', - 'unused-imports/no-unused-vars': [ - 'warn', - { - vars: 'all', - varsIgnorePattern: '^_', - args: 'after-used', - argsIgnorePattern: '^_', - }, - ], -}; - +/** + * @type {import('typescript-eslint').ConfigWithExtends} + * + * Config applied to transformed source in generation process. + * Rules must be compatible with auto fix to be applied. + */ const baseConfig = { plugins: { 'unused-imports': unusedImports, import: imports, }, - rules: baseRules, + rules: { + 'no-unused-vars': 'off', + 'import/no-duplicates': 'error', + 'import/order': 'error', + 'unused-imports/no-unused-imports': 'error', + 'unused-imports/no-unused-vars': [ + 'warn', + { + vars: 'all', + varsIgnorePattern: '^_', + args: 'after-used', + argsIgnorePattern: '^_', + }, + ], + }, }; export default baseConfig; diff --git a/lib/eslint/index.js b/lib/eslint/index.js new file mode 100644 index 000000000000..e37e1df4a7e8 --- /dev/null +++ b/lib/eslint/index.js @@ -0,0 +1,6 @@ +import recommended from './recommended.js'; +import base from './base.js'; + +recommended.recommended = recommended; + +export default { ...recommended, recommended, base }; diff --git a/lib/eslint/recommended.js b/lib/eslint/recommended.js index 741e6764f972..f103b2073ca0 100644 --- a/lib/eslint/recommended.js +++ b/lib/eslint/recommended.js @@ -1,6 +1,7 @@ import js from '@eslint/js'; import baseConfig from './base.js'; +/** @type {import('typescript-eslint').ConfigWithExtends} */ const recommended = { languageOptions: { ecmaVersion: 2022, diff --git a/package.json b/package.json index 37b4ddddc884..fc3bb7a8f22c 100644 --- a/package.json +++ b/package.json @@ -46,8 +46,8 @@ }, "./package.json": "./package.json", "./eslint/recommended": { - "types": "./dist/types/lib/eslint/recommended.d.ts", - "default": "./dist/lib/eslint/recommended.js" + "types": "./dist/types/lib/eslint/index.d.ts", + "default": "./dist/lib/eslint/index.js" }, "./generators": { "types": "./dist/types/generators/generator-list.d.ts", From 4ffe601d9bfe456bf6336c77c42e92502d27c025 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 6 Aug 2024 18:24:44 -0300 Subject: [PATCH 169/938] move eslint-worker to eslint v9 --- generators/bootstrap/generator.ts | 2 +- .../support/eslint-transform.spec.ts | 2 ++ .../bootstrap/support/eslint-transform.ts | 9 +++--- generators/bootstrap/support/eslint-worker.js | 29 +++++-------------- 4 files changed, 15 insertions(+), 27 deletions(-) diff --git a/generators/bootstrap/generator.ts b/generators/bootstrap/generator.ts index 4e553da74d9a..a590d9029fd8 100644 --- a/generators/bootstrap/generator.ts +++ b/generators/bootstrap/generator.ts @@ -203,7 +203,7 @@ export default class BootstrapGenerator extends BaseGenerator { if (!this.skipPrettier) { const ignoreErrors = this.options.ignoreErrors || this.upgradeCommand; prettierTransforms.push( - createESLintTransform.call(this, { ignoreErrors, extensions: 'ts,js,cjs,mjs' }), + createESLintTransform.call(this, { ignoreErrors }), createRemoveUnusedImportsTransform.call(this, { ignoreErrors }), await createPrettierTransform.call(this, { ignoreErrors, diff --git a/generators/bootstrap/support/eslint-transform.spec.ts b/generators/bootstrap/support/eslint-transform.spec.ts index 4f8b199bb6d5..108fdc6cc192 100644 --- a/generators/bootstrap/support/eslint-transform.spec.ts +++ b/generators/bootstrap/support/eslint-transform.spec.ts @@ -13,6 +13,7 @@ describe('generator - bootstrap - eslint', () => { path: 'foo.ts', contents: Buffer.from(` import { Foo } from 'bar'; +// eslint-disable-next-line no-console export const foo = 'bar'; `), }; @@ -23,6 +24,7 @@ export const foo = 'bar'; transform(() => undefined), ); expect(file.contents.toString()).toBe(` +// eslint-disable-next-line no-console export const foo = 'bar'; `); }); diff --git a/generators/bootstrap/support/eslint-transform.ts b/generators/bootstrap/support/eslint-transform.ts index e785bbe30034..93a38b3c67ff 100644 --- a/generators/bootstrap/support/eslint-transform.ts +++ b/generators/bootstrap/support/eslint-transform.ts @@ -22,16 +22,14 @@ import { Minimatch } from 'minimatch'; import { Piscina } from 'piscina'; import BaseGenerator from '../../base-core/index.js'; -import { getPackageRoot } from '../../../lib/index.js'; -import { JS_PRETTIER_EXTENSIONS } from '../../generator-constants.js'; import { addLineNumbers } from '../internal/transform-utils.js'; // eslint-disable-next-line import/prefer-default-export export const createESLintTransform = function ( this: BaseGenerator | void, - transformOptions: { ignoreErrors?: boolean; extensions?: string } = {}, + transformOptions: { ignoreErrors?: boolean; extensions?: string; cwd?: string } = {}, ) { - const { extensions = JS_PRETTIER_EXTENSIONS, ignoreErrors } = transformOptions; + const { extensions = 'js,cjs,mjs,ts,cts,mts,jsx,tsx', ignoreErrors, cwd } = transformOptions; const minimatch = new Minimatch(`**/*.{${extensions}}`, { dot: true }); const pool = new Piscina({ @@ -46,9 +44,10 @@ export const createESLintTransform = function ( } const fileContents = file.contents.toString(); const { result, error } = await pool.run({ - resolvePluginsRelativeTo: getPackageRoot(), + cwd, filePath: file.path, fileContents, + extensions, }); if (result) { file.contents = Buffer.from(result); diff --git a/generators/bootstrap/support/eslint-worker.js b/generators/bootstrap/support/eslint-worker.js index 59107a7a7c65..b482eda5efa3 100644 --- a/generators/bootstrap/support/eslint-worker.js +++ b/generators/bootstrap/support/eslint-worker.js @@ -1,32 +1,19 @@ import eslint from 'eslint'; +import ts from 'typescript-eslint'; -import { baseRules } from '../../../lib/eslint/base.js'; +import jhipster from '../../../lib/eslint/index.js'; let eslintInstance; -/* Flat config based eslint -Blocked by https://github.com/import-js/eslint-plugin-import/issues/2556 -import eslint from 'eslint/use-at-your-own-risk'; -const { languageOptions, plugins: tseslintPlugins } = tseslint.configs.base; -new eslint.FlatESLint({ fix: true, overrideConfigFile: true, cwd, plugins, baseConfig: { languageOptions, rules } }); -*/ - -export default async ({ resolvePluginsRelativeTo, filePath, fileContents }) => { +export default async ({ cwd, filePath, fileContents, extensions }) => { if (!eslintInstance) { eslintInstance = new eslint.ESLint({ fix: true, - // Disable destination configs. We should apply plugins and rules which jhipster depends on. - useEslintrc: false, - resolvePluginsRelativeTo, - overrideConfig: { - plugins: ['unused-imports', 'import'], - extends: ['plugin:@typescript-eslint/base'], - parserOptions: { - sourceType: 'module', - ecmaVersion: 'latest', - }, - rules: baseRules, - }, + overrideConfigFile: true, + allowInlineConfig: false, + cache: false, + cwd, + baseConfig: ts.config({ files: [`**/*.{${extensions}}`] }, ts.configs.base, jhipster.base), }); } From 4d880391fa51242383c2ee135068a1e7f94f6678 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 6 Aug 2024 22:29:02 -0300 Subject: [PATCH 170/938] change prettier imports --- generators/bootstrap/generator.ts | 4 ++-- generators/bootstrap/support/prettier-support.ts | 4 ++-- generators/bootstrap/support/prettier-worker.js | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/generators/bootstrap/generator.ts b/generators/bootstrap/generator.ts index a590d9029fd8..fc8a8699df90 100644 --- a/generators/bootstrap/generator.ts +++ b/generators/bootstrap/generator.ts @@ -21,7 +21,7 @@ import { forceYoFiles, createConflicterTransform, createYoResolveTransform } fro import type { MemFsEditorFile } from 'mem-fs-editor'; import { isFileStateModified, isFilePending } from 'mem-fs-editor/state'; import { createCommitTransform } from 'mem-fs-editor/transform'; -import prettier from 'prettier'; +import { Options as PrettierOptions } from 'prettier'; import type { FileTransform, PipelineOptions } from 'mem-fs'; import BaseGenerator from '../base/index.js'; @@ -55,7 +55,7 @@ export default class BootstrapGenerator extends BaseGenerator { upgradeCommand?: boolean; skipPrettier?: boolean; prettierExtensions: string[] = PRETTIER_EXTENSIONS.split(','); - prettierOptions: prettier.Options = { plugins: [] }; + prettierOptions: PrettierOptions = { plugins: [] }; refreshOnCommit = false; constructor(args: any, options: any, features: any) { diff --git a/generators/bootstrap/support/prettier-support.ts b/generators/bootstrap/support/prettier-support.ts index 98802d081550..f56767063b0a 100644 --- a/generators/bootstrap/support/prettier-support.ts +++ b/generators/bootstrap/support/prettier-support.ts @@ -20,7 +20,7 @@ import { passthrough } from 'p-transform'; import { isFileStateModified } from 'mem-fs-editor/state'; import { Minimatch } from 'minimatch'; import { Piscina } from 'piscina'; -import type prettier from 'prettier'; +import type { Options as PrettierOptions } from 'prettier'; import type { MemFsEditorFile, VinylMemFsEditorFile } from 'mem-fs-editor'; import type CoreGenerator from '../../base-core/index.js'; @@ -36,7 +36,7 @@ export const createPrettierTransform = async function ( prettierPackageJson?: boolean; prettierJava?: boolean; prettierProperties?: boolean; - prettierOptions?: prettier.Options; + prettierOptions?: PrettierOptions; } = {}, ) { const pool = new Piscina({ diff --git a/generators/bootstrap/support/prettier-worker.js b/generators/bootstrap/support/prettier-worker.js index f1f250dbfd86..e9fda01600b4 100644 --- a/generators/bootstrap/support/prettier-worker.js +++ b/generators/bootstrap/support/prettier-worker.js @@ -1,4 +1,4 @@ -import prettier from 'prettier'; +import { resolveConfig, format } from 'prettier'; import prettierPluginJava from 'prettier-plugin-java'; import prettierPluginProperties from 'prettier-plugin-properties'; import prettierPluginPackagejson from 'prettier-plugin-packagejson'; @@ -14,7 +14,7 @@ export default async ({ prettierProperties, }) => { try { - const resolvedDestinationFileOptions = await prettier.resolveConfig(relativeFilePath); + const resolvedDestinationFileOptions = await resolveConfig(relativeFilePath); const fileOptions = { // Config from disk ...resolvedDestinationFileOptions, @@ -32,7 +32,7 @@ export default async ({ if (prettierProperties) { fileOptions.plugins.push(prettierPluginProperties); } - return { result: await prettier.format(fileContents, fileOptions) }; + return { result: await format(fileContents, fileOptions) }; } catch (error) { let errorMessage; if (fileContents) { From 7f3c4a002473b42096527b15a645d901e98d7960 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 6 Aug 2024 22:28:43 -0300 Subject: [PATCH 171/938] eslint adjusts --- eslint.config.js | 90 +++++++++++++++++++++++++++----------------- lib/eslint/base.js | 3 +- package-lock.json | 57 ++++++++++++++++++++++++++++ package.json | 2 + tsconfig.eslint.json | 8 ++++ tsconfig.spec.json | 8 +++- 6 files changed, 132 insertions(+), 36 deletions(-) create mode 100644 tsconfig.eslint.json diff --git a/eslint.config.js b/eslint.config.js index 02ed5cdfc218..71bd1f5c936a 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,25 +1,30 @@ import globals from 'globals'; +import js from '@eslint/js'; import ts from 'typescript-eslint'; import prettier from 'eslint-plugin-prettier/recommended'; import chai from 'eslint-plugin-chai-friendly'; -import jhipster from './lib/eslint/recommended.js'; +import importRecommented from 'eslint-plugin-import/config/recommended.js'; +import jhipster from './lib/eslint/index.js'; export default ts.config( { languageOptions: { + ecmaVersion: 2022, + sourceType: 'module', globals: { ...globals.node, }, }, }, { ignores: ['dist'] }, - jhipster, + js.configs.recommended, + jhipster.base, { files: ['**/*.ts'], - extends: [...ts.configs.stylistic], + extends: [...ts.configs.recommended, ...ts.configs.stylistic], languageOptions: { parserOptions: { - project: ['./tsconfig.spec.json'], + project: ['./tsconfig.spec.json', './tsconfig.eslint.json'], }, }, rules: { @@ -28,42 +33,62 @@ export default ts.config( '@typescript-eslint/no-unused-vars': 'off', '@typescript-eslint/no-explicit-any': 'off', '@typescript-eslint/prefer-for-of': 'off', + '@typescript-eslint/no-this-alias': 'off', }, }, { - files: ['**/*.spec.ts', 'testing/**/*', 'test/**/*'], + files: ['**/*.spec.{js,ts}'], + rules: { + '@typescript-eslint/ban-ts-comment': 'off', + '@typescript-eslint/no-unused-expressions': 'off', + }, + }, + { + languageOptions: { + // import plugin does not use ecmaVersion and sourceType from languageOptions object + parserOptions: { + ecmaVersion: 2022, + sourceType: 'module', + }, + }, + settings: { + 'import/parsers': { + espree: ['.js', '.cjs', '.mjs'], + '@typescript-eslint/parser': ['.ts'], + }, + 'import/resolver': { + node: true, + typescript: true, + }, + }, + rules: { + ...importRecommented.rules, + 'import/no-named-as-default-member': 'off', + 'import/named': 'off', + 'import/extensions': [0, { pattern: { '{c,m,}{js,ts}': 'always' } }], + 'import/prefer-default-export': 'off', + 'import/namespace': 'off', + }, + }, + { + files: ['bin/**/*', '**/*.spec.ts', 'testing/**/*', 'test/**/*'], rules: { 'import/no-unresolved': 'off', }, }, { rules: { - 'default-param-last': 'off', - 'prefer-regex-literals': 'off', - 'linebreak-style': 0, - 'eol-last': 2, - quotes: [2, 'single', { avoidEscape: true }], - semi: [2, 'always'], - eqeqeq: [2, 'smart'], - 'no-restricted-globals': ['off'], - 'no-restricted-exports': 'off', - 'no-use-before-define': [2, 'nofunc'], - 'no-confusing-arrow': 'off', - 'no-multi-str': 2, - 'no-promise-executor-return': 'off', - 'no-irregular-whitespace': 2, - 'comma-dangle': 'off', - 'max-len': 'off', - 'func-names': 'off', - 'class-methods-use-this': 'off', - 'no-underscore-dangle': 'off', - 'no-plusplus': 'off', - 'no-unused-expressions': 0, - 'prefer-destructuring': 'off', - 'no-multi-assign': 'off', - 'no-param-reassign': 'off', - 'lines-between-class-members': [2, 'always', { exceptAfterSingleLine: true }], - 'no-await-in-loop': 'off', + 'eol-last': 'error', + quotes: ['error', 'single', { avoidEscape: true }], + semi: ['error', 'always'], + eqeqeq: ['error', 'smart'], + 'no-use-before-define': ['error', 'nofunc'], + 'no-multi-str': 'error', + 'no-irregular-whitespace': 'error', + 'no-console': 'error', + 'no-template-curly-in-string': 'error', + 'no-nested-ternary': 'error', + 'lines-between-class-members': ['error', 'always', { exceptAfterSingleLine: true }], 'no-restricted-syntax': [ 'error', { @@ -80,9 +105,6 @@ export default ts.config( message: '`with` is disallowed in strict mode because it makes code impossible to predict and optimize.', }, ], - 'no-shadow': 'off', - 'import/extensions': [0, { pattern: { '{c,m,}{js,ts}': 'always' } }], - 'import/prefer-default-export': 'off', }, }, { diff --git a/lib/eslint/base.js b/lib/eslint/base.js index 69322712ec6a..6746f13dee26 100644 --- a/lib/eslint/base.js +++ b/lib/eslint/base.js @@ -1,5 +1,6 @@ import unusedImports from 'eslint-plugin-unused-imports'; import imports from 'eslint-plugin-import'; +import { fixupPluginRules } from '@eslint/compat'; /** * @type {import('typescript-eslint').ConfigWithExtends} @@ -10,7 +11,7 @@ import imports from 'eslint-plugin-import'; const baseConfig = { plugins: { 'unused-imports': unusedImports, - import: imports, + import: fixupPluginRules(imports), }, rules: { 'no-unused-vars': 'off', diff --git a/package-lock.json b/package-lock.json index 965c0fe2ad5d..22466caaa35d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "8.6.0", "license": "Apache-2.0", "dependencies": { + "@eslint/compat": "1.1.1", "@eslint/js": "9.8.0", "@faker-js/faker": "8.4.1", "@iarna/toml": "3.0.0", @@ -79,6 +80,7 @@ "cpy-cli": "5.0.0", "ejs-lint": "2.0.0", "eslint-config-prettier": "9.1.0", + "eslint-import-resolver-typescript": "^3.6.1", "eslint-plugin-chai-friendly": "1.0.1", "eslint-plugin-prettier": "5.2.1", "esmocha": "1.2.0", @@ -1163,6 +1165,14 @@ "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, + "node_modules/@eslint/compat": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.1.1.tgz", + "integrity": "sha512-lpHyRyplhGPL5mGEh6M9O5nnKk0Gz4bFI+Zu6tKlPpDUN7XshWvH9C/px4UVm87IAANE0W81CEsNGbS1KlzXpA==", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@eslint/config-array": { "version": "0.17.1", "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz", @@ -5431,6 +5441,19 @@ "node": ">=0.10.0" } }, + "node_modules/enhanced-resolve": { + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/entities": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", @@ -5749,6 +5772,31 @@ "ms": "^2.1.1" } }, + "node_modules/eslint-import-resolver-typescript": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz", + "integrity": "sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==", + "dev": true, + "dependencies": { + "debug": "^4.3.4", + "enhanced-resolve": "^5.12.0", + "eslint-module-utils": "^2.7.4", + "fast-glob": "^3.3.1", + "get-tsconfig": "^4.5.0", + "is-core-module": "^2.11.0", + "is-glob": "^4.0.3" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts" + }, + "peerDependencies": { + "eslint": "*", + "eslint-plugin-import": "*" + } + }, "node_modules/eslint-module-utils": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz", @@ -12976,6 +13024,15 @@ "acorn-node": "^1.2.0" } }, + "node_modules/tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/tar": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", diff --git a/package.json b/package.json index fc3bb7a8f22c..d7059908e6cb 100644 --- a/package.json +++ b/package.json @@ -117,6 +117,7 @@ "update-snapshots": "esmocha jdl generators cli --update-snapshot --no-insight --forbid-only" }, "dependencies": { + "@eslint/compat": "1.1.1", "@eslint/js": "9.8.0", "@faker-js/faker": "8.4.1", "@iarna/toml": "3.0.0", @@ -184,6 +185,7 @@ "cpy-cli": "5.0.0", "ejs-lint": "2.0.0", "eslint-config-prettier": "9.1.0", + "eslint-import-resolver-typescript": "^3.6.1", "eslint-plugin-chai-friendly": "1.0.1", "eslint-plugin-prettier": "5.2.1", "esmocha": "1.2.0", diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json new file mode 100644 index 000000000000..c85b9bbac31f --- /dev/null +++ b/tsconfig.eslint.json @@ -0,0 +1,8 @@ +{ + "exclude": [], + "extends": "./tsconfig.spec.json", + "compilerOptions": { + "noEmit": false, + "types": [] + } +} diff --git a/tsconfig.spec.json b/tsconfig.spec.json index c8bd752d052f..654337ac9f36 100644 --- a/tsconfig.spec.json +++ b/tsconfig.spec.json @@ -1,6 +1,12 @@ { "include": ["cli/**/*", "generators/**/*", "jdl/**/*", "lib/**/*", "testing/**/*", "test/**/*", ".blueprint/**/*"], - "exclude": [], + "exclude": [ + "generators/base-application/generator.spec.*", + "generators/base-core/generator-core.spec.*", + "generators/base/**/*.spec.*", + "generators/server/support/needles.spec.ts", + "test/needle-api/**" + ], "extends": "./tsconfig.json", "compilerOptions": { "noEmit": true, From 8cb1c33410cf222d368c154daedb75714fcc4d35 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 6 Aug 2024 22:49:39 -0300 Subject: [PATCH 172/938] apply eslint --- .blueprint/generate-generator/generator.mjs | 2 +- .blueprint/generate-sample/generator.mjs | 2 +- .../support/generate-sample.js | 4 +-- bin/jhipster.cjs | 1 - cli/environment-builder.mjs | 4 --- cli/program.mjs | 4 +-- cli/utils.mjs | 2 +- generators/angular/cleanup.ts | 2 +- generators/angular/support/path-utils.js | 2 +- generators/app/generator.js | 2 +- generators/base-application/generator.spec.ts | 1 - generators/base-application/generator.ts | 1 - generators/base-application/support/debug.ts | 1 - generators/base-application/support/doc.ts | 2 +- .../base-application/support/entities.ts | 1 - generators/base-application/support/entity.ts | 1 - generators/base-application/support/enum.js | 4 +-- .../base-application/support/field-utils.js | 1 - .../support/prepare-entity.spec.ts | 1 - .../base-application/support/prepare-field.js | 1 - .../support/prepare-field.spec.ts | 2 -- .../update-application-entities-transform.ts | 4 +-- generators/base-application/types.d.ts | 24 ++++++------- generators/base-core/generator-core.spec.ts | 1 - generators/base-core/generator.ts | 12 +++---- generators/base/api.d.ts | 5 +-- generators/base/blueprints.spec.ts | 1 - generators/base/shared-data.ts | 4 +-- generators/base/support/config.ts | 14 ++++---- .../support/configuration-helpers/options.js | 1 - generators/base/support/contents.ts | 4 +-- generators/base/support/faker.ts | 6 ++-- generators/base/support/jhipster7-context.js | 4 +-- generators/base/support/namespace.ts | 2 +- generators/base/support/path.ts | 2 +- generators/base/support/string.ts | 4 +-- generators/base/support/timestamp.spec.ts | 2 -- generators/base/support/write-files.spec.ts | 4 +-- generators/base/support/write-files.ts | 2 +- generators/base/types.d.ts | 4 +-- .../bootstrap-application-base/generator.ts | 9 ++--- .../support/export-jdl-transform.ts | 2 +- .../support/import-jdl-transform.ts | 2 +- .../bootstrap-application-base/utils.js | 1 - generators/bootstrap/generator.ts | 8 ++--- .../bootstrap/support/eslint-transform.ts | 1 - .../support/java-unused-imports-transform.ts | 1 - .../support/multi-step-transform/index.ts | 3 +- .../multi-step-transform/template-file-fs.ts | 2 +- generators/ci-cd/generator.js | 2 +- generators/client/generator-needles.spec.ts | 3 +- generators/client/needle-client.spec.ts | 3 +- generators/client/support/config.ts | 36 +++++++++---------- generators/client/support/update-languages.ts | 2 +- generators/common/generator.js | 2 +- generators/cypress/generator.ts | 4 +-- generators/docker-compose/files.js | 1 - generators/docker-compose/generator.js | 1 - generators/docker/files.js | 1 - generators/docker/generator.js | 2 +- generators/docker/generator.spec.ts | 1 - generators/entity/generator.js | 2 +- generators/entity/support/index.ts | 2 +- generators/export-jdl/generator.ts | 1 - generators/git/files.js | 2 +- generators/git/generator.ts | 2 +- generators/gradle/generator.ts | 2 +- .../gradle/support/dependabot-gradle.ts | 1 - generators/heroku/generator.js | 2 +- generators/heroku/templates.js | 1 - .../java/generators/bootstrap/generator.ts | 4 +-- .../java/support/checks/check-java.spec.ts | 4 +-- generators/java/support/checks/index.ts | 1 - generators/java/support/key-store.ts | 2 +- generators/jdl/generator.ts | 3 +- generators/kubernetes-helm/generator.js | 2 +- generators/kubernetes-knative/files.js | 1 - generators/kubernetes-knative/generator.js | 2 +- generators/kubernetes/generator.js | 2 +- generators/languages/files.js | 1 - .../languages/generator-needles.spec.ts | 1 - generators/languages/generator.js | 2 +- .../languages/support/detect-language.ts | 2 +- generators/languages/support/languages.ts | 8 ++--- generators/languages/support/translate.ts | 4 +-- generators/languages/types.d.ts | 2 +- generators/liquibase/files.ts | 1 - generators/liquibase/generator.ts | 3 +- generators/maven/generator.ts | 4 +-- generators/project-name/generator.js | 2 +- generators/project-name/support/index.ts | 1 - .../react/application/entities/index.ts | 1 - generators/server/__test-support/index.ts | 1 - generators/server/generator.js | 2 -- generators/server/support/relationship.ts | 1 - generators/server/support/spring-factories.ts | 1 - generators/server/support/string.ts | 2 +- generators/spring-boot/entity-cleanup.js | 2 +- generators/spring-cache/generator.ts | 4 +-- .../spring-cache/internal/dependencies.ts | 1 - generators/spring-cache/needles.spec.ts | 1 - .../generators/gateway/types.d.ts | 2 +- .../internal/dependencies.ts | 1 - ...basic-entity-information-converter.spec.ts | 1 - .../jdl-to-json-field-converter.spec.ts | 2 +- ...jdl-to-json-relationship-converter.spec.ts | 1 - ...ith-applications-to-json-converter.spec.ts | 5 ++- ...hout-application-to-json-converter.spec.ts | 3 +- jdl/converters/json-to-jdl-converter.spec.ts | 1 - jdl/converters/json-to-jdl-converter.ts | 4 +-- .../json-to-jdl-entity-converter.spec.ts | 2 -- .../json-to-jdl-entity-converter.ts | 2 +- .../json-to-jdl-option-converter.spec.ts | 2 -- .../option-converter.spec.ts | 2 +- ...parsed-jdl-to-jdl-object-converter.spec.ts | 1 - .../parsed-jdl-to-jdl-object-converter.ts | 4 +-- jdl/exporters/export-utils.spec.ts | 1 - jdl/exporters/jdl-exporter.spec.ts | 1 - .../jhipster-deployment-exporter.spec.ts | 2 -- .../jhipster-entity-exporter.spec.ts | 1 - jdl/integration-test.spec.ts | 1 - jdl/jdl-importer.spec.ts | 1 - jdl/jhipster/binary-options.spec.ts | 1 - jdl/jhipster/database-types.spec.ts | 1 - .../default-application-options.spec.ts | 1 - jdl/jhipster/deployment-options.spec.ts | 3 -- jdl/jhipster/field-types.spec.ts | 2 -- jdl/jhipster/json-entity.spec.ts | 1 - jdl/jhipster/relationship-options.spec.ts | 2 -- jdl/jhipster/relationship-types.spec.ts | 1 - jdl/jhipster/reserved-keywords.spec.ts | 1 - jdl/jhipster/unary-options.spec.ts | 1 - jdl/jhipster/validations.spec.ts | 1 - jdl/linters/jdl-linter.spec.ts | 2 -- jdl/linters/rules.spec.ts | 3 +- jdl/models/abstract-jdl-option.spec.ts | 1 - jdl/models/index.ts | 2 +- .../jdl-application-configuration-factory.ts | 2 +- .../jdl-application-configuration.spec.ts | 1 - jdl/models/jdl-application-definition.spec.ts | 1 - jdl/models/jdl-application.spec.ts | 1 - jdl/models/jdl-application.ts | 4 +-- jdl/models/jdl-binary-option.spec.ts | 1 - jdl/models/jdl-deployment.spec.ts | 1 - jdl/models/jdl-deployment.ts | 2 +- jdl/models/jdl-entity.spec.ts | 1 - jdl/models/jdl-enum-value.spec.ts | 1 - jdl/models/jdl-enum.spec.ts | 1 - jdl/models/jdl-enums.spec.ts | 1 - jdl/models/jdl-field.spec.ts | 1 - jdl/models/jdl-object.spec.ts | 1 - jdl/models/jdl-options.spec.ts | 1 - jdl/models/jdl-relationship.spec.ts | 1 - jdl/models/jdl-relationships.spec.ts | 1 - jdl/models/jdl-unary-option.spec.ts | 1 - jdl/models/jdl-validation.spec.ts | 1 - ...st-jdl-application-configuration-option.ts | 2 +- jdl/parsing/grammar.spec.ts | 2 -- jdl/parsing/lexer/lexer.spec.ts | 1 - .../self-checks/parsing-system-checker.ts | 4 +-- jdl/parsing/validator.spec.ts | 1 - jdl/readers/jdl-reader.spec.ts | 1 - jdl/readers/json-file-reader.spec.ts | 1 - jdl/readers/json-reader.spec.ts | 1 - jdl/readers/json-reader.ts | 3 +- jdl/utils/file-utils.ts | 2 +- jdl/utils/files-utils.spec.ts | 2 -- jdl/utils/format-utils.spec.ts | 1 - jdl/utils/object-utils.spec.ts | 1 - jdl/utils/string_utils.spec.ts | 2 +- .../jdl-with-application-validator.spec.ts | 8 ++--- .../jdl-without-application-validator.spec.ts | 2 +- lib/index.ts | 1 - lib/internal/config-def.ts | 1 - test-integration/scripts/99-write-matrix.js | 1 + test/api.spec.js | 1 - .../needle-client-react-generator.spec.ts | 1 - test/needle-api/needle-client-react.spec.ts | 1 - .../needle-client-vue-generator.spec.ts | 1 - test/needle-api/needle-client-vue.spec.ts | 1 - testing/helpers.ts | 3 +- testing/support/client-samples.ts | 1 - testing/support/server-samples.ts | 1 - 183 files changed, 153 insertions(+), 292 deletions(-) diff --git a/.blueprint/generate-generator/generator.mjs b/.blueprint/generate-generator/generator.mjs index 60328e3f7289..ed0692a3139d 100644 --- a/.blueprint/generate-generator/generator.mjs +++ b/.blueprint/generate-generator/generator.mjs @@ -1,5 +1,5 @@ -import BaseGenerator from '../../generators/base/index.js'; import { camelCase, upperFirst } from 'lodash-es'; +import BaseGenerator from '../../generators/base/index.js'; export default class extends BaseGenerator { generatorNamespace; diff --git a/.blueprint/generate-sample/generator.mjs b/.blueprint/generate-sample/generator.mjs index 229032d5a42e..d3dee4dada55 100644 --- a/.blueprint/generate-sample/generator.mjs +++ b/.blueprint/generate-sample/generator.mjs @@ -2,9 +2,9 @@ import { basename, extname, resolve } from 'path'; import { transform } from '@yeoman/transform'; import BaseGenerator from '../../generators/base/index.js'; import { packageJson } from '../../lib/index.js'; -import { generateSample, entitiesByType } from './support/index.js'; import { promptSamplesFolder } from '../support.mjs'; import { GENERATOR_APP, GENERATOR_INFO, GENERATOR_JDL } from '../../generators/generator-list.js'; +import { generateSample, entitiesByType } from './support/index.js'; export default class extends BaseGenerator { sampleName; diff --git a/.blueprint/generate-sample/support/generate-sample.js b/.blueprint/generate-sample/support/generate-sample.js index 3bf4f2b3db7a..e9eff6fddd81 100644 --- a/.blueprint/generate-sample/support/generate-sample.js +++ b/.blueprint/generate-sample/support/generate-sample.js @@ -1,13 +1,13 @@ import { cpSync, existsSync, mkdirSync } from 'fs'; -import { join, resolve } from 'path'; +import { join } from 'path'; import process from 'process'; import { globSync } from 'glob'; import { execa } from 'execa'; +import { dailyBuildsFolder, jdlEntitiesSamplesFolder, jdlSamplesFolder, jhipsterBin, samplesFolder } from '../../constants.js'; import getSamples, { DAILY_PREFIX, isDaily } from './get-workflow-samples.js'; import copyEntitySamples from './copy-entity-samples.js'; import copyJdlEntitySamples from './copy-jdl-entity-samples.js'; -import { dailyBuildsFolder, jdlEntitiesSamplesFolder, jdlSamplesFolder, jhipsterBin, samplesFolder } from '../../constants.js'; const commonCliOptions = ['--skip-jhipster-dependencies', '--skip-checks', '--skip-install', '--no-insight']; diff --git a/bin/jhipster.cjs b/bin/jhipster.cjs index 7967728ea594..3ec714c107c2 100755 --- a/bin/jhipster.cjs +++ b/bin/jhipster.cjs @@ -9,7 +9,6 @@ const [_nodeExec, _exec, ...args] = process.argv; console.error('jhipster', ...args); (async () => { - // eslint-disable-next-line import/no-unresolved const { default: esbuildx } = await import('@node-loaders/esbuildx'); await esbuildx(join(__dirname, 'cli.cjs')); })(); diff --git a/cli/environment-builder.mjs b/cli/environment-builder.mjs index 333fa64b1dec..3ab04e79eb31 100644 --- a/cli/environment-builder.mjs +++ b/cli/environment-builder.mjs @@ -404,8 +404,6 @@ export default class EnvironmentBuilder { } let result; for (const [blueprint, packagePath] of blueprintPackagePaths) { - /* eslint-disable import/no-dynamic-require */ - /* eslint-disable global-require */ let blueprintCommand; const blueprintCommandFile = `${packagePath}/cli/commands`; const blueprintCommandExtension = ['.js', '.cjs', '.mjs'].find(extension => existsSync(`${blueprintCommandFile}${extension}`)); @@ -456,8 +454,6 @@ export default class EnvironmentBuilder { } async function loadSharedOptionsFromFile(sharedOptionsBase, msg, errorMsg) { - /* eslint-disable import/no-dynamic-require */ - /* eslint-disable global-require */ try { const baseExtension = ['.js', '.cjs', '.mjs'].find(extension => existsSync(resolve(`${sharedOptionsBase}${extension}`))); if (baseExtension) { diff --git a/cli/program.mjs b/cli/program.mjs index a29612a056bc..27d8f840da43 100644 --- a/cli/program.mjs +++ b/cli/program.mjs @@ -1,5 +1,3 @@ -/* eslint-disable global-require */ -/* eslint-disable import/no-dynamic-require */ /** * Copyright 2013-2024 the original author or authors from the JHipster project. * @@ -334,7 +332,7 @@ export const buildJHipster = async ({ 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; diff --git a/cli/utils.mjs b/cli/utils.mjs index 4805f5d837f4..ea71d11bd93e 100644 --- a/cli/utils.mjs +++ b/cli/utils.mjs @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable no-console */ + import chalk from 'chalk'; import { createJHipsterLogger, CLI_LOGGER } from '../generators/base/support/index.js'; diff --git a/generators/angular/cleanup.ts b/generators/angular/cleanup.ts index 009e3f1fd581..93b2531298f4 100644 --- a/generators/angular/cleanup.ts +++ b/generators/angular/cleanup.ts @@ -25,7 +25,7 @@ import { GeneratorDefinition } from '../base-application/generator.js'; * Removes files that where generated in previous JHipster versions and therefore * need to be removed. */ -// eslint-disable-next-line import/prefer-default-export + export default function cleanupOldFilesTask(this: CoreGenerator, { application }: GeneratorDefinition['writingTaskParam']) { if (this.isJhipsterVersionLessThan('3.2.0')) { // removeFile and removeFolder methods should be called here for files and folders to cleanup diff --git a/generators/angular/support/path-utils.js b/generators/angular/support/path-utils.js index 14d9603a81e5..7992e69c8341 100644 --- a/generators/angular/support/path-utils.js +++ b/generators/angular/support/path-utils.js @@ -25,7 +25,7 @@ * @param {string[]} prefix * @return {string} */ -// eslint-disable-next-line import/prefer-default-export + export const buildAngularFormPath = (reference, prefix = []) => { const formPath = [...prefix, ...reference.path].join("', '"); return `'${formPath}'`; diff --git a/generators/app/generator.js b/generators/app/generator.js index c8dfe83e5c80..4c94539420ae 100644 --- a/generators/app/generator.js +++ b/generators/app/generator.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable consistent-return, import/no-named-as-default-member */ + import chalk from 'chalk'; import { camelCase } from 'lodash-es'; diff --git a/generators/base-application/generator.spec.ts b/generators/base-application/generator.spec.ts index a55b214f5c7d..0b0b746fff52 100644 --- a/generators/base-application/generator.spec.ts +++ b/generators/base-application/generator.spec.ts @@ -1,4 +1,3 @@ -/* eslint-disable max-classes-per-file */ /** * Copyright 2013-2024 the original author or authors from the JHipster project. * diff --git a/generators/base-application/generator.ts b/generators/base-application/generator.ts index bff8e7fa4dcf..50ed9bd8e078 100644 --- a/generators/base-application/generator.ts +++ b/generators/base-application/generator.ts @@ -459,7 +459,6 @@ export default class BaseApplicationGenerator< } const entitiesToLoad = [...new Set([...builtInEntities, ...this.getExistingEntityNames()])]; return entitiesToLoad.map(entityName => { - // eslint-disable-next-line @typescript-eslint/no-this-alias const generator = this; if (!this.sharedData.hasEntity(entityName)) { this.sharedData.setEntity(entityName, { name: entityName }); diff --git a/generators/base-application/support/debug.ts b/generators/base-application/support/debug.ts index bad7eaad8087..16d04ae6826d 100644 --- a/generators/base-application/support/debug.ts +++ b/generators/base-application/support/debug.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -// eslint-disable-next-line import/prefer-default-export export const stringifyApplicationData = data => JSON.stringify( data, diff --git a/generators/base-application/support/doc.ts b/generators/base-application/support/doc.ts index 64fe466f172f..edc17e7ecef6 100644 --- a/generators/base-application/support/doc.ts +++ b/generators/base-application/support/doc.ts @@ -30,7 +30,7 @@ const isSimpleText = (previousLine, text) => { /** * Format As Liquibase Remarks */ -// eslint-disable-next-line import/prefer-default-export + export const formatDocAsSingleLine = (text: string): string => { let [description, ...rows] = text.split('\n'); // discard blank rows diff --git a/generators/base-application/support/entities.ts b/generators/base-application/support/entities.ts index 3e44c74f8f04..8064825d6a36 100644 --- a/generators/base-application/support/entities.ts +++ b/generators/base-application/support/entities.ts @@ -19,7 +19,6 @@ import { existsSync, opendirSync } from 'fs'; import { extname, basename } from 'path'; -// eslint-disable-next-line import/prefer-default-export export function getEntitiesFromDir(configDir: string): string[] { if (!existsSync(configDir)) { return []; diff --git a/generators/base-application/support/entity.ts b/generators/base-application/support/entity.ts index 554a051d5ebb..c1fa8a48d489 100644 --- a/generators/base-application/support/entity.ts +++ b/generators/base-application/support/entity.ts @@ -20,6 +20,5 @@ import { upperFirst } from 'lodash-es'; import { JSONEntity } from '../../../jdl/converters/types.js'; -// eslint-disable-next-line import/prefer-default-export export const findEntityInEntities = (entityName: string, entities: JSONEntity[]) => entities.find(entity => upperFirst(entity.name) === upperFirst(entityName)); diff --git a/generators/base-application/support/enum.js b/generators/base-application/support/enum.js index a23b92ba8404..d07d78c59cfb 100644 --- a/generators/base-application/support/enum.js +++ b/generators/base-application/support/enum.js @@ -58,7 +58,7 @@ const getEnums = (enums, customValuesState, comments) => { comment: comments && comments[enumValue] && formatDocAsJavaDoc(comments[enumValue], 4), }; } - // eslint-disable-next-line no-unused-vars + const matched = /\s*(.+?)\s*\((.+?)\)/.exec(enumValue); return { name: matched[1], @@ -83,7 +83,7 @@ const extractEnumEntries = field => { * @param {String} [clientRootFolder] - the client's root folder * @return {Object} the enum info. */ -// eslint-disable-next-line import/prefer-default-export + export const getEnumInfo = (field, clientRootFolder) => { field.enumInstance = extractEnumInstance(field); // TODO remove side effect const enums = extractEnumEntries(field); diff --git a/generators/base-application/support/field-utils.js b/generators/base-application/support/field-utils.js index a11a323a444e..d597ec031d99 100644 --- a/generators/base-application/support/field-utils.js +++ b/generators/base-application/support/field-utils.js @@ -39,7 +39,6 @@ const { BLOB, } = CommonDBTypes; -// eslint-disable-next-line import/prefer-default-export export function fieldIsEnum(fieldType) { return ![ STRING, diff --git a/generators/base-application/support/prepare-entity.spec.ts b/generators/base-application/support/prepare-entity.spec.ts index 349a0468ffc1..178f44bf6f04 100644 --- a/generators/base-application/support/prepare-entity.spec.ts +++ b/generators/base-application/support/prepare-entity.spec.ts @@ -31,7 +31,6 @@ describe('generator - base-application - support - prepareEntity', () => { describe('prepareEntityPrimaryKeyForTemplates', () => { describe('with field with id name', () => { describe('without @Id', () => { - // eslint-disable-next-line @typescript-eslint/no-explicit-any let entity: any = { ...entityDefaultConfig, name: 'Entity', diff --git a/generators/base-application/support/prepare-field.js b/generators/base-application/support/prepare-field.js index 7faa94b5de42..197fc42fc245 100644 --- a/generators/base-application/support/prepare-field.js +++ b/generators/base-application/support/prepare-field.js @@ -311,7 +311,6 @@ function prepareCommonFieldForTemplates(entityWithConfig, field, generator) { field.createRandexp = () => { // check if regex is valid. If not, issue warning and we skip fake data generation. try { - // eslint-disable-next-line no-new new RegExp(field.fieldValidateRulesPattern); } catch (e) { generator.log.warn(`${field.fieldName} pattern is not valid: ${field.fieldValidateRulesPattern}. Skipping generating fake data. `); diff --git a/generators/base-application/support/prepare-field.spec.ts b/generators/base-application/support/prepare-field.spec.ts index 5d7cdad65e51..b34b2f320058 100644 --- a/generators/base-application/support/prepare-field.spec.ts +++ b/generators/base-application/support/prepare-field.spec.ts @@ -39,7 +39,6 @@ describe('generator - base-application - support - prepareField', () => { describe('prepareFieldForTemplates', () => { describe('when called', () => { - // eslint-disable-next-line @typescript-eslint/no-explicit-any let field: any = { fieldName: 'name', fieldType: 'String' }; beforeEach(() => { field = prepareFieldForTemplates(defaultEntity, field, defaultGenerator); @@ -58,7 +57,6 @@ describe('generator - base-application - support - prepareField', () => { }); }); describe('with dto == mapstruct and @MapstructExpression', () => { - // eslint-disable-next-line @typescript-eslint/no-explicit-any let field: any = { fieldName: 'name', fieldType: 'String', mapstructExpression: 'java()' }; beforeEach(() => { field = prepareFieldForTemplates({ ...defaultEntity, dto: 'mapstruct' }, field, defaultGenerator); diff --git a/generators/base-application/support/update-application-entities-transform.ts b/generators/base-application/support/update-application-entities-transform.ts index 370477009e43..83e2c824ea05 100644 --- a/generators/base-application/support/update-application-entities-transform.ts +++ b/generators/base-application/support/update-application-entities-transform.ts @@ -47,10 +47,10 @@ export const updateApplicationEntitiesTransform = ({ yoRcFile.contents = Buffer.from(JSON.stringify(contents, null, 2)); yoRcFileInMemory = yoRcFile; } else if (throwOnMissingConfig) { - throw new Error(`File ${yoRcFile!.path} is not a valid JHipster configuration file`); + throw new Error(`File ${yoRcFile.path} is not a valid JHipster configuration file`); } } else if (throwOnMissingConfig) { - throw new Error(`File ${yoRcFile!.path} has no contents`); + throw new Error(`File ${yoRcFile.path} has no contents`); } } if (yoRcFileInMemory) { diff --git a/generators/base-application/types.d.ts b/generators/base-application/types.d.ts index b63e22762c61..307ea54de5c2 100644 --- a/generators/base-application/types.d.ts +++ b/generators/base-application/types.d.ts @@ -36,19 +36,17 @@ export type BaseApplication = { monorepository?: boolean; /** Customize templates sourceFile and destinationFile */ - customizeTemplatePaths: Array< - ( - this: CoreGenerator, - file: { - namespace: string; - sourceFile: string; - resolvedSourceFile: string; - destinationFile: string; - templatesRoots: string[]; - }, - context: any, - ) => undefined | { sourceFile: string; resolvedSourceFile: string; destinationFile: string; templatesRoots: string[] } - >; + customizeTemplatePaths: (( + this: CoreGenerator, + file: { + namespace: string; + sourceFile: string; + resolvedSourceFile: string; + destinationFile: string; + templatesRoots: string[]; + }, + context: any, + ) => undefined | { sourceFile: string; resolvedSourceFile: string; destinationFile: string; templatesRoots: string[] })[]; } & I18nApplication; /* ApplicationType Start */ diff --git a/generators/base-core/generator-core.spec.ts b/generators/base-core/generator-core.spec.ts index 2a24645c47a7..2964b1915e51 100644 --- a/generators/base-core/generator-core.spec.ts +++ b/generators/base-core/generator-core.spec.ts @@ -1,4 +1,3 @@ -/* eslint-disable no-unused-expressions */ import { it, describe, expect as jestExpect, beforeEach } from 'esmocha'; import { basicHelpers as helpers } from '../../testing/index.js'; diff --git a/generators/base-core/generator.ts b/generators/base-core/generator.ts index 8a9286222549..4156d8c48e84 100644 --- a/generators/base-core/generator.ts +++ b/generators/base-core/generator.ts @@ -445,7 +445,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`); */ async parseCurrentJHipsterCommand() { const generatorCommand = await this.getCurrentJHipsterCommand(); - this.parseJHipsterCommand(generatorCommand!); + this.parseJHipsterCommand(generatorCommand); } /** @@ -572,7 +572,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`); positionalArguments = []; } if (argument !== undefined) { - const convertedValue = !argumentDef.type || argumentDef.type === Array ? argument : argumentDef.type(argument as any); + const convertedValue = !argumentDef.type || argumentDef.type === Array ? argument : argumentDef.type(argument); if ((argumentDef.scope ?? 'generator') === 'generator') { this[argumentName] = convertedValue; } else if (argumentDef.scope === 'storage') { @@ -645,7 +645,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`); } else { // Create a new counter const newCreationTimestamp = creationTimestamp ?? this.config.get('creationTimestamp'); - now = newCreationTimestamp ? new Date(newCreationTimestamp as any) : now; + now = newCreationTimestamp ? new Date(newCreationTimestamp) : now; now.setMilliseconds(0); } now.setMinutes(now.getMinutes() + 1); @@ -797,7 +797,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`); */ writeFile(source: string, destination: string, data: TemplateData = this, options?: TemplateOptions, copyOptions: CopyOptions = {}) { // Convert to any because ejs types doesn't support string[] https://github.com/DefinitelyTyped/DefinitelyTyped/pull/63315 - // eslint-disable-next-line @typescript-eslint/no-explicit-any + const root: any = this.jhipsterTemplatesFolders ?? this.templatePath(); try { return this.renderTemplate(source, destination, data, { root, ...options }, { noGlob: true, ...copyOptions }); @@ -1273,7 +1273,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`; const gradleLibsVersions = this.readTemplate(gradleCatalog)?.toString(); if (gradleLibsVersions) { - Object.assign(javaDependencies, this.prepareDependencies(getGradleLibsVersionsProperties(gradleLibsVersions!), 'java')); + Object.assign(javaDependencies, this.prepareDependencies(getGradleLibsVersionsProperties(gradleLibsVersions), 'java')); } } @@ -1281,7 +1281,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`; destination: Record, packageJsonFile: string = this.templatePath('../resources/package.json'), ): void { - const { devDependencies, dependencies } = this.fs.readJSON(packageJsonFile, {}) as any; + const { devDependencies, dependencies } = this.fs.readJSON(packageJsonFile, {}); this.loadNodeDependencies(destination, { ...devDependencies, ...dependencies }); } diff --git a/generators/base/api.d.ts b/generators/base/api.d.ts index f20a105d4e12..27d1bf214779 100644 --- a/generators/base/api.d.ts +++ b/generators/base/api.d.ts @@ -3,9 +3,7 @@ import type { RequireAtLeastOne, SetOptional } from 'type-fest'; import type CoreGenerator from '../base-core/index.js'; export type ApplicationWithConfig = { - config: { - [key: string]: string | boolean | number | string[]; - }; + config: Record; entities: Record; }; @@ -115,7 +113,6 @@ export type JHipsterGeneratorFeatures = BaseFeatures & { queueCommandTasks?: boolean; }; -// eslint-disable-next-line no-use-before-define export type EditFileCallback = (this: Generator, content: string, filePath: string) => string; export type EditFileOptions = { create?: boolean; ignoreNonExisting?: boolean | string; assertModified?: boolean }; diff --git a/generators/base/blueprints.spec.ts b/generators/base/blueprints.spec.ts index 80df047469c3..ee5f8b2f2ef5 100644 --- a/generators/base/blueprints.spec.ts +++ b/generators/base/blueprints.spec.ts @@ -1,4 +1,3 @@ -/* eslint-disable max-classes-per-file */ import { before, it, describe, expect, esmocha } from 'esmocha'; import { RunResult } from 'yeoman-test'; import { toHaveBeenCalledAfter } from 'jest-extended'; diff --git a/generators/base/shared-data.ts b/generators/base/shared-data.ts index dc5db5bcf564..b7444d37831b 100644 --- a/generators/base/shared-data.ts +++ b/generators/base/shared-data.ts @@ -65,7 +65,7 @@ export default class SharedData string | undefined> = []; + let customizeRemoveFiles: ((file: string) => string | undefined)[] = []; const removeFiles = async (assertions: { removedInVersion?: string } | string, ...files: string[]) => { if (typeof assertions === 'string') { files = [assertions, ...files]; @@ -103,7 +103,7 @@ export default class SharedData>) => { + cleanupFiles: async (cleanup: Record) => { await Promise.all( Object.entries(cleanup).map(async ([version, files]) => { const stringFiles: string[] = []; diff --git a/generators/base/support/config.ts b/generators/base/support/config.ts index 0f2c837f0b5f..16dca432ae29 100644 --- a/generators/base/support/config.ts +++ b/generators/base/support/config.ts @@ -24,7 +24,7 @@ const filterNullishValues = value => value !== undefined && value !== null; * @param object * @returns */ -// eslint-disable-next-line import/prefer-default-export + export function removeFieldsWithNullishValues(object: Record): Record { return filterValue(object, filterNullishValues); } @@ -33,7 +33,7 @@ export function removeFieldsWithNullishValues(object: Record): Reco * @param object * @returns */ -// eslint-disable-next-line import/prefer-default-export, @typescript-eslint/no-explicit-any + function filterValue(object: Record, filterValue: (any) => boolean = filterNullishValues): Record { const clone = {}; for (const [key, value] of Object.entries(object)) { @@ -76,12 +76,10 @@ export const pickFields = (source: Record, fields: (string */ export const mutateData = ( context: Record, - ...mutations: Array< - Record & { - /** Set to false if you don't want functions to override the value */ - __override__?: boolean; - } - > + ...mutations: (Record & { + /** Set to false if you don't want functions to override the value */ + __override__?: boolean; + })[] ) => { for (const mutation of mutations) { const override = mutation.__override__; diff --git a/generators/base/support/configuration-helpers/options.js b/generators/base/support/configuration-helpers/options.js index e6917f1e0677..63576135cbf7 100644 --- a/generators/base/support/configuration-helpers/options.js +++ b/generators/base/support/configuration-helpers/options.js @@ -21,5 +21,4 @@ const isReproducible = generator => { return generator.options.reproducible; }; -// eslint-disable-next-line import/prefer-default-export export { isReproducible }; diff --git a/generators/base/support/contents.ts b/generators/base/support/contents.ts index 01dc16db2a8c..063e2d25481b 100644 --- a/generators/base/support/contents.ts +++ b/generators/base/support/contents.ts @@ -23,7 +23,7 @@ * @param lineEnding * @returns normalized line ending string */ -// eslint-disable-next-line import/prefer-default-export + export function normalizeLineEndings(str: string, lineEnding: string): string { return str.replace(/\r\n|\r|\n/g, lineEnding); } @@ -35,7 +35,7 @@ export function normalizeLineEndings(str: string, lineEnding: string): string { * * @param {string} content - the string to process */ -// eslint-disable-next-line import/prefer-default-export + export const stripMargin = content => { return content.replace(/^[ ]*\|/gm, ''); }; diff --git a/generators/base/support/faker.ts b/generators/base/support/faker.ts index 33b49ce7cae4..acfa74314447 100644 --- a/generators/base/support/faker.ts +++ b/generators/base/support/faker.ts @@ -1,4 +1,3 @@ -/* eslint-disable max-classes-per-file */ /** * Copyright 2013-2024 the original author or authors from the JHipster project. * @@ -50,7 +49,7 @@ class FakerWithRandexp extends Faker { * @param nativeLanguage - native language * @returns Faker instance */ -// eslint-disable-next-line import/prefer-default-export + export async function createFaker(nativeLanguage = 'en') { nativeLanguage = languageToJavaLanguage(nativeLanguage); let locale; @@ -58,11 +57,10 @@ export async function createFaker(nativeLanguage = 'en') { // We need a Faker instance for each entity, to build additional fake instances, use the locale from the exported localized faker instance. // See https://github.com/faker-js/faker/pull/642 try { - // eslint-disable-next-line import/no-dynamic-require, quotes locale = (await import(`@faker-js/faker`))[nativeLanguage]; } catch (error) { // Faker not implemented for the native language, fallback to en. - // eslint-disable-next-line import/no-unresolved, import/no-dynamic-require + locale = (await import('@faker-js/faker')).en; } diff --git a/generators/base/support/jhipster7-context.js b/generators/base/support/jhipster7-context.js index 971ace70b13a..524c6597f797 100644 --- a/generators/base/support/jhipster7-context.js +++ b/generators/base/support/jhipster7-context.js @@ -23,7 +23,7 @@ export const jhipster7deprecatedProperties = { get: ({ data }) => { if (data.devDatabaseType === undefined) return data.devDatabaseType; const fallbackValue = data.prodDatabaseType ?? data.databaseType; - // eslint-disable-next-line no-console + console.log( `JHipster v8 behavior change(devDatabaseType is only used in jhipster:spring-data-relational generator): devDatabaseType is not set, using fallback: ${fallbackValue}`, ); @@ -35,7 +35,7 @@ export const jhipster7deprecatedProperties = { get: ({ data }) => data.prodDatabaseType ?? data.databaseType, get: ({ data }) => { if (data.prodDatabaseType === undefined) return data.prodDatabaseType; - // eslint-disable-next-line no-console + console.log( `JHipster v8 behavior change(prodDatabaseType is only used in jhipster:spring-data-relational generator): devDatabaseType is not set, using fallback: ${data.databaseType}`, ); diff --git a/generators/base/support/namespace.ts b/generators/base/support/namespace.ts index 94017a229cf5..bbbf537a0455 100644 --- a/generators/base/support/namespace.ts +++ b/generators/base/support/namespace.ts @@ -21,7 +21,7 @@ * @param {string} packageName - name of the blueprint's package name * @returns {string} namespace of the blueprint */ -// eslint-disable-next-line import/prefer-default-export + export function packageNameToNamespace(packageName) { return packageName.replace('generator-', ''); } diff --git a/generators/base/support/path.ts b/generators/base/support/path.ts index d72a6ac2de5a..4a32a59c9d5b 100644 --- a/generators/base/support/path.ts +++ b/generators/base/support/path.ts @@ -16,5 +16,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// eslint-disable-next-line import/prefer-default-export + export const normalizePathEnd = (directory: string): string => (directory.endsWith('/') ? directory : `${directory}/`); diff --git a/generators/base/support/string.ts b/generators/base/support/string.ts index 7dccee20c993..b0a0ab5711b3 100644 --- a/generators/base/support/string.ts +++ b/generators/base/support/string.ts @@ -29,8 +29,8 @@ export function stringHashCode(str: string): number { for (let i = 0; i < str.length; i++) { const character = str.charCodeAt(i); - hash = (hash << 5) - hash + character; // eslint-disable-line no-bitwise - hash |= 0; // eslint-disable-line no-bitwise + hash = (hash << 5) - hash + character; + hash |= 0; } if (hash < 0) { diff --git a/generators/base/support/timestamp.spec.ts b/generators/base/support/timestamp.spec.ts index 50bba295239c..304e9363abec 100644 --- a/generators/base/support/timestamp.spec.ts +++ b/generators/base/support/timestamp.spec.ts @@ -23,13 +23,11 @@ describe('generator - base - support - timestamp', () => { describe('::parseChangelog', () => { describe('when not passing parameters', () => { it('throws', () => { - // eslint-disable-next-line @typescript-eslint/no-explicit-any expect(() => parseChangelog(undefined as any)).toThrow(/^changelogDate is required\.$/); }); }); describe('when passing a number', () => { it('throws', () => { - // eslint-disable-next-line @typescript-eslint/no-explicit-any expect(() => parseChangelog(123)).toThrow(/^changelogDate 123 must be a string\.$/); }); }); diff --git a/generators/base/support/write-files.spec.ts b/generators/base/support/write-files.spec.ts index 415fa2036c73..5d837b7a6781 100644 --- a/generators/base/support/write-files.spec.ts +++ b/generators/base/support/write-files.spec.ts @@ -32,7 +32,7 @@ describe('generator - base - support - writeFiles', () => { it('with a callback, should return the callback return', () => { const mock = esmocha.fn().mockReturnValue('return1'); - // eslint-disable-next-line @typescript-eslint/no-explicit-any + const callback = joinCallbacks(mock as EditFileCallback); expect(callback('original', 'file')).toBe('return1'); @@ -44,7 +44,7 @@ describe('generator - base - support - writeFiles', () => { it('with two callbacks, should forward last callback and return the last callback return', () => { const mock1 = esmocha.fn().mockReturnValue('return1'); const mock2 = esmocha.fn().mockReturnValue('return2'); - // eslint-disable-next-line @typescript-eslint/no-explicit-any + const callback = joinCallbacks(mock1 as EditFileCallback, mock2 as EditFileCallback); expect(callback('original', 'file')).toBe('return2'); diff --git a/generators/base/support/write-files.ts b/generators/base/support/write-files.ts index eb6c95edf5de..b91da3b6a7a2 100644 --- a/generators/base/support/write-files.ts +++ b/generators/base/support/write-files.ts @@ -27,7 +27,7 @@ const isWin32 = platform() === 'win32'; * TODO move to utils when converted to typescripts * Converts multiples EditFileCallback callbacks into one. */ -// eslint-disable-next-line import/prefer-default-export + export function joinCallbacks(...callbacks: EditFileCallback[]): EditFileCallback { return function (this: Generator, content: string, filePath: string) { if (isWin32 && content.match(/\r\n/)) { diff --git a/generators/base/types.d.ts b/generators/base/types.d.ts index 2986feb6bb66..26356cdd3f38 100644 --- a/generators/base/types.d.ts +++ b/generators/base/types.d.ts @@ -13,12 +13,12 @@ export type Control = { reproducibleLiquibaseTimestamp?: Date; filterEntitiesForClient?: (entity: Entity[]) => Entity[]; filterEntitiesAndPropertiesForClient?: (entity: Entity[]) => Entity[]; - customizeRemoveFiles: Array<(file: string) => string | undefined>; + customizeRemoveFiles: ((file: string) => string | undefined)[]; removeFiles: (options: { removedInVersion: string } | string, ...files: string[]) => Promise; /** * Cleanup files conditionally based on version and condition. * @example * cleanupFiles({ '6.0.0': ['file1', 'file2', [application.shouldRemove, 'file3']] }) */ - cleanupFiles: (cleanup: Record>) => Promise; + cleanupFiles: (cleanup: Record) => Promise; }; diff --git a/generators/bootstrap-application-base/generator.ts b/generators/bootstrap-application-base/generator.ts index 6cd88471e850..062dcd37edae 100644 --- a/generators/bootstrap-application-base/generator.ts +++ b/generators/bootstrap-application-base/generator.ts @@ -275,7 +275,7 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator { } const customUserData: any = customUser?.entityStorage.getAll() ?? {}; - Object.assign(bootstrap!, createUserEntity.call(this, { ...customUserData, ...customUserData.annotations }, application)); + Object.assign(bootstrap, createUserEntity.call(this, { ...customUserData, ...customUserData.annotations }, application)); application.user = bootstrap; } }, @@ -290,7 +290,7 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator { const customUserManagementData: any = customUserManagement?.entityStorage.getAll() ?? {}; Object.assign( - bootstrap!, + bootstrap, createUserManagementEntity.call(this, { ...customUserManagementData, ...customUserManagementData.annotations }, application), ); application.userManagement = bootstrap; @@ -307,10 +307,7 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator { } const customEntityData: any = customEntity?.entityStorage.getAll() ?? {}; - Object.assign( - bootstrap!, - createAuthorityEntity.call(this, { ...customEntityData, ...customEntityData.annotations }, application), - ); + Object.assign(bootstrap, createAuthorityEntity.call(this, { ...customEntityData, ...customEntityData.annotations }, application)); application.authority = bootstrap; } }, diff --git a/generators/bootstrap-application-base/support/export-jdl-transform.ts b/generators/bootstrap-application-base/support/export-jdl-transform.ts index a1a03f72f0be..ffc567350f17 100644 --- a/generators/bootstrap-application-base/support/export-jdl-transform.ts +++ b/generators/bootstrap-application-base/support/export-jdl-transform.ts @@ -23,7 +23,7 @@ export const exportJDLTransform = ({ const yoRcFilePath = join(destinationPath, '.yo-rc.json'); const entitiesMatcher = new Minimatch(`${destinationPath}/.jhipster/*.json`); const entitiesFiles: MemFsEditorFile[] = []; - const entitiesMap: Map = new Map(); + const entitiesMap = new Map(); let yoRcFileInMemory: MemFsEditorFile | undefined; let jdlStoreFileInMemory: MemFsEditorFile | undefined; diff --git a/generators/bootstrap-application-base/support/import-jdl-transform.ts b/generators/bootstrap-application-base/support/import-jdl-transform.ts index 1a93b475934d..5fd3a1b05971 100644 --- a/generators/bootstrap-application-base/support/import-jdl-transform.ts +++ b/generators/bootstrap-application-base/support/import-jdl-transform.ts @@ -13,7 +13,7 @@ export const importJDLTransform = ({ destinationPath, jdlStorePath }: { destinat const yoRcFilePath = join(destinationPath, '.yo-rc.json'); const entitiesFolder = join(destinationPath, '.jhipster'); const entitiesMatcher = new Minimatch(`${entitiesFolder}/*.json`); - const entityFields: Array = []; + const entityFields: MemFsEditorFile[] = []; let jdlStoreFileInMemory: MemFsEditorFile | undefined; let yoRcFileInMemory: MemFsEditorFile | undefined; diff --git a/generators/bootstrap-application-base/utils.js b/generators/bootstrap-application-base/utils.js index 51c0287b4a90..1a1617b23d2c 100644 --- a/generators/bootstrap-application-base/utils.js +++ b/generators/bootstrap-application-base/utils.js @@ -70,7 +70,6 @@ export const auditableEntityFields = () => [ const authorityEntityName = 'Authority'; -// eslint-disable-next-line import/prefer-default-export export function createUserEntity(customUserData = {}, application) { const userEntityDefinition = this.getEntityConfig('User')?.getAll(); if (userEntityDefinition) { diff --git a/generators/bootstrap/generator.ts b/generators/bootstrap/generator.ts index fc8a8699df90..be5b84b6a41e 100644 --- a/generators/bootstrap/generator.ts +++ b/generators/bootstrap/generator.ts @@ -192,14 +192,14 @@ export default class BootstrapGenerator extends BaseGenerator { */ async commitSharedFs( { log, ...options }: PipelineOptions & { log?: string } = {}, - ...transforms: Array> + ...transforms: FileTransform[] ) { - const skipYoResolveTransforms: Array> = []; + const skipYoResolveTransforms: FileTransform[] = []; if (!this.options.skipYoResolve) { skipYoResolveTransforms.push(createYoResolveTransform()); } - const prettierTransforms: Array> = []; + const prettierTransforms: FileTransform[] = []; if (!this.skipPrettier) { const ignoreErrors = this.options.ignoreErrors || this.upgradeCommand; prettierTransforms.push( @@ -215,7 +215,7 @@ export default class BootstrapGenerator extends BaseGenerator { ); } - const autoCrlfTransforms: Array> = []; + const autoCrlfTransforms: FileTransform[] = []; if (this.jhipsterConfig.autoCrlf) { autoCrlfTransforms.push(await autoCrlfTransform({ baseDir: this.destinationPath() })); } diff --git a/generators/bootstrap/support/eslint-transform.ts b/generators/bootstrap/support/eslint-transform.ts index 93a38b3c67ff..9a85a41a1c7c 100644 --- a/generators/bootstrap/support/eslint-transform.ts +++ b/generators/bootstrap/support/eslint-transform.ts @@ -24,7 +24,6 @@ import { Piscina } from 'piscina'; import BaseGenerator from '../../base-core/index.js'; import { addLineNumbers } from '../internal/transform-utils.js'; -// eslint-disable-next-line import/prefer-default-export export const createESLintTransform = function ( this: BaseGenerator | void, transformOptions: { ignoreErrors?: boolean; extensions?: string; cwd?: string } = {}, diff --git a/generators/bootstrap/support/java-unused-imports-transform.ts b/generators/bootstrap/support/java-unused-imports-transform.ts index 4a11750c2fa9..1ad35266aea8 100644 --- a/generators/bootstrap/support/java-unused-imports-transform.ts +++ b/generators/bootstrap/support/java-unused-imports-transform.ts @@ -7,7 +7,6 @@ import { Piscina } from 'piscina'; import type CoreGenerator from '../../base-core/index.js'; import { addLineNumbers } from '../internal/transform-utils.js'; -// eslint-disable-next-line import/prefer-default-export export const createRemoveUnusedImportsTransform = function ( this: CoreGenerator, options: { diff --git a/generators/bootstrap/support/multi-step-transform/index.ts b/generators/bootstrap/support/multi-step-transform/index.ts index 49407e65b2bd..5c4b7b1751e1 100644 --- a/generators/bootstrap/support/multi-step-transform/index.ts +++ b/generators/bootstrap/support/multi-step-transform/index.ts @@ -21,10 +21,9 @@ import type { MemFsEditorFile } from 'mem-fs-editor'; import TemplateFileFs from './template-file-fs.js'; import TemplateFile from './template-file.js'; -// eslint-disable-next-line import/prefer-default-export export const createMultiStepTransform = () => { const templateFileFs = new TemplateFileFs({}); - const templateFiles: Array = []; + const templateFiles: TemplateFile[] = []; const duplex: DuplexWithDebug & { templateFileFs: TemplateFileFs } = transform( (file: MemFsEditorFile) => { diff --git a/generators/bootstrap/support/multi-step-transform/template-file-fs.ts b/generators/bootstrap/support/multi-step-transform/template-file-fs.ts index 39e9809dbade..bb369c4930ef 100644 --- a/generators/bootstrap/support/multi-step-transform/template-file-fs.ts +++ b/generators/bootstrap/support/multi-step-transform/template-file-fs.ts @@ -25,7 +25,7 @@ import TemplateFile from './template-file.js'; export default class TemplateFileFs { fragmentFiles: Record; - rootFiles: Array = []; + rootFiles: MemFsEditorFile[] = []; extension: string; delimiter: string; diff --git a/generators/ci-cd/generator.js b/generators/ci-cd/generator.js index b726a9ea7d13..d92463701706 100644 --- a/generators/ci-cd/generator.js +++ b/generators/ci-cd/generator.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable consistent-return */ + import chalk from 'chalk'; import BaseApplicationGenerator from '../base-application/index.js'; diff --git a/generators/client/generator-needles.spec.ts b/generators/client/generator-needles.spec.ts index d611620abb2c..5a942476496e 100644 --- a/generators/client/generator-needles.spec.ts +++ b/generators/client/generator-needles.spec.ts @@ -6,7 +6,6 @@ import ClientGenerator from './index.js'; const { ANGULAR, REACT } = clientFrameworkTypes; -// eslint-disable-next-line @typescript-eslint/no-explicit-any const mockBlueprintSubGen: any = class extends ClientGenerator { constructor(args, opts, features) { super(args, opts, { ...features, sbsBlueprint: true }); @@ -15,7 +14,7 @@ const mockBlueprintSubGen: any = class extends ClientGenerator { get [ClientGenerator.POST_WRITING]() { return this.asPostWritingTaskGroup({ webpackPhase({ source }) { - source!.addWebpackConfig!({ config: '{devServer:{}}' }); + source.addWebpackConfig!({ config: '{devServer:{}}' }); }, }); } diff --git a/generators/client/needle-client.spec.ts b/generators/client/needle-client.spec.ts index a5cb07295786..0c89ff173d4d 100644 --- a/generators/client/needle-client.spec.ts +++ b/generators/client/needle-client.spec.ts @@ -3,7 +3,6 @@ import ClientGenerator from '../../generators/client/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; import { dryRunHelpers as helpers, result as runResult, getGenerator } from '../../testing/index.js'; -// eslint-disable-next-line @typescript-eslint/no-explicit-any const mockBlueprintSubGen: any = class extends ClientGenerator { constructor(args, opts, features) { super(args, opts, features); @@ -19,7 +18,7 @@ const mockBlueprintSubGen: any = class extends ClientGenerator { return this.asPostWritingTaskGroup({ // @ts-ignore async additionalResource({ source }) { - source!.addExternalResourceToRoot!({ + source.addExternalResourceToRoot!({ resource: '', comment: 'Comment added by JHipster API', }); diff --git a/generators/client/support/config.ts b/generators/client/support/config.ts index f219cd2c8fe3..e4009a135c0d 100644 --- a/generators/client/support/config.ts +++ b/generators/client/support/config.ts @@ -5,34 +5,34 @@ import { CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR } from '../../generator-consta * Load client configs into application. */ export const loadClientConfig = ({ config, application }: { config: any; application: any }) => { - (application as any).clientPackageManager = config.clientPackageManager; + application.clientPackageManager = config.clientPackageManager; application.clientFramework = config.clientFramework; - (application as any).clientTheme = config.clientTheme; - (application as any).clientThemeVariant = config.clientThemeVariant; - (application as any).devServerPort = config.devServerPort; + application.clientTheme = config.clientTheme; + application.clientThemeVariant = config.clientThemeVariant; + application.devServerPort = config.devServerPort; - (application as any).clientRootDir = config.clientRootDir ?? ''; - (application as any).clientSrcDir = config.clientSrcDir ?? `${application.clientRootDir}${CLIENT_MAIN_SRC_DIR}`; - (application as any).clientTestDir = config.clientTestDir ?? `${application.clientRootDir}${CLIENT_TEST_SRC_DIR}`; + application.clientRootDir = config.clientRootDir ?? ''; + application.clientSrcDir = config.clientSrcDir ?? `${application.clientRootDir}${CLIENT_MAIN_SRC_DIR}`; + application.clientTestDir = config.clientTestDir ?? `${application.clientRootDir}${CLIENT_TEST_SRC_DIR}`; }; /** * Load client derived properties. */ export const loadDerivedClientConfig = ({ application }: { application: any }) => { - if ((application as any).microfrontend === undefined) { - if ((application as any).applicationTypeMicroservice) { - (application as any).microfrontend = application.clientFrameworkAny; - } else if ((application as any).applicationTypeGateway) { - (application as any).microfrontend = (application as any).microfrontends && (application as any).microfrontends.length > 0; + if (application.microfrontend === undefined) { + if (application.applicationTypeMicroservice) { + application.microfrontend = application.clientFrameworkAny; + } else if (application.applicationTypeGateway) { + application.microfrontend = application.microfrontends && application.microfrontends.length > 0; } } - (application as any).clientThemeNone = (application as any).clientTheme === 'none'; - (application as any).clientThemePrimary = (application as any).clientThemeVariant === 'primary'; - (application as any).clientThemeLight = (application as any).clientThemeVariant === 'light'; - (application as any).clientThemeDark = (application as any).clientThemeVariant === 'dark'; + application.clientThemeNone = application.clientTheme === 'none'; + application.clientThemePrimary = application.clientThemeVariant === 'primary'; + application.clientThemeLight = application.clientThemeVariant === 'light'; + application.clientThemeDark = application.clientThemeVariant === 'dark'; - if ((application as any).baseName) { - (application as any).frontendAppName = getFrontendAppName({ baseName: (application as any).baseName }); + if (application.baseName) { + application.frontendAppName = getFrontendAppName({ baseName: application.baseName }); } }; diff --git a/generators/client/support/update-languages.ts b/generators/client/support/update-languages.ts index 0a8b89de2a57..f7584c148be1 100644 --- a/generators/client/support/update-languages.ts +++ b/generators/client/support/update-languages.ts @@ -28,7 +28,7 @@ export type UpdateClientLanguagesTaskParam = { application: CommonClientServerAp * @param configurationFile * @param commonjs */ -// eslint-disable-next-line import/prefer-default-export + export function updateLanguagesInDayjsConfigurationTask( this: BaseGenerator, { application, control = {} }: UpdateClientLanguagesTaskParam, diff --git a/generators/common/generator.js b/generators/common/generator.js index 32282865fb36..6870df0fe179 100644 --- a/generators/common/generator.js +++ b/generators/common/generator.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable consistent-return */ + import { isFileStateModified } from 'mem-fs-editor/state'; import BaseApplicationGenerator from '../base-application/index.js'; diff --git a/generators/cypress/generator.ts b/generators/cypress/generator.ts index 11f5b32e071c..87d2fa1b3456 100644 --- a/generators/cypress/generator.ts +++ b/generators/cypress/generator.ts @@ -213,9 +213,7 @@ export default class CypressGenerator extends BaseApplicationGenerator { scripts: { 'cypress:audits': 'cypress open --e2e --config-file cypress-audits.config.js', 'e2e:cypress:audits:headless': 'npm run e2e:cypress -- --config-file cypress-audits.config.js', - 'e2e:cypress:audits': - // eslint-disable-next-line no-template-curly-in-string - 'cypress run --e2e --browser chrome --config-file cypress-audits.config.js', + 'e2e:cypress:audits': 'cypress run --e2e --browser chrome --config-file cypress-audits.config.js', }, }); }, diff --git a/generators/docker-compose/files.js b/generators/docker-compose/files.js index 1c2bfaa04102..132aa08000e1 100644 --- a/generators/docker-compose/files.js +++ b/generators/docker-compose/files.js @@ -22,7 +22,6 @@ const { PROMETHEUS } = monitoringTypes; const { MICROSERVICE } = applicationTypes; const { OAUTH2 } = authenticationTypes; -// eslint-disable-next-line import/prefer-default-export export function writeFiles() { return { cleanup() { diff --git a/generators/docker-compose/generator.js b/generators/docker-compose/generator.js index 17bf0692b875..a214616051ac 100644 --- a/generators/docker-compose/generator.js +++ b/generators/docker-compose/generator.js @@ -38,7 +38,6 @@ const { PROMETHEUS, NO: NO_MONITORING } = monitoringTypes; const { CONSUL, EUREKA, NO: NO_SERVICE_DISCOVERY } = serviceDiscoveryTypes; const { Options: DeploymentOptions } = deploymentOptions; -/* eslint-disable consistent-return */ /** * @class * @extends {import('../base/index.js')} diff --git a/generators/docker/files.js b/generators/docker/files.js index ba00e1ef0b48..3abff2b75785 100644 --- a/generators/docker/files.js +++ b/generators/docker/files.js @@ -2,7 +2,6 @@ import { TEMPLATES_DOCKER_DIR } from '../generator-constants.js'; const renameTo = (ctx, filepath) => `${ctx.dockerServicesDir}${filepath}`.replace('/_eureka_', '').replace('/_consul_', ''); -// eslint-disable-next-line import/prefer-default-export export const dockerFiles = { commonFiles: [ { diff --git a/generators/docker/generator.js b/generators/docker/generator.js index 08daf0989f29..e3db19b46686 100644 --- a/generators/docker/generator.js +++ b/generators/docker/generator.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable camelcase */ + import { intersection } from 'lodash-es'; import BaseApplicationGenerator from '../base-application/index.js'; import { createDockerComposeFile, createDockerExtendedServices } from '../docker/support/index.js'; diff --git a/generators/docker/generator.spec.ts b/generators/docker/generator.spec.ts index 0912712d9768..1fae3f0666b8 100644 --- a/generators/docker/generator.spec.ts +++ b/generators/docker/generator.spec.ts @@ -56,7 +56,6 @@ matrix = extendMatrix(matrix, { prodDatabaseType: [POSTGRESQL, MARIADB, MYSQL, MSSQL, ORACLE, ...NO_SQL], }); -// eslint-disable-next-line @typescript-eslint/no-unused-vars Object.entries(matrix).forEach(([_name, config]) => { if (NO_SQL.includes(config.prodDatabaseType)) { config.databaseType = config.prodDatabaseType; diff --git a/generators/entity/generator.js b/generators/entity/generator.js index 635695110db4..e600a6750ecd 100644 --- a/generators/entity/generator.js +++ b/generators/entity/generator.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable consistent-return */ + import fs from 'fs'; import path from 'path'; import chalk from 'chalk'; diff --git a/generators/entity/support/index.ts b/generators/entity/support/index.ts index 7fb102603143..2fed641c9877 100644 --- a/generators/entity/support/index.ts +++ b/generators/entity/support/index.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// eslint-disable-next-line import/prefer-default-export + export { isNumber as inputIsNumber, isSignedNumber as inputIsSignedNumber, diff --git a/generators/export-jdl/generator.ts b/generators/export-jdl/generator.ts index b324dbc0d2d9..1c3411f3792d 100644 --- a/generators/export-jdl/generator.ts +++ b/generators/export-jdl/generator.ts @@ -55,7 +55,6 @@ export default class extends BaseGenerator { this.jdlContent = jdlObject.toString(); } } catch (error: unknown) { - // eslint-disable-next-line @typescript-eslint/no-explicit-any throw new Error(`An error occurred while exporting to JDL: ${(error as any).message}\n${error}`, { cause: error }); } }, diff --git a/generators/git/files.js b/generators/git/files.js index 7464803c7f6d..9a00c7089aed 100644 --- a/generators/git/files.js +++ b/generators/git/files.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// eslint-disable-next-line import/prefer-default-export + export const files = { git: [ { diff --git a/generators/git/generator.ts b/generators/git/generator.ts index e3eed603b3ea..5995340df61c 100644 --- a/generators/git/generator.ts +++ b/generators/git/generator.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable consistent-return */ + import chalk from 'chalk'; import type { QueuedAdapter } from '@yeoman/types'; diff --git a/generators/gradle/generator.ts b/generators/gradle/generator.ts index 6e0e8eaafd1b..a178a7fbd46d 100644 --- a/generators/gradle/generator.ts +++ b/generators/gradle/generator.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable consistent-return */ + import assert from 'assert/strict'; import BaseApplicationGenerator from '../base-application/index.js'; diff --git a/generators/gradle/support/dependabot-gradle.ts b/generators/gradle/support/dependabot-gradle.ts index 6a2aafcfe25c..8be6b838fc75 100644 --- a/generators/gradle/support/dependabot-gradle.ts +++ b/generators/gradle/support/dependabot-gradle.ts @@ -24,7 +24,6 @@ type LibsToml = { plugins?: Record; }; -// eslint-disable-next-line import/prefer-default-export export function getGradleLibsVersionsProperties(libsVersionsContent: string): Record { const parsed = parse(libsVersionsContent) as LibsToml; return { diff --git a/generators/heroku/generator.js b/generators/heroku/generator.js index 1d3921feb6eb..d261799b0312 100644 --- a/generators/heroku/generator.js +++ b/generators/heroku/generator.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable consistent-return */ + import { kebabCase } from 'lodash-es'; import chalk from 'chalk'; import { glob } from 'glob'; diff --git a/generators/heroku/templates.js b/generators/heroku/templates.js index 4663ca893080..5fb22eb660c6 100644 --- a/generators/heroku/templates.js +++ b/generators/heroku/templates.js @@ -1,4 +1,3 @@ -// eslint-disable-next-line import/prefer-default-export export const mavenProfileContent = data => { return ` diff --git a/generators/java/generators/bootstrap/generator.ts b/generators/java/generators/bootstrap/generator.ts index 0e72cc6d8b41..ee1bdd67d682 100644 --- a/generators/java/generators/bootstrap/generator.ts +++ b/generators/java/generators/bootstrap/generator.ts @@ -125,8 +125,8 @@ export default class BootstrapGenerator extends BaseApplicationGenerator { const { srcMainJava } = application; if (this.packageInfoFile && srcMainJava) { - const mainPackageMatch = matchMainJavaFiles(srcMainJava!); - const root = this.destinationPath(srcMainJava!); + const mainPackageMatch = matchMainJavaFiles(srcMainJava); + const root = this.destinationPath(srcMainJava); this.queueTransformStream( { name: 'adding package-info.java files', diff --git a/generators/java/support/checks/check-java.spec.ts b/generators/java/support/checks/check-java.spec.ts index ec9874de81a0..0dd2b76ba5bd 100644 --- a/generators/java/support/checks/check-java.spec.ts +++ b/generators/java/support/checks/check-java.spec.ts @@ -31,7 +31,7 @@ describe('generator - server - checkJava', () => { let result; before(async () => { - execa.execaCommandSync.mockReturnValue({ ...baseResult, stderr } as any); + execa.execaCommandSync.mockReturnValue({ ...baseResult, stderr }); const { default: checkJava } = await import('./check-java.js'); result = checkJava([]); }); @@ -50,7 +50,7 @@ describe('generator - server - checkJava', () => { let result; before(async () => { - execa.execaCommandSync.mockReturnValue({ ...baseResult, exitCode, stderr } as any); + execa.execaCommandSync.mockReturnValue({ ...baseResult, exitCode, stderr }); const { default: checkJava } = await import('./check-java.js'); result = checkJava([]); }); diff --git a/generators/java/support/checks/index.ts b/generators/java/support/checks/index.ts index 32d9c4cbc8d3..54b65f4caa84 100644 --- a/generators/java/support/checks/index.ts +++ b/generators/java/support/checks/index.ts @@ -1,2 +1 @@ -// eslint-disable-next-line import/prefer-default-export export { default as checkJava } from './check-java.js'; diff --git a/generators/java/support/key-store.ts b/generators/java/support/key-store.ts index 71884d274ab4..2c5620ed4508 100644 --- a/generators/java/support/key-store.ts +++ b/generators/java/support/key-store.ts @@ -6,7 +6,7 @@ import { ValidationResult } from '../../base/api.js'; /** * Generate a KeyStore. */ -// eslint-disable-next-line import/prefer-default-export + export async function generateKeyStore(keyStoreFile: string, { packageName }: { packageName: string }): Promise { try { const stat = await lstat(keyStoreFile); diff --git a/generators/jdl/generator.ts b/generators/jdl/generator.ts index 14781b951b52..8208adfb9cd8 100644 --- a/generators/jdl/generator.ts +++ b/generators/jdl/generator.ts @@ -18,7 +18,6 @@ */ import { extname } from 'path'; import { readFile } from 'fs/promises'; -import { QueuedAdapter } from '@yeoman/adapter'; import { upperFirst } from 'lodash-es'; import { create as createMemFs, type Store as MemFs } from 'mem-fs'; import { create as createMemFsEditor, type MemFsEditor } from 'mem-fs-editor'; @@ -270,7 +269,7 @@ export default class JdlGenerator extends BaseGenerator { applications.map(async application => { const rootCwd = this.destinationPath(); const cwd = application.folder ? this.destinationPath(application.folder) : rootCwd; - const adapter = (this.env.adapter as QueuedAdapter).newAdapter(); + const adapter = this.env.adapter.newAdapter(); const envOptions: any = { cwd, logCwd: rootCwd, sharedFs: application.sharedFs, adapter }; const generatorOptions = { ...this.options, ...options, skipPriorities: ['prompting'] }; diff --git a/generators/kubernetes-helm/generator.js b/generators/kubernetes-helm/generator.js index 3fc4c6915b91..95b5ed4c6885 100644 --- a/generators/kubernetes-helm/generator.js +++ b/generators/kubernetes-helm/generator.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable consistent-return, import/no-named-as-default-member */ + import fs from 'fs'; import chalk from 'chalk'; diff --git a/generators/kubernetes-knative/files.js b/generators/kubernetes-knative/files.js index a3d0455a2cfa..c8e3da6c2a89 100644 --- a/generators/kubernetes-knative/files.js +++ b/generators/kubernetes-knative/files.js @@ -37,7 +37,6 @@ const { GeneratorTypes } = kubernetesPlatformTypes; const { K8S } = GeneratorTypes; -// eslint-disable-next-line import/prefer-default-export export function writeFiles() { const suffix = 'knative'; return { diff --git a/generators/kubernetes-knative/generator.js b/generators/kubernetes-knative/generator.js index 447344e0fd49..a81bbd92b22c 100644 --- a/generators/kubernetes-knative/generator.js +++ b/generators/kubernetes-knative/generator.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable consistent-return */ + import fs from 'fs'; import chalk from 'chalk'; diff --git a/generators/kubernetes/generator.js b/generators/kubernetes/generator.js index 3bc3ebf3b494..88d9e5d887ba 100644 --- a/generators/kubernetes/generator.js +++ b/generators/kubernetes/generator.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable consistent-return, import/no-named-as-default-member */ + import fs from 'fs'; import chalk from 'chalk'; diff --git a/generators/languages/files.js b/generators/languages/files.js index 573aa7528932..e7dfc3cea204 100644 --- a/generators/languages/files.js +++ b/generators/languages/files.js @@ -18,7 +18,6 @@ */ import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; -// eslint-disable-next-line import/prefer-default-export export const clientI18nFiles = { clientI18nFiles: [ { diff --git a/generators/languages/generator-needles.spec.ts b/generators/languages/generator-needles.spec.ts index f647f96ccb5e..ce54900da800 100644 --- a/generators/languages/generator-needles.spec.ts +++ b/generators/languages/generator-needles.spec.ts @@ -6,7 +6,6 @@ import LanguagesGenerator from './index.js'; const generatorPath = getGenerator('languages'); -// eslint-disable-next-line @typescript-eslint/no-explicit-any const mockBlueprintSubGen: any = class extends LanguagesGenerator { constructor(args, opts, features) { super(args, opts, features); diff --git a/generators/languages/generator.js b/generators/languages/generator.js index 55f0e9870ada..ae78b4dfd68f 100644 --- a/generators/languages/generator.js +++ b/generators/languages/generator.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable consistent-return */ + import chalk from 'chalk'; import { padEnd, startCase } from 'lodash-es'; diff --git a/generators/languages/support/detect-language.ts b/generators/languages/support/detect-language.ts index 152a129741e3..83b642f47841 100644 --- a/generators/languages/support/detect-language.ts +++ b/generators/languages/support/detect-language.ts @@ -20,7 +20,7 @@ import { osLocaleSync } from 'os-locale'; import { findLanguageForTag, Language, supportedLanguages } from './languages.js'; -const detectLanguage = (languages: ReadonlyArray = supportedLanguages) => { +const detectLanguage = (languages: readonly Language[] = supportedLanguages) => { const locale = osLocaleSync(); if (locale) { const language = findLanguageForTag(locale.toLowerCase(), languages) ?? findLanguageForTag(locale.split('-')[0], languages); diff --git a/generators/languages/support/languages.ts b/generators/languages/support/languages.ts index 1a374139048b..6cfe9afeb750 100644 --- a/generators/languages/support/languages.ts +++ b/generators/languages/support/languages.ts @@ -263,7 +263,7 @@ const partialLanguages: PartialLanguage[] = [ }, ]; -export const supportedLanguages: ReadonlyArray = partialLanguages.map(language => ({ +export const supportedLanguages: readonly Language[] = partialLanguages.map(language => ({ rtl: false, javaLocaleMessageSourceSuffix: languageToJavaLanguage(language.languageTag), angularLocale: languageToAngularLanguage(language.languageTag), @@ -272,7 +272,7 @@ export const supportedLanguages: ReadonlyArray = partialLanguages.map( ...language, })); -export const findLanguageForTag = (languageTag: string, languages: ReadonlyArray = supportedLanguages): Language | undefined => +export const findLanguageForTag = (languageTag: string, languages: readonly Language[] = supportedLanguages): Language | undefined => languages.find(lang => lang.languageTag === languageTag); export const defaultLanguage = findLanguageForTag('en') as Required; @@ -281,7 +281,7 @@ export const defaultLanguage = findLanguageForTag('en') as Required; * Generate language objects in array of "'en': { name: 'English' }" format * @param languages */ -export const generateLanguagesWebappOptions = (languages: ReadonlyArray) => +export const generateLanguagesWebappOptions = (languages: readonly Language[]) => languages.map(language => `'${language.languageTag}': { name: '${language.displayName}'${language.rtl ? ', rtl: true' : ''} }`); type LanguageIdParts = { language: string; script?: string; country?: string; variant?: string }; @@ -325,6 +325,6 @@ function buildLanguageTag(parts: LanguageIdParts): string { return languageTag; } -export function languagesAsChoices(languages: ReadonlyArray = supportedLanguages) { +export function languagesAsChoices(languages: readonly Language[] = supportedLanguages) { return languages.map(language => ({ value: language.languageTag, name: language.name })); } diff --git a/generators/languages/support/translate.ts b/generators/languages/support/translate.ts index fe5050a7740b..fda457bb9ea1 100644 --- a/generators/languages/support/translate.ts +++ b/generators/languages/support/translate.ts @@ -90,7 +90,7 @@ export const replaceTranslationKeysWithText = ( } else if (stringify) { replacement = JSON.stringify(replacement); } - body = `${body.slice(0, match.index!)}${replacement}${body.slice(match.index! + target.length)}`; + body = `${body.slice(0, match.index)}${replacement}${body.slice(match.index + target.length)}`; } return body; }; @@ -144,7 +144,7 @@ export const replaceTranslateContents = (body: string, filePath: string, regexp: } } - body = `${body.slice(0, match.index!)}${converter({ filePath, key, interpolate, parsedInterpolate, type, prefix, suffix })}${body.slice(match.index! + target.length)}`; + body = `${body.slice(0, match.index)}${converter({ filePath, key, interpolate, parsedInterpolate, type, prefix, suffix })}${body.slice(match.index + target.length)}`; } return body; }; diff --git a/generators/languages/types.d.ts b/generators/languages/types.d.ts index 67ffc730bc23..b8820981ff91 100644 --- a/generators/languages/types.d.ts +++ b/generators/languages/types.d.ts @@ -29,6 +29,6 @@ export type I18nApplication = { | { enableTranslation: true; languages: string[]; - languagesDefinition: ReadonlyArray; + languagesDefinition: readonly Language[]; } ); diff --git a/generators/liquibase/files.ts b/generators/liquibase/files.ts index 814594e158b2..a4e44e13e455 100644 --- a/generators/liquibase/files.ts +++ b/generators/liquibase/files.ts @@ -22,7 +22,6 @@ import { moveToJavaPackageSrcDir } from '../server/support/index.js'; import { CommonClientServerApplication } from '../base-application/types.js'; import type LiquibaseGenerator from './generator.js'; -// eslint-disable-next-line import/prefer-default-export export const liquibaseFiles: WriteFileSection = { liquibase: [ { diff --git a/generators/liquibase/generator.ts b/generators/liquibase/generator.ts index d32b214ccdb0..5031644822cd 100644 --- a/generators/liquibase/generator.ts +++ b/generators/liquibase/generator.ts @@ -200,7 +200,7 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator { this.options.entities ?? entities.filter(entity => !entity.builtIn && !entity.skipServer).map(entity => entity.name); // Write only specified entities changelogs. const changes = entityChanges.filter( - databaseChangelog => entitiesToWrite!.length === 0 || entitiesToWrite!.includes(databaseChangelog.entityName), + databaseChangelog => entitiesToWrite.length === 0 || entitiesToWrite.includes(databaseChangelog.entityName), ); for (const databaseChangelog of changes) { @@ -697,7 +697,6 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator { return undefined; } - // eslint-disable-next-line no-nested-ternary const entityChanges = databaseChangelog.changelogData; entityChanges.skipFakeData = application.skipFakeData || entity.skipFakeData; diff --git a/generators/maven/generator.ts b/generators/maven/generator.ts index 4e5d58bb5f87..2f1ed46293bd 100644 --- a/generators/maven/generator.ts +++ b/generators/maven/generator.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable consistent-return */ + import assert from 'node:assert/strict'; import { passthrough } from '@yeoman/transform'; import { isFileStateModified } from 'mem-fs-editor/state'; @@ -98,7 +98,7 @@ export default class MavenGenerator extends BaseApplicationGenerator { properties = Array.isArray(properties) ? properties : [properties]; for (const property of properties) { - javaProperties![property.property] = property.value!; + javaProperties[property.property] = property.value!; this.pomStorage.addProperty(property); } }; diff --git a/generators/project-name/generator.js b/generators/project-name/generator.js index 9035149bf2fd..0a5f84318f4c 100644 --- a/generators/project-name/generator.js +++ b/generators/project-name/generator.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable consistent-return */ + import { defaults, kebabCase, upperFirst, camelCase, startCase } from 'lodash-es'; import BaseApplicationGenerator from '../base-application/index.js'; diff --git a/generators/project-name/support/index.ts b/generators/project-name/support/index.ts index 3e03e5cd6d03..92495851ff5a 100644 --- a/generators/project-name/support/index.ts +++ b/generators/project-name/support/index.ts @@ -17,5 +17,4 @@ * limitations under the License. */ -// eslint-disable-next-line import/prefer-default-export export { default as getDefaultAppName } from './name-resolver.js'; diff --git a/generators/react/application/entities/index.ts b/generators/react/application/entities/index.ts index 078e35eeeb4b..914752ebf222 100644 --- a/generators/react/application/entities/index.ts +++ b/generators/react/application/entities/index.ts @@ -1,4 +1,3 @@ -// eslint-disable-next-line import/prefer-default-export export function prepareEntity({ entity, application }) { entity.entityReactState = application.applicationTypeMonolith ? entity.entityInstance diff --git a/generators/server/__test-support/index.ts b/generators/server/__test-support/index.ts index 7f45d20c380c..5e96ed8c93b3 100644 --- a/generators/server/__test-support/index.ts +++ b/generators/server/__test-support/index.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ import assert from 'assert'; import { messageBrokerTypes, databaseTypes } from '../../../jdl/jhipster/index.js'; diff --git a/generators/server/generator.js b/generators/server/generator.js index 14bb8e7aa412..6a0e55bcb89b 100644 --- a/generators/server/generator.js +++ b/generators/server/generator.js @@ -1,4 +1,3 @@ -/* eslint-disable camelcase */ /** * Copyright 2013-2024 the original author or authors from the JHipster project. * @@ -18,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable consistent-return */ import { existsSync } from 'fs'; import chalk from 'chalk'; diff --git a/generators/server/support/relationship.ts b/generators/server/support/relationship.ts index 0641e2734b1c..a8ca37f610a8 100644 --- a/generators/server/support/relationship.ts +++ b/generators/server/support/relationship.ts @@ -24,7 +24,6 @@ import { databaseTypes } from '../../../jdl/index.js'; const { NO: NO_DATABASE, SQL, NEO4J } = databaseTypes; -// eslint-disable-next-line import/prefer-default-export export const addEntitiesOtherRelationships = (entities: JSONEntity[]): ValidationResult => { const result: { warning: string[] } = { warning: [] }; for (const entity of entities.filter(entity => !entity.builtIn)) { diff --git a/generators/server/support/spring-factories.ts b/generators/server/support/spring-factories.ts index 438d6df0ce94..0213fd914dd1 100644 --- a/generators/server/support/spring-factories.ts +++ b/generators/server/support/spring-factories.ts @@ -1,6 +1,5 @@ import properties from 'dot-properties'; -// eslint-disable-next-line import/prefer-default-export export const addSpringFactory = ({ key, value }) => content => { diff --git a/generators/server/support/string.ts b/generators/server/support/string.ts index e958d8870c01..919ddc5a4384 100644 --- a/generators/server/support/string.ts +++ b/generators/server/support/string.ts @@ -24,7 +24,7 @@ * @see org.springframework.boot.orm.jpa.hibernate.SpringNamingStrategy * @returns hibernate SnakeCase in JHipster preferred style */ -// eslint-disable-next-line import/prefer-default-export + export function hibernateSnakeCase(value: string): string { let res = ''; if (value) { diff --git a/generators/spring-boot/entity-cleanup.js b/generators/spring-boot/entity-cleanup.js index dd84fb505d01..07ee7cf74433 100644 --- a/generators/spring-boot/entity-cleanup.js +++ b/generators/spring-boot/entity-cleanup.js @@ -24,7 +24,7 @@ * @param {Object} application * @param {Object} entity */ -// eslint-disable-next-line import/prefer-default-export + export function cleanupOldFiles({ application: { packageFolder, srcMainJava, srcTestJava, searchEngineElasticsearch }, entity: { entityClass, entityAbsoluteFolder }, diff --git a/generators/spring-cache/generator.ts b/generators/spring-cache/generator.ts index bd6a8a48e9b5..a73336bc5f3b 100644 --- a/generators/spring-cache/generator.ts +++ b/generators/spring-cache/generator.ts @@ -141,10 +141,10 @@ export default class SpringCacheGenerator extends BaseApplicationGenerator { const versions: JavaDependencyVersion[] = []; const definition = getCacheProviderMavenDefinition(cacheProvider, javaDependencies); versions.push(...(definition.base.versions ?? [])); - dependencies.push(...definition.base.dependencies!); + dependencies.push(...definition.base.dependencies); if (enableHibernateCache && definition.hibernateCache) { versions.push(...(definition.hibernateCache.versions ?? [])); - dependencies.push(...definition.hibernateCache.dependencies!); + dependencies.push(...definition.hibernateCache.dependencies); } source.addJavaDefinition?.( { dependencies, versions }, diff --git a/generators/spring-cache/internal/dependencies.ts b/generators/spring-cache/internal/dependencies.ts index 66b72ad48df6..17851cbc7194 100644 --- a/generators/spring-cache/internal/dependencies.ts +++ b/generators/spring-cache/internal/dependencies.ts @@ -35,7 +35,6 @@ type CacheProviderDependencies = { hibernateCache?: CacheProviderDefinition; }; -// eslint-disable-next-line import/prefer-default-export export const getCacheProviderMavenDefinition: ( cacheProvider: string, javaDependencies: Record, diff --git a/generators/spring-cache/needles.spec.ts b/generators/spring-cache/needles.spec.ts index 5398a33dea5f..ce1a668b1b72 100644 --- a/generators/spring-cache/needles.spec.ts +++ b/generators/spring-cache/needles.spec.ts @@ -4,7 +4,6 @@ import BaseApplicationGenerator from '../base-application/index.js'; import { SERVER_MAIN_SRC_DIR } from '../generator-constants.js'; import { GENERATOR_SPRING_CACHE } from '../generator-list.js'; -// eslint-disable-next-line @typescript-eslint/no-explicit-any const mockBlueprintSubGen: any = class extends BaseApplicationGenerator { constructor(args, opts, features) { super(args, opts, features); diff --git a/generators/spring-cloud/generators/gateway/types.d.ts b/generators/spring-cloud/generators/gateway/types.d.ts index f6c7b0e93071..3f2b0391fc11 100644 --- a/generators/spring-cloud/generators/gateway/types.d.ts +++ b/generators/spring-cloud/generators/gateway/types.d.ts @@ -1,5 +1,5 @@ export type GatewayApplication = { gatewayServicesApiAvailable?: boolean; - gatewayRoutes?: Array<{ route: string; host: string; serverPort: string }>; + gatewayRoutes?: { route: string; host: string; serverPort: string }[]; routes?: string[]; }; diff --git a/generators/spring-data-relational/internal/dependencies.ts b/generators/spring-data-relational/internal/dependencies.ts index 97f5786e9148..f8e926461f1e 100644 --- a/generators/spring-data-relational/internal/dependencies.ts +++ b/generators/spring-data-relational/internal/dependencies.ts @@ -93,7 +93,6 @@ export const getH2MavenDefinition = ({ }; }; -// eslint-disable-next-line import/prefer-default-export export const getDatabaseTypeMavenDefinition: ( databaseType: string, options: { inProfile?: string; javaDependencies: Record }, diff --git a/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts index 99d982f2bf5a..ef949a382366 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts +++ b/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe, expect as jestExpect } from 'esmocha'; import chai, { expect } from 'chai'; import sinonChai from 'sinon-chai'; diff --git a/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts index c949de40e172..6267fdba5e26 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts +++ b/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts @@ -286,7 +286,7 @@ describe('jdl - JDLToJSONFieldConverter', () => { }); const patternValidation = new JDLValidation({ name: PATTERN, - // eslint-disable-next-line prettier/prettier,no-useless-escape + value: '^d$', }); const minBytesValidation = new JDLValidation({ diff --git a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts index 03c93a8a34de..71f9c27e6d2c 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts +++ b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable no-unused-expressions */ import { before, it, describe, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; diff --git a/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts index ea674044154e..575c28255958 100644 --- a/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts +++ b/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe, after, expect as jestExpect } from 'esmocha'; import chai, { expect } from 'chai'; import sinon from 'sinon'; @@ -809,7 +808,7 @@ JSONEntity { }); const patternValidation = new JDLValidation({ name: PATTERN, - // eslint-disable-next-line prettier/prettier,no-useless-escape + value: '^d$', }); const minBytesValidation = new JDLValidation({ @@ -1781,7 +1780,7 @@ JSONEntity { }); const dtoWithMapstructOption = new JDLBinaryOption({ name: binaryOptions.Options.DTO, - value: binaryOptions.Values.dto.MAPSTRUCT!, + value: binaryOptions.Values.dto.MAPSTRUCT, entityNames: new Set(['D', 'F']), }); jdlObject.addOption(paginationWithInfiniteScrollOption); diff --git a/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts index 6ae01932b5eb..cffb33f041e9 100644 --- a/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts +++ b/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe, after, expect as jestExpect } from 'esmocha'; import chai, { expect } from 'chai'; import sinon from 'sinon'; @@ -753,7 +752,7 @@ JSONEntity { }); const patternValidation = new JDLValidation({ name: PATTERN, - // eslint-disable-next-line prettier/prettier,no-useless-escape + value: '^d$', }); const minBytesValidation = new JDLValidation({ diff --git a/jdl/converters/json-to-jdl-converter.spec.ts b/jdl/converters/json-to-jdl-converter.spec.ts index 5af9edaffbeb..a4adab6c826d 100644 --- a/jdl/converters/json-to-jdl-converter.spec.ts +++ b/jdl/converters/json-to-jdl-converter.spec.ts @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable no-unused-expressions */ import fs, { readFileSync } from 'fs'; import path, { dirname } from 'path'; diff --git a/jdl/converters/json-to-jdl-converter.ts b/jdl/converters/json-to-jdl-converter.ts index 915df293f437..034b04b52169 100644 --- a/jdl/converters/json-to-jdl-converter.ts +++ b/jdl/converters/json-to-jdl-converter.ts @@ -77,7 +77,7 @@ function getJDLObjectFromMultipleApplications(directory: string): JDLObject { subDirectories.forEach(subDirectory => { const applicationDirectory = path.join(directory, subDirectory); const yoRcFileContent: JHipsterYoRcContent = readJSONFile(path.join(applicationDirectory, '.yo-rc.json')); - let entities: Map = new Map(); + let entities = new Map(); if (doesDirectoryExist(path.join(applicationDirectory, '.jhipster'))) { entities = getJSONEntityFiles(applicationDirectory); } @@ -119,7 +119,7 @@ function cleanYoRcFileContent(yoRcFileContent: JHipsterYoRcContent): PostProcess } function getJSONEntityFiles(applicationDirectory: string): Map { - const entities: Map = new Map(); + const entities = new Map(); fs.readdirSync(path.join(applicationDirectory, '.jhipster')).forEach(file => { const entityName = file.slice(0, file.indexOf('.json')); const jsonFilePath = path.join(applicationDirectory, '.jhipster', file); diff --git a/jdl/converters/json-to-jdl-entity-converter.spec.ts b/jdl/converters/json-to-jdl-entity-converter.spec.ts index fd00cdf96b81..a30223e8422e 100644 --- a/jdl/converters/json-to-jdl-entity-converter.spec.ts +++ b/jdl/converters/json-to-jdl-entity-converter.spec.ts @@ -17,8 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ - import fs from 'fs'; import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; diff --git a/jdl/converters/json-to-jdl-entity-converter.ts b/jdl/converters/json-to-jdl-entity-converter.ts index 072cae18aca9..d5ff7aff9442 100644 --- a/jdl/converters/json-to-jdl-entity-converter.ts +++ b/jdl/converters/json-to-jdl-entity-converter.ts @@ -118,7 +118,7 @@ function getTypeForBlob(blobContentType: string): string { function addValidations(jdlField: JDLField, field: JSONField): void { if (field.fieldValidateRules) { - field.fieldValidateRules!.forEach((rule: string) => { + field.fieldValidateRules.forEach((rule: string) => { jdlField.addValidation(convertJSONToJDLValidation(rule, field)); }); } diff --git a/jdl/converters/json-to-jdl-option-converter.spec.ts b/jdl/converters/json-to-jdl-option-converter.spec.ts index 4c8fadd907d9..59e3326d98e5 100644 --- a/jdl/converters/json-to-jdl-option-converter.spec.ts +++ b/jdl/converters/json-to-jdl-option-converter.spec.ts @@ -17,8 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-unused-expressions */ - import { before, it, describe } from 'esmocha'; import { expect } from 'chai'; import { convertServerOptionsToJDL } from '../converters/json-to-jdl-option-converter.js'; diff --git a/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts b/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts index e49df00e9906..d99c26864122 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts +++ b/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts @@ -71,7 +71,7 @@ describe('jdl - OptionConverter', () => { convertedOptions = convertOptions( { [optionName]: { - [optionValue!]: { list: ['A'], excluded: ['B'] }, + [optionValue]: { list: ['A'], excluded: ['B'] }, }, }, [], diff --git a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts index 530350b5523d..f2512a8324f2 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts +++ b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { before, it, describe, expect as jestExpect } from 'esmocha'; diff --git a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts index 7a7b2539f639..4e3d33aef488 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts +++ b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts @@ -82,7 +82,7 @@ function init(passedConfiguration: ParsedJDLRoot) { function fillApplications(): void { // TODO: Function which expects two arguments is called with three. - // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-expect-error const jdlApplications: JDLApplication[] = convertApplications(parsedContent.applications, configuration, entityNames); jdlApplications.forEach((jdlApplication: JDLApplication) => { @@ -147,7 +147,7 @@ function fillAssociations(): void { const jdlRelationships = convertRelationships(parsedContent.relationships, convertAnnotationsToOptions); jdlRelationships.forEach(jdlRelationship => { // TODO: addRelationship only expects one argument. - // eslint-disable-next-line @typescript-eslint/ban-ts-comment + jdlObject.addRelationship(jdlRelationship); }); } diff --git a/jdl/exporters/export-utils.spec.ts b/jdl/exporters/export-utils.spec.ts index ab7c96a63631..4d1f1e6679f1 100644 --- a/jdl/exporters/export-utils.spec.ts +++ b/jdl/exporters/export-utils.spec.ts @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable no-unused-expressions */ import { readFileSync, writeFileSync } from 'fs'; import { dirname } from 'path'; diff --git a/jdl/exporters/jdl-exporter.spec.ts b/jdl/exporters/jdl-exporter.spec.ts index 7cf82eab0844..2f4bb579f7b8 100644 --- a/jdl/exporters/jdl-exporter.spec.ts +++ b/jdl/exporters/jdl-exporter.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import fs from 'fs'; import { expect } from 'chai'; import { it, describe, expect as jestExpect, beforeEach } from 'esmocha'; diff --git a/jdl/exporters/jhipster-deployment-exporter.spec.ts b/jdl/exporters/jhipster-deployment-exporter.spec.ts index 0d46e1168226..1de9b51a3bdc 100644 --- a/jdl/exporters/jhipster-deployment-exporter.spec.ts +++ b/jdl/exporters/jhipster-deployment-exporter.spec.ts @@ -17,8 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-unused-expressions */ - import fs from 'fs'; import path from 'path'; import { it, describe, expect as jestExpect, beforeEach } from 'esmocha'; diff --git a/jdl/exporters/jhipster-entity-exporter.spec.ts b/jdl/exporters/jhipster-entity-exporter.spec.ts index 676d1fcf3863..855c53abdeed 100644 --- a/jdl/exporters/jhipster-entity-exporter.spec.ts +++ b/jdl/exporters/jhipster-entity-exporter.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { it, describe, expect as jestExpect, beforeEach } from 'esmocha'; import { expect } from 'chai'; import exportEntities from '../exporters/jhipster-entity-exporter.js'; diff --git a/jdl/integration-test.spec.ts b/jdl/integration-test.spec.ts index 1381359ab1d8..00433fe60e66 100644 --- a/jdl/integration-test.spec.ts +++ b/jdl/integration-test.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { expect } from 'chai'; diff --git a/jdl/jdl-importer.spec.ts b/jdl/jdl-importer.spec.ts index 40358cbc3b14..ef885a6b48c7 100644 --- a/jdl/jdl-importer.spec.ts +++ b/jdl/jdl-importer.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { readFileSync, rmSync } from 'fs'; diff --git a/jdl/jhipster/binary-options.spec.ts b/jdl/jhipster/binary-options.spec.ts index 142e813b03dd..73d8fb3a717c 100644 --- a/jdl/jhipster/binary-options.spec.ts +++ b/jdl/jhipster/binary-options.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { binaryOptions } from '../jhipster/index.js'; diff --git a/jdl/jhipster/database-types.spec.ts b/jdl/jhipster/database-types.spec.ts index f174111be18c..abbc29e6354c 100644 --- a/jdl/jhipster/database-types.spec.ts +++ b/jdl/jhipster/database-types.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-unused-expressions */ import { it, describe } from 'esmocha'; import { expect } from 'chai'; import { databaseTypes } from '../jhipster/index.js'; diff --git a/jdl/jhipster/default-application-options.spec.ts b/jdl/jhipster/default-application-options.spec.ts index 4f2efb435c59..21506a1d7f4b 100644 --- a/jdl/jhipster/default-application-options.spec.ts +++ b/jdl/jhipster/default-application-options.spec.ts @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable no-unused-expressions */ import { before, it, describe } from 'esmocha'; import { expect } from 'chai'; diff --git a/jdl/jhipster/deployment-options.spec.ts b/jdl/jhipster/deployment-options.spec.ts index 081424e35e8d..8b0f9b97a512 100644 --- a/jdl/jhipster/deployment-options.spec.ts +++ b/jdl/jhipster/deployment-options.spec.ts @@ -17,9 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new */ -/* eslint-disable no-unused-expressions */ - import { it, describe } from 'esmocha'; import { expect } from 'chai'; import { deploymentOptions } from '../jhipster/index.js'; diff --git a/jdl/jhipster/field-types.spec.ts b/jdl/jhipster/field-types.spec.ts index 10d5b2a41793..7d155882947e 100644 --- a/jdl/jhipster/field-types.spec.ts +++ b/jdl/jhipster/field-types.spec.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/no-empty-function */ /** * Copyright 2013-2024 the original author or authors from the JHipster project. * @@ -18,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { it, describe } from 'esmocha'; import { expect } from 'chai'; diff --git a/jdl/jhipster/json-entity.spec.ts b/jdl/jhipster/json-entity.spec.ts index 100069929fcd..3fe7d2a069e1 100644 --- a/jdl/jhipster/json-entity.spec.ts +++ b/jdl/jhipster/json-entity.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new,no-unused-expressions */ import { before, it, describe, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { jsonEntity as JSONEntity } from '../jhipster/index.js'; diff --git a/jdl/jhipster/relationship-options.spec.ts b/jdl/jhipster/relationship-options.spec.ts index 7f85c0770d52..a8a924129ab5 100644 --- a/jdl/jhipster/relationship-options.spec.ts +++ b/jdl/jhipster/relationship-options.spec.ts @@ -17,8 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-unused-expressions */ - import { it, describe } from 'esmocha'; import { expect } from 'chai'; import { relationshipOptions } from '../jhipster/index.js'; diff --git a/jdl/jhipster/relationship-types.spec.ts b/jdl/jhipster/relationship-types.spec.ts index 83b7610cb021..dd8681e5f54e 100644 --- a/jdl/jhipster/relationship-types.spec.ts +++ b/jdl/jhipster/relationship-types.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { it, describe } from 'esmocha'; import { expect } from 'chai'; import { relationshipTypes } from '../jhipster/index.js'; diff --git a/jdl/jhipster/reserved-keywords.spec.ts b/jdl/jhipster/reserved-keywords.spec.ts index 71ec4c332cb6..efa8a1918981 100644 --- a/jdl/jhipster/reserved-keywords.spec.ts +++ b/jdl/jhipster/reserved-keywords.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { it, describe } from 'esmocha'; import { expect } from 'chai'; import { reservedKeywords } from '../jhipster/index.js'; diff --git a/jdl/jhipster/unary-options.spec.ts b/jdl/jhipster/unary-options.spec.ts index ffb3dc7b4fcb..71a688e7d069 100644 --- a/jdl/jhipster/unary-options.spec.ts +++ b/jdl/jhipster/unary-options.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { unaryOptions } from '../jhipster/index.js'; diff --git a/jdl/jhipster/validations.spec.ts b/jdl/jhipster/validations.spec.ts index 386e8a83909f..cfa6ddb84a4f 100644 --- a/jdl/jhipster/validations.spec.ts +++ b/jdl/jhipster/validations.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { it, describe } from 'esmocha'; import { expect } from 'chai'; import { validations } from '../jhipster/index.js'; diff --git a/jdl/linters/jdl-linter.spec.ts b/jdl/linters/jdl-linter.spec.ts index 8638dcb9ff1c..2ab68707104b 100644 --- a/jdl/linters/jdl-linter.spec.ts +++ b/jdl/linters/jdl-linter.spec.ts @@ -17,8 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ - import { writeFileSync } from 'fs'; import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; diff --git a/jdl/linters/rules.spec.ts b/jdl/linters/rules.spec.ts index 5dc4cf3f1d5f..a0f4b458e41e 100644 --- a/jdl/linters/rules.spec.ts +++ b/jdl/linters/rules.spec.ts @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable no-unused-expressions */ import { it, describe } from 'esmocha'; import { expect } from 'chai'; @@ -37,7 +36,7 @@ describe('jdl - Rules', () => { expect(getRule('toto')).to.be.undefined; }); }); - (Object.keys(rulesNames) as Array).forEach(ruleName => { + (Object.keys(rulesNames) as (keyof typeof rulesNames)[]).forEach(ruleName => { describe(`for rule name ${ruleName}`, () => { it('should return the corresponding rule', () => { expect(getRule(ruleName)).to.deep.equal(rules[ruleName]); diff --git a/jdl/models/abstract-jdl-option.spec.ts b/jdl/models/abstract-jdl-option.spec.ts index f3f9c98d4024..20d926d35517 100644 --- a/jdl/models/abstract-jdl-option.spec.ts +++ b/jdl/models/abstract-jdl-option.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe, expect } from 'esmocha'; import JDLBinaryOption from '../models/jdl-binary-option.js'; import { binaryOptions } from '../jhipster/index.js'; diff --git a/jdl/models/index.ts b/jdl/models/index.ts index bb74ae7a39a4..41a9effd667a 100644 --- a/jdl/models/index.ts +++ b/jdl/models/index.ts @@ -16,6 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// eslint-disable-next-line import/prefer-default-export + export { default as JDLEntity } from './jdl-entity.js'; export { default as JDLEnum } from './jdl-enum.js'; diff --git a/jdl/models/jdl-application-configuration-factory.ts b/jdl/models/jdl-application-configuration-factory.ts index 28e5375c8986..da85553c46b9 100644 --- a/jdl/models/jdl-application-configuration-factory.ts +++ b/jdl/models/jdl-application-configuration-factory.ts @@ -43,7 +43,7 @@ export default function createApplicationConfigurationFromObject(configurationOb export function createApplicationNamespaceConfigurationFromObject( parsedNamespaceConfigs: Record> = {}, -): Array { +): JDLApplicationConfiguration[] { return Object.entries(parsedNamespaceConfigs).map(([namespace, parsedConfig]) => { const configuration = new JDLApplicationConfiguration(namespace); for (const [optionName, optionValue] of Object.entries(parsedConfig)) { diff --git a/jdl/models/jdl-application-configuration.spec.ts b/jdl/models/jdl-application-configuration.spec.ts index 411dfa68cf55..b548e96aa0dc 100644 --- a/jdl/models/jdl-application-configuration.spec.ts +++ b/jdl/models/jdl-application-configuration.spec.ts @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable no-unused-expressions */ import { before, it, describe } from 'esmocha'; import { expect } from 'chai'; diff --git a/jdl/models/jdl-application-definition.spec.ts b/jdl/models/jdl-application-definition.spec.ts index 7a9b76965936..fde297440ef3 100644 --- a/jdl/models/jdl-application-definition.spec.ts +++ b/jdl/models/jdl-application-definition.spec.ts @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable no-unused-expressions */ import { it, describe } from 'esmocha'; import { expect } from 'chai'; diff --git a/jdl/models/jdl-application.spec.ts b/jdl/models/jdl-application.spec.ts index 71054c533cc7..5bfcda786592 100644 --- a/jdl/models/jdl-application.spec.ts +++ b/jdl/models/jdl-application.spec.ts @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable no-unused-expressions */ import { before, it, describe, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; diff --git a/jdl/models/jdl-application.ts b/jdl/models/jdl-application.ts index db0a0b996634..2fbbf4b9141b 100644 --- a/jdl/models/jdl-application.ts +++ b/jdl/models/jdl-application.ts @@ -28,7 +28,7 @@ import AbstractJDLOption from './abstract-jdl-option.js'; export default class JDLApplication { config: JDLApplicationConfiguration; - namespaceConfigs: Array; + namespaceConfigs: JDLApplicationConfiguration[]; entityNames: JDLApplicationEntities; options: JDLOptions; @@ -116,7 +116,7 @@ export default class JDLApplication { } toString(): string { - let stringifiedApplication: string = `application { + let stringifiedApplication = `application { ${this.config.toString(2)} ${this.namespaceConfigs.map(config => `${config.toString(2)}\n`).join()}`; if (this.entityNames.size() !== 0) { diff --git a/jdl/models/jdl-binary-option.spec.ts b/jdl/models/jdl-binary-option.spec.ts index 026a3fedba82..15258a02e1ed 100644 --- a/jdl/models/jdl-binary-option.spec.ts +++ b/jdl/models/jdl-binary-option.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe } from 'esmocha'; import { expect } from 'chai'; import JDLBinaryOption from '../models/jdl-binary-option.js'; diff --git a/jdl/models/jdl-deployment.spec.ts b/jdl/models/jdl-deployment.spec.ts index f9be8af0a061..70c8620c0a08 100644 --- a/jdl/models/jdl-deployment.spec.ts +++ b/jdl/models/jdl-deployment.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe, expect } from 'esmocha'; import JDLDeployment from '../models/jdl-deployment.js'; diff --git a/jdl/models/jdl-deployment.ts b/jdl/models/jdl-deployment.ts index 72ff849df59e..ed6502aa244f 100644 --- a/jdl/models/jdl-deployment.ts +++ b/jdl/models/jdl-deployment.ts @@ -84,5 +84,5 @@ function stringifyOptionValue(name: string, value: any): string { } function defaults(deploymentType: string) { - return (deploymentOptions.Options as any).defaults(deploymentType); + return deploymentOptions.Options.defaults(deploymentType); } diff --git a/jdl/models/jdl-entity.spec.ts b/jdl/models/jdl-entity.spec.ts index 771d44004087..f9c4db5cf69b 100644 --- a/jdl/models/jdl-entity.spec.ts +++ b/jdl/models/jdl-entity.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe } from 'esmocha'; import { expect } from 'chai'; import { JDLEntity } from '../models/index.js'; diff --git a/jdl/models/jdl-enum-value.spec.ts b/jdl/models/jdl-enum-value.spec.ts index 9476fdad1f1b..1f849980dbf6 100644 --- a/jdl/models/jdl-enum-value.spec.ts +++ b/jdl/models/jdl-enum-value.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe } from 'esmocha'; import { expect } from 'chai'; import JDLEnumValue from '../models/jdl-enum-value.js'; diff --git a/jdl/models/jdl-enum.spec.ts b/jdl/models/jdl-enum.spec.ts index 105349223ec3..bca9a09989da 100644 --- a/jdl/models/jdl-enum.spec.ts +++ b/jdl/models/jdl-enum.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { JDLEnum } from '../models/index.js'; diff --git a/jdl/models/jdl-enums.spec.ts b/jdl/models/jdl-enums.spec.ts index da789c5ed4a3..5f68c3ab89c4 100644 --- a/jdl/models/jdl-enums.spec.ts +++ b/jdl/models/jdl-enums.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe, after, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import JDLEnums from '../models/jdl-enums.js'; diff --git a/jdl/models/jdl-field.spec.ts b/jdl/models/jdl-field.spec.ts index a4a4d31787f8..fd41b0bf8404 100644 --- a/jdl/models/jdl-field.spec.ts +++ b/jdl/models/jdl-field.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe } from 'esmocha'; import { expect } from 'chai'; diff --git a/jdl/models/jdl-object.spec.ts b/jdl/models/jdl-object.spec.ts index d6facc9d735f..580dcbe2f0fa 100644 --- a/jdl/models/jdl-object.spec.ts +++ b/jdl/models/jdl-object.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe, expect as jestExpect, afterEach } from 'esmocha'; import { expect } from 'chai'; import { applicationTypes, binaryOptions, unaryOptions, relationshipTypes } from '../jhipster/index.js'; diff --git a/jdl/models/jdl-options.spec.ts b/jdl/models/jdl-options.spec.ts index e2b16367bd91..28aca2f61b50 100644 --- a/jdl/models/jdl-options.spec.ts +++ b/jdl/models/jdl-options.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-unused-expressions */ import { before, it, describe, expect as jestExpect, afterEach } from 'esmocha'; import { expect } from 'chai'; import { unaryOptions, binaryOptions } from '../jhipster/index.js'; diff --git a/jdl/models/jdl-relationship.spec.ts b/jdl/models/jdl-relationship.spec.ts index 4ba787179732..44c5c019cfdb 100644 --- a/jdl/models/jdl-relationship.spec.ts +++ b/jdl/models/jdl-relationship.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe } from 'esmocha'; import { expect } from 'chai'; diff --git a/jdl/models/jdl-relationships.spec.ts b/jdl/models/jdl-relationships.spec.ts index ec66f28d6e20..3671c3d59bdd 100644 --- a/jdl/models/jdl-relationships.spec.ts +++ b/jdl/models/jdl-relationships.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; diff --git a/jdl/models/jdl-unary-option.spec.ts b/jdl/models/jdl-unary-option.spec.ts index ddf77f1cebd7..965fec355645 100644 --- a/jdl/models/jdl-unary-option.spec.ts +++ b/jdl/models/jdl-unary-option.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe } from 'esmocha'; import { expect } from 'chai'; diff --git a/jdl/models/jdl-validation.spec.ts b/jdl/models/jdl-validation.spec.ts index d3c48fbbe245..f6618bb4c7d6 100644 --- a/jdl/models/jdl-validation.spec.ts +++ b/jdl/models/jdl-validation.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe } from 'esmocha'; import { expect } from 'chai'; import JDLValidation from '../models/jdl-validation.js'; diff --git a/jdl/models/list-jdl-application-configuration-option.ts b/jdl/models/list-jdl-application-configuration-option.ts index f42454ed5a70..55bca8348fba 100644 --- a/jdl/models/list-jdl-application-configuration-option.ts +++ b/jdl/models/list-jdl-application-configuration-option.ts @@ -24,7 +24,7 @@ export default class ListJDLApplicationConfigurationOption extends JDLApplicatio // TODO for v9, use set everywhere quoted: boolean; - constructor(name: string, value: string[], quoted: boolean = false) { + constructor(name: string, value: string[], quoted = false) { super(name, new Set(value)); this.quoted = quoted; } diff --git a/jdl/parsing/grammar.spec.ts b/jdl/parsing/grammar.spec.ts index c8a472875518..9f781d2e0947 100644 --- a/jdl/parsing/grammar.spec.ts +++ b/jdl/parsing/grammar.spec.ts @@ -17,8 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-unused-expressions */ - import { before, it, describe, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { parseFromContent } from '../readers/jdl-reader.js'; diff --git a/jdl/parsing/lexer/lexer.spec.ts b/jdl/parsing/lexer/lexer.spec.ts index 9e8f7482b09f..3a858d04fc26 100644 --- a/jdl/parsing/lexer/lexer.spec.ts +++ b/jdl/parsing/lexer/lexer.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe } from 'esmocha'; import { expect } from 'chai'; import { JDLLexer } from './lexer.js'; diff --git a/jdl/parsing/self-checks/parsing-system-checker.ts b/jdl/parsing/self-checks/parsing-system-checker.ts index b7b92055f5ce..a40f70778f1f 100644 --- a/jdl/parsing/self-checks/parsing-system-checker.ts +++ b/jdl/parsing/self-checks/parsing-system-checker.ts @@ -41,11 +41,11 @@ function getUsedTokens(rules) { function getUselessTokens(usedTokens: any[], allDefinedTokens: any[]) { const usedCategories = uniq(flatMap(usedTokens, 'CATEGORIES')); // TODO: Calling uniq with two parameters is probably a bug. - // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-expect-error const notDirectlyUsedTokens = difference(allDefinedTokens, uniq(usedTokens, usedCategories)); const redundant = reject(notDirectlyUsedTokens, token => { - const tokCategories = (token as any).CATEGORIES; + const tokCategories = token.CATEGORIES; return some(tokCategories, category => includes(usedCategories, category)); }); return reject(redundant, tokenType => tokenType.GROUP === Lexer.SKIPPED); diff --git a/jdl/parsing/validator.spec.ts b/jdl/parsing/validator.spec.ts index 9fa1cc796c79..104bf1eee843 100644 --- a/jdl/parsing/validator.spec.ts +++ b/jdl/parsing/validator.spec.ts @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* eslint-disable no-useless-escape */ import { it, describe } from 'esmocha'; import { expect } from 'chai'; diff --git a/jdl/readers/jdl-reader.spec.ts b/jdl/readers/jdl-reader.spec.ts index c6bc3337a6b1..b4efdb5e14c6 100644 --- a/jdl/readers/jdl-reader.spec.ts +++ b/jdl/readers/jdl-reader.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import fs from 'fs'; import path, { dirname } from 'path'; diff --git a/jdl/readers/json-file-reader.spec.ts b/jdl/readers/json-file-reader.spec.ts index 9eb25a17c6b5..b8299cb02263 100644 --- a/jdl/readers/json-file-reader.spec.ts +++ b/jdl/readers/json-file-reader.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import path from 'path'; import { it, describe } from 'esmocha'; import { expect } from 'chai'; diff --git a/jdl/readers/json-reader.spec.ts b/jdl/readers/json-reader.spec.ts index 0db4fe59f631..9f4a6c00625a 100644 --- a/jdl/readers/json-reader.spec.ts +++ b/jdl/readers/json-reader.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { renameSync } from 'fs'; import { join, dirname } from 'path'; import { fileURLToPath } from 'url'; diff --git a/jdl/readers/json-reader.ts b/jdl/readers/json-reader.ts index 3c2e92939b6d..37f8305949b4 100644 --- a/jdl/readers/json-reader.ts +++ b/jdl/readers/json-reader.ts @@ -45,14 +45,13 @@ export default function parseFromDir(dir: string): JDLObject { const entityName = file.slice(0, file.length - 5); try { entities.set(entityName, readJSONFile(`${entityDir}/${file}`)); - } catch (error) { + } catch { // Not an entity file, not adding } } }); const applicationOptions = readJSONFile(`${dir}/.yo-rc.json`)['generator-jhipster']; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error const jdlObject = convertServerOptionsToJDL(applicationOptions); const convertedJDLObject = convertEntitiesToJDL(entities); diff --git a/jdl/utils/file-utils.ts b/jdl/utils/file-utils.ts index 10ffe40de7c5..d16b9d7a93fe 100644 --- a/jdl/utils/file-utils.ts +++ b/jdl/utils/file-utils.ts @@ -58,7 +58,7 @@ export function createFolderIfItDoesNotExist(directory: string) { function getStatObject(file: string) { try { return fs.statSync(file); - } catch (error) { + } catch { return false; } } diff --git a/jdl/utils/files-utils.spec.ts b/jdl/utils/files-utils.spec.ts index cc434c56e7bb..13665cd6565a 100644 --- a/jdl/utils/files-utils.spec.ts +++ b/jdl/utils/files-utils.spec.ts @@ -17,8 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-unused-expressions */ - import fs from 'fs'; import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; diff --git a/jdl/utils/format-utils.spec.ts b/jdl/utils/format-utils.spec.ts index 3a6c7285c0e9..fef52acc6beb 100644 --- a/jdl/utils/format-utils.spec.ts +++ b/jdl/utils/format-utils.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { it, describe } from 'esmocha'; import { expect } from 'chai'; import formatComment from '../utils/format-utils.js'; diff --git a/jdl/utils/object-utils.spec.ts b/jdl/utils/object-utils.spec.ts index 7424c9f444eb..5799c87049ad 100644 --- a/jdl/utils/object-utils.spec.ts +++ b/jdl/utils/object-utils.spec.ts @@ -17,7 +17,6 @@ * limitations under the License. */ -/* eslint-disable no-new, no-unused-expressions */ import { before, it, describe, after } from 'esmocha'; import { expect } from 'chai'; import { areEntitiesEqual, merge } from '../utils/object-utils.js'; diff --git a/jdl/utils/string_utils.spec.ts b/jdl/utils/string_utils.spec.ts index 23cbf3db002a..432593e81a6f 100644 --- a/jdl/utils/string_utils.spec.ts +++ b/jdl/utils/string_utils.spec.ts @@ -18,7 +18,7 @@ */ /* define global expect */ -/* eslint-disable no-new, no-unused-expressions */ + import { it, describe } from 'esmocha'; import { expect } from 'chai'; diff --git a/jdl/validators/jdl-with-application-validator.spec.ts b/jdl/validators/jdl-with-application-validator.spec.ts index dd8d371163b4..7f5114bec4c5 100644 --- a/jdl/validators/jdl-with-application-validator.spec.ts +++ b/jdl/validators/jdl-with-application-validator.spec.ts @@ -327,14 +327,14 @@ describe('jdl - JDLWithApplicationValidator', () => { jdlObject.addOption( new JDLBinaryOption({ name: binaryOptions.Options.DTO, - value: binaryOptions.Values.dto.MAPSTRUCT!, + value: binaryOptions.Values.dto.MAPSTRUCT, entityNames: new Set(['A', 'B', 'C']), }), ); jdlObject.addOption( new JDLBinaryOption({ name: binaryOptions.Options.SERVICE, - value: binaryOptions.Values.service.SERVICE_CLASS!, + value: binaryOptions.Values.service.SERVICE_CLASS, entityNames: new Set(['B']), }), ); @@ -378,14 +378,14 @@ describe('jdl - JDLWithApplicationValidator', () => { jdlObject.addOption( new JDLBinaryOption({ name: binaryOptions.Options.DTO, - value: binaryOptions.Values.dto.MAPSTRUCT!, + value: binaryOptions.Values.dto.MAPSTRUCT, entityNames: new Set(['A', 'B']), }), ); jdlObject.addOption( new JDLBinaryOption({ name: binaryOptions.Options.SERVICE, - value: binaryOptions.Values.service.SERVICE_CLASS!, + value: binaryOptions.Values.service.SERVICE_CLASS, excludedNames: new Set(['C']), }), ); diff --git a/jdl/validators/jdl-without-application-validator.spec.ts b/jdl/validators/jdl-without-application-validator.spec.ts index 54f296e82562..6b35d5c06b67 100644 --- a/jdl/validators/jdl-without-application-validator.spec.ts +++ b/jdl/validators/jdl-without-application-validator.spec.ts @@ -316,7 +316,7 @@ describe('jdl - JDLWithoutApplicationValidator', () => { jdlObject.addOption( new JDLBinaryOption({ name: binaryOptions.Options.PAGINATION, - value: binaryOptions.Values.pagination.PAGINATION!, + value: binaryOptions.Values.pagination.PAGINATION, }), ); validator = createValidator(jdlObject, { databaseType: databaseTypes.CASSANDRA }); diff --git a/lib/index.ts b/lib/index.ts index f945a95b5ab4..9815d74355c2 100644 --- a/lib/index.ts +++ b/lib/index.ts @@ -15,5 +15,4 @@ export const getPackageRoot = (relativePath?: string) => { return relativePath ? join(packageDirectory, relativePath) : packageDirectory; }; -// eslint-disable-next-line import/prefer-default-export export const packageJson = JSON.parse(readFileSync(getPackageRoot('package.json')).toString()); diff --git a/lib/internal/config-def.ts b/lib/internal/config-def.ts index 63e02d783ada..9a4c01bc02ff 100644 --- a/lib/internal/config-def.ts +++ b/lib/internal/config-def.ts @@ -26,7 +26,6 @@ export function loadConfig( let source = config; if (!source) { if (def.scope === 'generator') { - // eslint-disable-next-line @typescript-eslint/no-this-alias source = this; } else if (def.scope === 'blueprint') { source = (this as any).blueprintStorage.getAll(); diff --git a/test-integration/scripts/99-write-matrix.js b/test-integration/scripts/99-write-matrix.js index c0e5f36f252b..e47b74cbbc0e 100755 --- a/test-integration/scripts/99-write-matrix.js +++ b/test-integration/scripts/99-write-matrix.js @@ -67,6 +67,7 @@ writeFileSync( }; }); } catch (error) { + // eslint-disable-next-line no-console console.log(`File ${file} not found`, error); return []; } diff --git a/test/api.spec.js b/test/api.spec.js index 9a37528b952e..ad225dd6fa3a 100644 --- a/test/api.spec.js +++ b/test/api.spec.js @@ -20,7 +20,6 @@ import { it, describe, expect } from 'esmocha'; describe('public api', () => { it('generator-jhipster/generators should match snapshot', async () => { - // eslint-disable-next-line import/no-unresolved expect(await import('generator-jhipster/generators')).toMatchSnapshot(); }); diff --git a/test/needle-api/needle-client-react-generator.spec.ts b/test/needle-api/needle-client-react-generator.spec.ts index 12ea6c67625e..75af7a3d0786 100644 --- a/test/needle-api/needle-client-react-generator.spec.ts +++ b/test/needle-api/needle-client-react-generator.spec.ts @@ -7,7 +7,6 @@ import BaseApplicationGenerator from '../../generators/base-application/index.js const { REACT } = clientFrameworkTypes; -// eslint-disable-next-line @typescript-eslint/no-explicit-any const mockReactBlueprintSubGen: any = class extends ReactGenerator { constructor(args, opts, features) { super(args, opts, features); diff --git a/test/needle-api/needle-client-react.spec.ts b/test/needle-api/needle-client-react.spec.ts index 8a237df729bc..a6e4587de3e4 100644 --- a/test/needle-api/needle-client-react.spec.ts +++ b/test/needle-api/needle-client-react.spec.ts @@ -7,7 +7,6 @@ import ReactGenerator from '../../generators/react/index.js'; const { REACT } = clientFrameworkTypes; -// eslint-disable-next-line @typescript-eslint/no-explicit-any const mockBlueprintSubGen: any = class extends ReactGenerator { constructor(args, opts, features) { super(args, opts, features); diff --git a/test/needle-api/needle-client-vue-generator.spec.ts b/test/needle-api/needle-client-vue-generator.spec.ts index 9b92eb2cade3..921da24ee1a9 100644 --- a/test/needle-api/needle-client-vue-generator.spec.ts +++ b/test/needle-api/needle-client-vue-generator.spec.ts @@ -8,7 +8,6 @@ import BaseApplicationGenerator from '../../generators/base-application/index.js const { VUE } = clientFrameworkTypes; -// eslint-disable-next-line @typescript-eslint/no-explicit-any const mockBlueprintSubGen: any = class extends VueGenerator { constructor(args, opts, features) { super(args, opts, features); diff --git a/test/needle-api/needle-client-vue.spec.ts b/test/needle-api/needle-client-vue.spec.ts index f3f230a5b354..7cc11ad5228a 100644 --- a/test/needle-api/needle-client-vue.spec.ts +++ b/test/needle-api/needle-client-vue.spec.ts @@ -6,7 +6,6 @@ import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; const { VUE } = clientFrameworkTypes; -// eslint-disable-next-line @typescript-eslint/no-explicit-any const mockBlueprintSubGen: any = class extends ClientGenerator { constructor(args, opts, features) { super(args, opts, features); diff --git a/testing/helpers.ts b/testing/helpers.ts index 1b2b4705fccc..5125ab504f9b 100644 --- a/testing/helpers.ts +++ b/testing/helpers.ts @@ -1,4 +1,3 @@ -/* eslint-disable max-classes-per-file */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; import { merge, set, snakeCase } from 'lodash-es'; @@ -185,7 +184,7 @@ class JHipsterRunContext extends RunContext { }); } - withGenerateWorkspaceApplications(generateWorkspaces: boolean = false): this { + withGenerateWorkspaceApplications(generateWorkspaces = false): this { return this.onBeforePrepare(() => { this.generateApplicationsSet = true; this.withOptions({ generateApplications: true, workspacesFolders: this.workspaceApplications, workspaces: generateWorkspaces }); diff --git a/testing/support/client-samples.ts b/testing/support/client-samples.ts index 5afeae21506c..270a124a15ac 100644 --- a/testing/support/client-samples.ts +++ b/testing/support/client-samples.ts @@ -24,5 +24,4 @@ export const buildClientSamples = (commonConfig?: Record): Reco return buildSamplesFromMatrix(clientMatrix, { commonConfig }); }; -// eslint-disable-next-line import/prefer-default-export export const clientSamples = buildClientSamples(); diff --git a/testing/support/server-samples.ts b/testing/support/server-samples.ts index 96f305db624e..6b68c4a214a9 100644 --- a/testing/support/server-samples.ts +++ b/testing/support/server-samples.ts @@ -1,7 +1,6 @@ import { MatrixMonolith, MatrixMicroservice, MatrixGateway } from './application-samples.js'; import { fromMatrix, extendMatrix, extendFilteredMatrix, buildSamplesFromMatrix } from './matrix-utils.js'; -// eslint-disable-next-line import/prefer-default-export export const buildServerMatrix = (matrix: Record = {}) => { let serverMatrix = { ...fromMatrix({ From e82b83aec0e77ef45d19a2fce500ce97a5053cf7 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 6 Aug 2024 22:55:57 -0300 Subject: [PATCH 173/938] manual eslint fixes --- .../support/copy-jdl-entity-samples.js | 2 +- .../generate-sample/support/generate-sample.js | 1 + .blueprint/update-vscode/generator.mjs | 2 ++ .mocharc.cjs | 1 + cli/environment-builder.mjs | 2 +- cli/program.mjs | 1 - .../base-application/support/prepare-field.js | 2 +- generators/base-core/generator.ts | 6 +++--- generators/base/internal/blueprint.js | 2 +- generators/base/support/faker.ts | 2 +- generators/base/support/jhipster7-context.js | 5 ++--- .../bootstrap-application-base/generator.spec.ts | 2 +- generators/client/prompts.js | 2 +- generators/cypress/index.ts | 1 - generators/info/generator.ts | 2 +- .../java/generators/domain/generator.spec.ts | 16 +++++++++------- .../generators/openapi-generator/generator.ts | 1 + generators/kubernetes-helm/generator.js | 2 +- generators/kubernetes-knative/generator.js | 6 +++--- generators/kubernetes/generator.js | 2 +- generators/kubernetes/prompts.js | 2 +- generators/server/types.d.ts | 2 +- .../jdl-to-json-basic-entity-converter.ts | 2 +- .../jdl-to-json/jdl-to-json-field-converter.ts | 2 +- jdl/converters/json-to-jdl-converter.ts | 2 +- .../parsed-jdl-to-jdl-object-converter.ts | 2 +- jdl/jhipster/field-types.ts | 2 +- .../self-checks/parsing-system-checker.ts | 2 +- jdl/readers/json-reader.ts | 2 +- jdl/utils/format-utils.spec.ts | 2 +- test-integration/scripts/99-write-matrix.js | 1 + test/integration-test.spec.ts | 2 +- testing/helpers.ts | 4 ++-- 33 files changed, 46 insertions(+), 41 deletions(-) diff --git a/.blueprint/generate-sample/support/copy-jdl-entity-samples.js b/.blueprint/generate-sample/support/copy-jdl-entity-samples.js index 900cb9c061a4..ebb64bd1801b 100644 --- a/.blueprint/generate-sample/support/copy-jdl-entity-samples.js +++ b/.blueprint/generate-sample/support/copy-jdl-entity-samples.js @@ -5,7 +5,7 @@ import { jdlEntitiesSamplesFolder } from '../../constants.js'; const isDirectory = dir => { try { return statSync(dir).isDirectory(); - } catch (error) { + } catch { return false; } }; diff --git a/.blueprint/generate-sample/support/generate-sample.js b/.blueprint/generate-sample/support/generate-sample.js index e9eff6fddd81..a7a3d42246cf 100644 --- a/.blueprint/generate-sample/support/generate-sample.js +++ b/.blueprint/generate-sample/support/generate-sample.js @@ -34,6 +34,7 @@ export const generateSample = async ( process.chdir(destProjectFolder); if (!sample) { + // eslint-disable-next-line no-console console.log(`Sample ${sampleName} was not found`); } diff --git a/.blueprint/update-vscode/generator.mjs b/.blueprint/update-vscode/generator.mjs index 3620f4332d3f..8140d068e5a8 100644 --- a/.blueprint/update-vscode/generator.mjs +++ b/.blueprint/update-vscode/generator.mjs @@ -22,6 +22,7 @@ export default class extends BaseGenerator { request: 'launch', internalConsoleOptions: 'neverOpen', name: 'update vscode launch.json', + // eslint-disable-next-line no-template-curly-in-string program: '${workspaceFolder}/test-integration/scripts/99-update-vscode.js', console: 'integratedTerminal', }, @@ -41,6 +42,7 @@ export default class extends BaseGenerator { request: 'launch', internalConsoleOptions: 'neverOpen', name: `generate sample from ${workflowName} workflow`, + // eslint-disable-next-line no-template-curly-in-string program: '${workspaceFolder}/bin/jhipster.cjs', args: ['generate-sample', `\${input:${workflowName}Sample}`, '--global'], console: 'integratedTerminal', diff --git a/.mocharc.cjs b/.mocharc.cjs index 3f0b845bbb01..f3fdfb52f90f 100644 --- a/.mocharc.cjs +++ b/.mocharc.cjs @@ -2,6 +2,7 @@ const Module = require('module'); const process = require('process'); if (!Module.register) { + // eslint-disable-next-line no-console console.log('JHipster test requires node >=18.19.0 || >= 20.6.0\n'); process.exit(1); } diff --git a/cli/environment-builder.mjs b/cli/environment-builder.mjs index 3ab04e79eb31..56396461c273 100644 --- a/cli/environment-builder.mjs +++ b/cli/environment-builder.mjs @@ -416,7 +416,7 @@ export default class EnvironmentBuilder { commandSpec.blueprint = commandSpec.blueprint || blueprint; }); result = { ...result, ...blueprintCommands }; - } catch (e) { + } catch { const msg = `Error parsing custom commands found within blueprint: ${blueprint} at ${blueprintCommandsUrl}`; /* eslint-disable no-console */ console.info(`${chalk.green.bold('INFO!')} ${msg}`); diff --git a/cli/program.mjs b/cli/program.mjs index 27d8f840da43..054430053e0f 100644 --- a/cli/program.mjs +++ b/cli/program.mjs @@ -340,7 +340,6 @@ export const buildJHipster = async ({ defaultCommand, entrypointGenerator, } = {}) => { - // eslint-disable-next-line chai-friendly/no-unused-expressions createEnvBuilder = createEnvBuilder ?? (async options => EnvironmentBuilder.create(options).prepare({ blueprints, lookups, devBlueprintPath })); envBuilder = envBuilder ?? (await createEnvBuilder()); diff --git a/generators/base-application/support/prepare-field.js b/generators/base-application/support/prepare-field.js index 197fc42fc245..b193b732ad58 100644 --- a/generators/base-application/support/prepare-field.js +++ b/generators/base-application/support/prepare-field.js @@ -312,7 +312,7 @@ function prepareCommonFieldForTemplates(entityWithConfig, field, generator) { // check if regex is valid. If not, issue warning and we skip fake data generation. try { new RegExp(field.fieldValidateRulesPattern); - } catch (e) { + } catch { generator.log.warn(`${field.fieldName} pattern is not valid: ${field.fieldValidateRulesPattern}. Skipping generating fake data. `); return undefined; } diff --git a/generators/base-core/generator.ts b/generators/base-core/generator.ts index 4156d8c48e84..3a0233e1cf98 100644 --- a/generators/base-core/generator.ts +++ b/generators/base-core/generator.ts @@ -679,7 +679,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`); let existingGenerator: string; try { existingGenerator = this._jhipsterGenerator ?? requireNamespace(this.options.namespace).generator; - } catch (error) { + } catch { if (this.options.namespace) { const split = this.options.namespace.split(':', 2); existingGenerator = split.length === 1 ? split[0] : split[1]; @@ -771,7 +771,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`); this.log.info(`Removing legacy folder ${relativePath}`); rmSync(destinationFolder, { recursive: true }); } - } catch (error) { + } catch { this.log.log(`Could not remove folder ${destinationFolder}`); } } @@ -1151,7 +1151,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`; let originalContent; try { originalContent = this.readDestination(filePath); - } catch (_error) { + } catch { // null return should be treated like an error. } diff --git a/generators/base/internal/blueprint.js b/generators/base/internal/blueprint.js index ba6197023e59..907f8123462c 100644 --- a/generators/base/internal/blueprint.js +++ b/generators/base/internal/blueprint.js @@ -133,7 +133,7 @@ export function normalizeBlueprintName(blueprint) { } return ns.with({ unscoped: `generator-jhipster-${ns.unscoped}` }).toString(); // eslint-disable-next-line no-empty - } catch (e) {} + } catch {} if (blueprint && blueprint.startsWith('@')) { return blueprint; } diff --git a/generators/base/support/faker.ts b/generators/base/support/faker.ts index acfa74314447..fb31c0c42d2a 100644 --- a/generators/base/support/faker.ts +++ b/generators/base/support/faker.ts @@ -58,7 +58,7 @@ export async function createFaker(nativeLanguage = 'en') { // See https://github.com/faker-js/faker/pull/642 try { locale = (await import(`@faker-js/faker`))[nativeLanguage]; - } catch (error) { + } catch { // Faker not implemented for the native language, fallback to en. locale = (await import('@faker-js/faker')).en; diff --git a/generators/base/support/jhipster7-context.js b/generators/base/support/jhipster7-context.js index 524c6597f797..987e5d791190 100644 --- a/generators/base/support/jhipster7-context.js +++ b/generators/base/support/jhipster7-context.js @@ -21,7 +21,7 @@ export const jhipster7deprecatedProperties = { devDatabaseType: { behaviorOnlyReason: 'v8: devDatabaseType is only used in jhipster:spring-data-relational generator', get: ({ data }) => { - if (data.devDatabaseType === undefined) return data.devDatabaseType; + if (data.devDatabaseType !== undefined) return data.devDatabaseType; const fallbackValue = data.prodDatabaseType ?? data.databaseType; console.log( @@ -32,9 +32,8 @@ export const jhipster7deprecatedProperties = { }, prodDatabaseType: { behaviorOnlyReason: 'v8: prodDatabaseType is only used in jhipster:spring-data-relational generator', - get: ({ data }) => data.prodDatabaseType ?? data.databaseType, get: ({ data }) => { - if (data.prodDatabaseType === undefined) return data.prodDatabaseType; + if (data.prodDatabaseType !== undefined) return data.prodDatabaseType; console.log( `JHipster v8 behavior change(prodDatabaseType is only used in jhipster:spring-data-relational generator): devDatabaseType is not set, using fallback: ${data.databaseType}`, diff --git a/generators/bootstrap-application-base/generator.spec.ts b/generators/bootstrap-application-base/generator.spec.ts index b64a95292eb8..b2de2d9d2972 100644 --- a/generators/bootstrap-application-base/generator.spec.ts +++ b/generators/bootstrap-application-base/generator.spec.ts @@ -23,7 +23,7 @@ import { snakeCase } from 'lodash-es'; import { defaultHelpers as helpers, runResult } from '../../testing/index.js'; import { shouldSupportFeatures } from '../../test/support/tests.js'; -import { parseChangelog } from '../base/support/timestamp.ts'; +import { parseChangelog } from '../base/support/timestamp.js'; import Generator from './index.js'; const __filename = fileURLToPath(import.meta.url); diff --git a/generators/client/prompts.js b/generators/client/prompts.js index 61a78684220e..c13fff1218e8 100644 --- a/generators/client/prompts.js +++ b/generators/client/prompts.js @@ -125,7 +125,7 @@ async function _retrieveBootswatchThemes(generator, useApi) { })); resolve(bootswatchChoices); - } catch (err) { + } catch { reject(errorMessage); } }, diff --git a/generators/cypress/index.ts b/generators/cypress/index.ts index f3ccaf492f17..082d5730094c 100644 --- a/generators/cypress/index.ts +++ b/generators/cypress/index.ts @@ -18,5 +18,4 @@ */ export { default } from './generator.js'; export { default as command } from './command.js'; -export * from './generator.js'; export { cypressFiles, cypressEntityFiles } from './files.js'; diff --git a/generators/info/generator.ts b/generators/info/generator.ts index 2abfa3bfa582..b5edb862cca2 100644 --- a/generators/info/generator.ts +++ b/generators/info/generator.ts @@ -125,7 +125,7 @@ export default class InfoGenerator extends BaseApplicationGenerator { ) { try { printInfo(await this.spawn(command, args, { stdio: 'pipe' })); - } catch (_error) { + } catch { console.log(chalk.red(`'${command}' command could not be found`)); } } diff --git a/generators/java/generators/domain/generator.spec.ts b/generators/java/generators/domain/generator.spec.ts index 9c29cda1d6e5..d92e55178220 100644 --- a/generators/java/generators/domain/generator.spec.ts +++ b/generators/java/generators/domain/generator.spec.ts @@ -61,9 +61,10 @@ describe(`generator - ${generator}`, () => { }); it('should have options defaults set', () => { - expect(result.generator.generateEntities).toBe(true); - expect(result.generator.generateEnums).toBe(true); - expect(result.generator.useJakartaValidation).toBe(true); + const generator: any = result.generator; + expect(generator.generateEntities).toBe(true); + expect(generator.generateEnums).toBe(true); + expect(generator.useJakartaValidation).toBe(true); }); }); @@ -118,7 +119,7 @@ describe(`generator - ${generator}`, () => { await helpers .runJHipster(generator) .withJHipsterConfig({}) - .onGenerator(generator => { + .onGenerator((generator: any) => { generator.generateEntities = false; generator.generateEnums = false; generator.useJakartaValidation = false; @@ -126,9 +127,10 @@ describe(`generator - ${generator}`, () => { }); it('should not override custom values', () => { - expect(result.generator.generateEntities).toBe(false); - expect(result.generator.generateEnums).toBe(false); - expect(result.generator.useJakartaValidation).toBe(false); + const generator: any = result.generator; + expect(generator.generateEntities).toBe(false); + expect(generator.generateEnums).toBe(false); + expect(generator.useJakartaValidation).toBe(false); }); }); }); diff --git a/generators/java/generators/openapi-generator/generator.ts b/generators/java/generators/openapi-generator/generator.ts index 05ed6c29fca8..5210dd11ba9b 100644 --- a/generators/java/generators/openapi-generator/generator.ts +++ b/generators/java/generators/openapi-generator/generator.ts @@ -82,6 +82,7 @@ export default class OpenapiGeneratorGenerator extends BaseApplicationGenerator { groupId: 'org.openapitools', artifactId: 'openapi-generator-maven-plugin', + // eslint-disable-next-line no-template-curly-in-string version: '${openapi-generator-maven-plugin.version}', additionalContent: ` diff --git a/generators/kubernetes-helm/generator.js b/generators/kubernetes-helm/generator.js index 95b5ed4c6885..69d215650847 100644 --- a/generators/kubernetes-helm/generator.js +++ b/generators/kubernetes-helm/generator.js @@ -185,7 +185,7 @@ export default class KubernetesHelmGenerator extends BaseWorkspacesGenerator { try { fs.chmodSync('helm-apply.sh', '755'); fs.chmodSync('helm-upgrade.sh', '755'); - } catch (err) { + } catch { this.log.warn( "Failed to make 'helm-apply.sh', 'helm-upgrade.sh' executable, you may need to run 'chmod +x helm-apply.sh helm-upgrade.sh", ); diff --git a/generators/kubernetes-knative/generator.js b/generators/kubernetes-knative/generator.js index a81bbd92b22c..8107b533493a 100644 --- a/generators/kubernetes-knative/generator.js +++ b/generators/kubernetes-knative/generator.js @@ -76,7 +76,7 @@ export default class KubernetesKnativeGenerator extends BaseWorkspacesGenerator await this.spawnCommand( 'kubectl get deploy -n knative-serving --label-columns=serving.knative.dev/release | grep -E "v0\\.[8-9]{1,3}\\.[0-9]*', ); - } catch (error) { + } catch { this.log.warn( 'Knative 0.8.* or later is not installed on your computer.\n' + 'Make sure you have Knative and Istio installed. Read https://knative.dev/docs/install/\n', @@ -218,7 +218,7 @@ export default class KubernetesKnativeGenerator extends BaseWorkspacesGenerator // Make the apply script executable try { fs.chmodSync('kubectl-knative-apply.sh', '755'); - } catch (err) { + } catch { this.log.warn("Failed to make 'kubectl-knative-apply.sh' executable, you may need to run 'chmod +x kubectl-knative-apply.sh'"); } } else { @@ -229,7 +229,7 @@ export default class KubernetesKnativeGenerator extends BaseWorkspacesGenerator try { fs.chmodSync('helm-knative-apply.sh', '755'); fs.chmodSync('helm-knative-upgrade.sh', '755'); - } catch (err) { + } catch { this.log.warn( "Failed to make 'helm-knative-apply.sh', 'helm-knative-upgrade.sh' executable, you may need to run 'chmod +x helm-knative-apply.sh helm-knative-upgrade.sh", ); diff --git a/generators/kubernetes/generator.js b/generators/kubernetes/generator.js index 88d9e5d887ba..e786099bbca9 100644 --- a/generators/kubernetes/generator.js +++ b/generators/kubernetes/generator.js @@ -211,7 +211,7 @@ export default class KubernetesGenerator extends BaseWorkspacesGenerator { // Make the apply script executable try { fs.chmodSync('kubectl-apply.sh', '755'); - } catch (err) { + } catch { this.log.warn("Failed to make 'kubectl-apply.sh' executable, you may need to run 'chmod +x kubectl-apply.sh'"); } }, diff --git a/generators/kubernetes/prompts.js b/generators/kubernetes/prompts.js index 703a2d85221d..86d006dea463 100644 --- a/generators/kubernetes/prompts.js +++ b/generators/kubernetes/prompts.js @@ -132,7 +132,7 @@ export async function askForIngressDomain() { try { const { stdout: istioIngressIp } = this.spawnCommandSync(istioIpCommand, { stdio: 'pipe' }); defaultValue = `${istioIngressIp}.nip.io`; - } catch (ex) { + } catch { istioMessage = `Unable to determine Istio Ingress IP address. You can find the Istio Ingress IP address by running the command line:\n ${istioIpCommand}`; } } else if (this.ingressType === NGINX) { diff --git a/generators/server/types.d.ts b/generators/server/types.d.ts index f930b7d8e130..96228981010f 100644 --- a/generators/server/types.d.ts +++ b/generators/server/types.d.ts @@ -4,7 +4,7 @@ import { MavenSourceType } from '../maven/types.js'; import { LiquibaseSourceType } from '../liquibase/types.js'; import { SpringCacheSourceType } from '../spring-cache/types.js'; import type { DeterministicOptionWithDerivedProperties, OptionWithDerivedProperties } from '../base-application/application-options.js'; -import { GatewayApplication } from '../spring-cloud/generators/gateway/types.ts'; +import { GatewayApplication } from '../spring-cloud/generators/gateway/types.js'; import { JavaAnnotation } from '../java/support/add-java-annotation.ts'; import { ApplicationPropertiesNeedles } from './support/needles.ts'; import { MessageBrokerApplicationType } from './options/message-broker.js'; diff --git a/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts b/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts index 7386aea03036..aedbce93ed60 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts +++ b/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts @@ -18,7 +18,7 @@ */ import JSONEntity from '../../jhipster/json-entity.js'; -import formatComment from '../../utils/format-utils.js'; +import { formatComment } from '../../utils/format-utils.js'; import { getTableNameFromEntityNameFallback } from '../../jhipster/entity-table-name-creator.js'; import { JDLEntity } from '../../models/index.js'; diff --git a/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts b/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts index 55ad79497066..eb18597c79fb 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts +++ b/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts @@ -19,7 +19,7 @@ import { capitalize } from 'lodash-es'; import { validations } from '../../jhipster/index.js'; -import formatComment from '../../utils/format-utils.js'; +import { formatComment } from '../../utils/format-utils.js'; import { camelCase } from '../../utils/string-utils.js'; import fieldTypes from '../../jhipster/field-types.js'; import JDLObject from '../../models/jdl-object.js'; diff --git a/jdl/converters/json-to-jdl-converter.ts b/jdl/converters/json-to-jdl-converter.ts index 034b04b52169..05fc8fe6b3ed 100644 --- a/jdl/converters/json-to-jdl-converter.ts +++ b/jdl/converters/json-to-jdl-converter.ts @@ -53,7 +53,7 @@ export function convertToJDL(directory = '.', output: string | false = 'app.jdl' } else { try { jdlObject = getJDLObjectFromMultipleApplications(directory); - } catch (error) { + } catch { return undefined; } } diff --git a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts index 4e3d33aef488..5cb0422c2846 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts +++ b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts @@ -83,7 +83,7 @@ function init(passedConfiguration: ParsedJDLRoot) { function fillApplications(): void { // TODO: Function which expects two arguments is called with three. - // @ts-expect-error + // @ts-expect-error TODO const jdlApplications: JDLApplication[] = convertApplications(parsedContent.applications, configuration, entityNames); jdlApplications.forEach((jdlApplication: JDLApplication) => { jdlObject.addApplication(jdlApplication); diff --git a/jdl/jhipster/field-types.ts b/jdl/jhipster/field-types.ts index 213c159e8660..001b13507b2b 100644 --- a/jdl/jhipster/field-types.ts +++ b/jdl/jhipster/field-types.ts @@ -139,7 +139,7 @@ export function getIsType(databaseType?: string, callback?: any): (type: any) => isType = () => true; break; default: - callback && callback(); + callback?.(); throw new Error( "The passed database type must either be 'sql', 'mysql', 'mariadb', 'postgresql'," + " 'oracle', 'mssql', 'mongodb', 'couchbase', 'neo4j' or 'cassandra'", diff --git a/jdl/parsing/self-checks/parsing-system-checker.ts b/jdl/parsing/self-checks/parsing-system-checker.ts index a40f70778f1f..9921b259bdca 100644 --- a/jdl/parsing/self-checks/parsing-system-checker.ts +++ b/jdl/parsing/self-checks/parsing-system-checker.ts @@ -42,7 +42,7 @@ function getUselessTokens(usedTokens: any[], allDefinedTokens: any[]) { const usedCategories = uniq(flatMap(usedTokens, 'CATEGORIES')); // TODO: Calling uniq with two parameters is probably a bug. - // @ts-expect-error + // @ts-expect-error TODO const notDirectlyUsedTokens = difference(allDefinedTokens, uniq(usedTokens, usedCategories)); const redundant = reject(notDirectlyUsedTokens, token => { const tokCategories = token.CATEGORIES; diff --git a/jdl/readers/json-reader.ts b/jdl/readers/json-reader.ts index 37f8305949b4..e81fef51960c 100644 --- a/jdl/readers/json-reader.ts +++ b/jdl/readers/json-reader.ts @@ -52,7 +52,7 @@ export default function parseFromDir(dir: string): JDLObject { }); const applicationOptions = readJSONFile(`${dir}/.yo-rc.json`)['generator-jhipster']; - // @ts-expect-error + // @ts-expect-error TODO const jdlObject = convertServerOptionsToJDL(applicationOptions); const convertedJDLObject = convertEntitiesToJDL(entities); return mergeJDLObjects(jdlObject, convertedJDLObject); diff --git a/jdl/utils/format-utils.spec.ts b/jdl/utils/format-utils.spec.ts index fef52acc6beb..46ad90b3ef22 100644 --- a/jdl/utils/format-utils.spec.ts +++ b/jdl/utils/format-utils.spec.ts @@ -19,7 +19,7 @@ import { it, describe } from 'esmocha'; import { expect } from 'chai'; -import formatComment from '../utils/format-utils.js'; +import { formatComment } from '../utils/format-utils.js'; describe('jdl - FormatUtils', () => { describe('formatComment', () => { diff --git a/test-integration/scripts/99-write-matrix.js b/test-integration/scripts/99-write-matrix.js index e47b74cbbc0e..d733b73617dc 100755 --- a/test-integration/scripts/99-write-matrix.js +++ b/test-integration/scripts/99-write-matrix.js @@ -18,6 +18,7 @@ let existing = {}; try { existing = JSON.parse(readFileSync(MATRIX_FILE)); } catch { + // eslint-disable-next-line no-console console.log(`File ${MATRIX_FILE} not found`); existing = { include: [] }; } diff --git a/test/integration-test.spec.ts b/test/integration-test.spec.ts index d7eadae0de9d..1a26c85cd599 100644 --- a/test/integration-test.spec.ts +++ b/test/integration-test.spec.ts @@ -157,7 +157,7 @@ describe('integration-test', () => { }); describe('::entities samples reproducibility', () => { - const changelogDates = []; + const changelogDates: string[] = []; for (const [name, entitySample] of itEntitiesSamplesEntries) { let entityJson = readJsonSync(entitySample); before(() => { diff --git a/testing/helpers.ts b/testing/helpers.ts index 5125ab504f9b..a462ce8f25fe 100644 --- a/testing/helpers.ts +++ b/testing/helpers.ts @@ -307,13 +307,13 @@ plugins { Object.entries(this.sharedSource).map(([name, fn]) => [name, fn.mock.calls.map(args => args[0])]), ); if (sourceCallsArg.addEntitiesToClient) { - sourceCallsArg.addEntitiesToClient = (sourceCallsArg.addEntitiesToClient as any).map(({ application, entities }) => ({ + sourceCallsArg.addEntitiesToClient = sourceCallsArg.addEntitiesToClient.map(({ application, entities }) => ({ application: `Application[${application.baseName}]`, entities: entities.map(entity => `Entity[${entity.name}]`), })); } if (sourceCallsArg.addEntityToCache) { - sourceCallsArg.addEntityToCache = (sourceCallsArg.addEntityToCache as any).map(({ relationships, ...fields }) => ({ + sourceCallsArg.addEntityToCache = sourceCallsArg.addEntityToCache.map(({ relationships, ...fields }) => ({ ...fields, relationships: relationships.map(rel => `Relationship[${rel.relationshipName}]`), })); From dd227b18187456b1598aef5c4d3ba9bd8409d8f9 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 6 Aug 2024 23:45:09 -0300 Subject: [PATCH 174/938] fix test --- test/needle-api/needle-client-react-generator.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/needle-api/needle-client-react-generator.spec.ts b/test/needle-api/needle-client-react-generator.spec.ts index 75af7a3d0786..5f4df3d61c97 100644 --- a/test/needle-api/needle-client-react-generator.spec.ts +++ b/test/needle-api/needle-client-react-generator.spec.ts @@ -1,5 +1,5 @@ -import { before, it, describe } from 'esmocha'; -import { basicHelpers as helpers, result as runResult, getGenerator } from '../../testing/index.js'; +import { before, describe, it } from 'esmocha'; +import { getGenerator, defaultHelpers as helpers, result as runResult } from '../../testing/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; import ReactGenerator from '../../generators/react/index.js'; From 205fb6f31ab61cae9d632295e83db8256031920f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 02:45:19 +0000 Subject: [PATCH 175/938] Bump pinia from 2.2.0 to 2.2.1 in /generators/vue/resources Bumps [pinia](https://github.com/vuejs/pinia) from 2.2.0 to 2.2.1. - [Release notes](https://github.com/vuejs/pinia/releases) - [Commits](https://github.com/vuejs/pinia/compare/pinia@2.2.0...pinia@2.2.1) --- updated-dependencies: - dependency-name: pinia dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 02a390e6d2d4..7ebd260df3de 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -13,7 +13,7 @@ "bootswatch": "4.6.2", "deepmerge": "4.3.1", "js-cookie": "3.0.5", - "pinia": "2.2.0", + "pinia": "2.2.1", "rxjs": "7.8.1", "sockjs-client": "1.6.1", "vue": "3.4.21", From c23e096da694f932df6e2fbdf721e6baabd55dba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 02:45:50 +0000 Subject: [PATCH 176/938] Bump vue-router from 4.4.2 to 4.4.3 in /generators/vue/resources Bumps [vue-router](https://github.com/vuejs/router) from 4.4.2 to 4.4.3. - [Release notes](https://github.com/vuejs/router/releases) - [Commits](https://github.com/vuejs/router/compare/v4.4.2...v4.4.3) --- updated-dependencies: - dependency-name: vue-router dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 02a390e6d2d4..6130af135734 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -18,7 +18,7 @@ "sockjs-client": "1.6.1", "vue": "3.4.21", "vue-i18n": "9.13.1", - "vue-router": "4.4.2" + "vue-router": "4.4.3" }, "devDependencies": { "@eslint/js": "9.8.0", From 0be2a50910da6b26f23cf5cfc652153a29d34cd7 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Wed, 7 Aug 2024 07:53:00 -0300 Subject: [PATCH 177/938] use dependency fixed version --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 22466caaa35d..8a869a1385b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -80,7 +80,7 @@ "cpy-cli": "5.0.0", "ejs-lint": "2.0.0", "eslint-config-prettier": "9.1.0", - "eslint-import-resolver-typescript": "^3.6.1", + "eslint-import-resolver-typescript": "3.6.1", "eslint-plugin-chai-friendly": "1.0.1", "eslint-plugin-prettier": "5.2.1", "esmocha": "1.2.0", diff --git a/package.json b/package.json index d7059908e6cb..9ec7ca68797b 100644 --- a/package.json +++ b/package.json @@ -185,7 +185,7 @@ "cpy-cli": "5.0.0", "ejs-lint": "2.0.0", "eslint-config-prettier": "9.1.0", - "eslint-import-resolver-typescript": "^3.6.1", + "eslint-import-resolver-typescript": "3.6.1", "eslint-plugin-chai-friendly": "1.0.1", "eslint-plugin-prettier": "5.2.1", "esmocha": "1.2.0", From 78c1323bd0225b11fd5bc85589a7892c77da8ed3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 14:59:23 +0000 Subject: [PATCH 178/938] Bump @pinia/testing from 0.1.4 to 0.1.5 in /generators/vue/resources Bumps [@pinia/testing](https://github.com/vuejs/pinia) from 0.1.4 to 0.1.5. - [Release notes](https://github.com/vuejs/pinia/releases) - [Commits](https://github.com/vuejs/pinia/compare/@pinia/testing@0.1.4...@pinia/testing@0.1.5) --- updated-dependencies: - dependency-name: "@pinia/testing" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index c96a93a30bd7..4b2a56abc999 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -23,7 +23,7 @@ "devDependencies": { "@eslint/js": "9.8.0", "@module-federation/utilities": "3.0.3-0", - "@pinia/testing": "0.1.4", + "@pinia/testing": "0.1.5", "@tsconfig/node18": "18.2.4", "@types/node": "20.11.25", "@types/sinon": "17.0.3", From c9d6f2fa503872a3e18568220feb80b18e5ac238 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 14:59:33 +0000 Subject: [PATCH 179/938] Bump docker/build-push-action from 6.5.0 to 6.6.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.5.0 to 6.6.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.5.0...v6.6.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-image-publish-github-registry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-publish-github-registry.yml b/.github/workflows/docker-image-publish-github-registry.yml index 63e5d7e6e64e..d70754e923fb 100644 --- a/.github/workflows/docker-image-publish-github-registry.yml +++ b/.github/workflows/docker-image-publish-github-registry.yml @@ -72,7 +72,7 @@ jobs: images: ghcr.io/${{ github.repository }}${{ (steps.login-hub.outcome == 'success' && ',jhipster/jhipster') || ''}} - name: Build and push Docker image - uses: docker/build-push-action@v6.5.0 + uses: docker/build-push-action@v6.6.0 with: context: . platforms: linux/amd64,linux/arm64 From 6fb985672e74aaed4148403decda1c4438b84bbc Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Wed, 7 Aug 2024 12:33:18 -0300 Subject: [PATCH 180/938] move templates to spring-boot generator templates --- generators/spring-boot/generator.ts | 2 +- .../templates/.devcontainer/Dockerfile.ejs | 0 .../templates/.devcontainer/devcontainer.json.ejs | 0 .../templates/README.md.jhi.spring-boot.ejs | 0 generators/{server => spring-boot}/templates/build.gradle.ejs | 0 .../{server => spring-boot}/templates/gradle.properties.ejs | 0 .../templates/gradle/profile_dev.gradle.ejs | 0 .../templates/gradle/profile_prod.gradle.ejs | 0 .../{server => spring-boot}/templates/gradle/war.gradle.ejs | 0 .../{server => spring-boot}/templates/gradle/zipkin.gradle.ejs | 0 .../templates/micro_services_architecture.md | 0 generators/{server => spring-boot}/templates/package.json.ejs | 0 generators/{server => spring-boot}/templates/pom.xml.ejs | 0 .../{server => spring-boot}/templates/settings.gradle.ejs | 0 .../templates/src/main/java/_package_/Application.java.ejs | 0 .../src/main/java/_package_/ApplicationWebXml.java.ejs | 0 .../_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs | 0 .../_entityPackage_/service/mapper/EntityMapper.java.ejs | 0 .../_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs | 0 .../src/main/java/_package_/aop/logging/LoggingAspect.java.ejs | 0 .../main/java/_package_/config/ApplicationProperties.java.ejs | 0 .../src/main/java/_package_/config/AsyncConfiguration.java.ejs | 0 .../src/main/java/_package_/config/CRLFLogConverter.java.ejs | 0 .../templates/src/main/java/_package_/config/Constants.java.ejs | 0 .../java/_package_/config/DateTimeFormatConfiguration.java.ejs | 0 .../_package_/config/EurekaWorkaroundConfiguration.java.ejs | 0 .../main/java/_package_/config/JacksonConfiguration.java.ejs | 0 .../java/_package_/config/LoggingAspectConfiguration.java.ejs | 0 .../main/java/_package_/config/LoggingConfiguration.java.ejs | 0 .../src/main/java/_package_/config/OAuth2Configuration.java.ejs | 0 .../main/java/_package_/config/OpenApiConfiguration.java.ejs | 0 .../main/java/_package_/config/ReactorConfiguration.java.ejs | 0 .../_package_/config/SecurityConfiguration_imperative.java.ejs | 0 .../_package_/config/SecurityConfiguration_reactive.java.ejs | 0 .../_package_/config/SecurityInMemoryConfiguration.java.ejs | 0 .../java/_package_/config/SecurityJwtConfiguration.java.ejs | 0 .../_package_/config/StaticResourcesWebConfiguration.java.ejs | 0 .../src/main/java/_package_/config/WebConfigurer.java.ejs | 0 .../main/java/_package_/domain/AbstractAuditingEntity.java.ejs | 0 .../src/main/java/_package_/domain/PersistentToken.java.ejs | 0 .../templates/src/main/java/_package_/domain/User.java.ejs | 0 .../java/_package_/management/SecurityMetersService.java.ejs | 0 .../_package_/repository/PersistentTokenRepository.java.ejs | 0 .../main/java/_package_/security/AuthoritiesConstants.java.ejs | 0 .../java/_package_/security/DomainUserDetailsService.java.ejs | 0 .../security/PersistentTokenRememberMeServices.java.ejs | 0 .../src/main/java/_package_/security/SecurityUtils.java.ejs | 0 .../java/_package_/security/SpringSecurityAuditorAware.java.ejs | 0 .../java/_package_/security/UserNotActivatedException.java.ejs | 0 .../java/_package_/security/oauth2/AudienceValidator.java.ejs | 0 .../_package_/security/oauth2/CustomClaimConverter.java.ejs | 0 .../java/_package_/service/EmailAlreadyUsedException.java.ejs | 0 .../java/_package_/service/InvalidPasswordException.java.ejs | 0 .../src/main/java/_package_/service/MailService.java.ejs | 0 .../_package_/service/UsernameAlreadyUsedException.java.ejs | 0 .../src/main/java/_package_/service/dto/AdminUserDTO.java.ejs | 0 .../main/java/_package_/service/dto/PasswordChangeDTO.java.ejs | 0 .../src/main/java/_package_/service/dto/UserDTO.java.ejs | 0 .../src/main/java/_package_/service/mapper/UserMapper.java.ejs | 0 .../web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs | 0 .../_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs | 0 .../java/_package_/web/filter/SpaWebFilter_imperative.java.ejs | 0 .../java/_package_/web/filter/SpaWebFilter_reactive.java.ejs | 0 .../src/main/java/_package_/web/rest/AccountResource.java.ejs | 0 .../java/_package_/web/rest/AccountResource_oauth2.java.ejs | 0 .../web/rest/AccountResource_skipUserManagement.java.ejs | 0 .../src/main/java/_package_/web/rest/AuthInfoResource.java.ejs | 0 .../java/_package_/web/rest/AuthenticateController.java.ejs | 0 .../java/_package_/web/rest/LogoutResource_imperative.java.ejs | 0 .../java/_package_/web/rest/LogoutResource_reactive.java.ejs | 0 .../_package_/web/rest/errors/BadRequestAlertException.java.ejs | 0 .../web/rest/errors/EmailAlreadyUsedException.java.ejs | 0 .../main/java/_package_/web/rest/errors/ErrorConstants.java.ejs | 0 .../java/_package_/web/rest/errors/ExceptionTranslator.java.ejs | 0 .../main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs | 0 .../_package_/web/rest/errors/InvalidPasswordException.java.ejs | 0 .../web/rest/errors/LoginAlreadyUsedException.java.ejs | 0 .../main/java/_package_/web/rest/vm/KeyAndPasswordVM.java.ejs | 0 .../src/main/java/_package_/web/rest/vm/LoginVM.java.ejs | 0 .../src/main/java/_package_/web/rest/vm/ManagedUserVM.java.ejs | 0 .../templates/src/main/resources/banner-no-color.txt | 0 .../templates/src/main/resources/banner.txt | 0 .../templates/src/main/resources/banner_react.txt | 0 .../templates/src/main/resources/banner_vue.txt | 0 .../templates/src/main/resources/config/application-dev.yml.ejs | 0 .../src/main/resources/config/application-prod.yml.ejs | 0 .../templates/src/main/resources/config/application-tls.yml.ejs | 0 .../templates/src/main/resources/config/application.yml.ejs | 0 .../templates/src/main/resources/config/bootstrap-prod.yml.ejs | 0 .../templates/src/main/resources/config/bootstrap.yml.ejs | 0 .../templates/src/main/resources/i18n/messages.properties.ejs | 0 .../templates/src/main/resources/logback-spring.xml.ejs | 0 .../src/main/resources/static/index_microservices.html.ejs | 0 .../templates/src/main/resources/templates/error.html.ejs | 0 .../src/main/resources/templates/mail/activationEmail.html.ejs | 0 .../src/main/resources/templates/mail/creationEmail.html.ejs | 0 .../main/resources/templates/mail/passwordResetEmail.html.ejs | 0 .../templates/src/test/java/_package_/IntegrationTest.java.ejs | 0 .../src/test/java/_package_/TechnicalStructureTest.java.ejs | 0 .../_entityPackage_/service/dto/_dtoClass_Test.java.ejs | 0 .../service/mapper/_entityClass_MapperTest.java.ejs | 0 .../test/java/_package_/config/AsyncSyncConfiguration.java.ejs | 0 .../test/java/_package_/config/CRLFLogConverterTest.java.ejs | 0 .../_package_/config/JHipsterBlockHoundIntegration.java.ejs | 0 .../java/_package_/config/SpringBootTestClassOrderer.java.ejs | 0 .../_package_/config/StaticResourcesWebConfigurerTest.java.ejs | 0 .../TestContainersSpringContextCustomizerFactory.java.ejs | 0 .../java/_package_/config/TestSecurityConfiguration.java.ejs | 0 .../src/test/java/_package_/config/WebConfigurerTest.java.ejs | 0 .../java/_package_/config/WebConfigurerTestController.java.ejs | 0 .../_package_/management/SecurityMetersServiceTests.java.ejs | 0 .../java/_package_/security/DomainUserDetailsServiceIT.java.ejs | 0 .../security/SecurityUtilsUnitTest_imperative.java.ejs | 0 .../_package_/security/SecurityUtilsUnitTest_reactive.java.ejs | 0 .../security/jwt/AuthenticationIntegrationTest.java.ejs | 0 .../_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs | 0 .../_package_/security/jwt/TestAuthenticationResource.java.ejs | 0 .../java/_package_/security/jwt/TokenAuthenticationIT.java.ejs | 0 .../security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs | 0 .../_package_/security/oauth2/AudienceValidatorTest.java.ejs | 0 .../_package_/security/oauth2/CustomClaimConverterIT.java.ejs | 0 .../src/test/java/_package_/service/MailServiceIT.java.ejs | 0 .../test/java/_package_/service/mapper/UserMapperTest.java.ejs | 0 .../src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs | 0 .../_package_/web/filter/SpaWebFilterIT_imperative.java.ejs | 0 .../java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs | 0 .../web/filter/SpaWebFilterTestController_reactive.java.ejs | 0 .../src/test/java/_package_/web/rest/AccountResourceIT.java.ejs | 0 .../java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs | 0 .../web/rest/AccountResourceIT_skipUserManagement.java.ejs | 0 .../java/_package_/web/rest/AuthenticateControllerIT.java.ejs | 0 .../src/test/java/_package_/web/rest/LogoutResourceIT.java.ejs | 0 .../src/test/java/_package_/web/rest/TestUtil.java.ejs | 0 .../_package_/web/rest/WithUnauthenticatedMockUser.java.ejs | 0 .../web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs | 0 .../web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs | 0 .../web/rest/errors/ExceptionTranslatorTestController.java.ejs | 0 .../reactor.blockhound.integration.BlockHoundIntegration.ejs | 0 .../templates/src/test/resources/config/application.yml.ejs | 0 .../templates/src/test/resources/config/bootstrap.yml.ejs | 0 .../src/test/resources/i18n/messages_en.properties.ejs | 0 .../templates/src/test/resources/junit-platform.properties.ejs | 0 .../templates/src/test/resources/logback.xml.ejs | 0 .../src/test/resources/templates/mail/activationEmail.html.ejs | 0 .../src/test/resources/templates/mail/creationEmail.html.ejs | 0 .../test/resources/templates/mail/passwordResetEmail.html.ejs | 0 .../src/test/resources/templates/mail/testEmail.html.ejs | 0 147 files changed, 1 insertion(+), 1 deletion(-) rename generators/{server => spring-boot}/templates/.devcontainer/Dockerfile.ejs (100%) rename generators/{server => spring-boot}/templates/.devcontainer/devcontainer.json.ejs (100%) rename generators/{server => spring-boot}/templates/README.md.jhi.spring-boot.ejs (100%) rename generators/{server => spring-boot}/templates/build.gradle.ejs (100%) rename generators/{server => spring-boot}/templates/gradle.properties.ejs (100%) rename generators/{server => spring-boot}/templates/gradle/profile_dev.gradle.ejs (100%) rename generators/{server => spring-boot}/templates/gradle/profile_prod.gradle.ejs (100%) rename generators/{server => spring-boot}/templates/gradle/war.gradle.ejs (100%) rename generators/{server => spring-boot}/templates/gradle/zipkin.gradle.ejs (100%) rename generators/{server => spring-boot}/templates/micro_services_architecture.md (100%) rename generators/{server => spring-boot}/templates/package.json.ejs (100%) rename generators/{server => spring-boot}/templates/pom.xml.ejs (100%) rename generators/{server => spring-boot}/templates/settings.gradle.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/Application.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/ApplicationWebXml.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/_entityPackage_/service/mapper/EntityMapper.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/Constants.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/DateTimeFormatConfiguration.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/EurekaWorkaroundConfiguration.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/LoggingAspectConfiguration.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/LoggingConfiguration.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/OAuth2Configuration.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/OpenApiConfiguration.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/ReactorConfiguration.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/SecurityInMemoryConfiguration.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/config/WebConfigurer.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/domain/AbstractAuditingEntity.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/domain/PersistentToken.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/domain/User.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/repository/PersistentTokenRepository.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/security/SecurityUtils.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/security/SpringSecurityAuditorAware.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/security/UserNotActivatedException.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/service/MailService.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/service/dto/AdminUserDTO.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/filter/SpaWebFilter_reactive.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/errors/EmailAlreadyUsedException.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/errors/LoginAlreadyUsedException.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/vm/KeyAndPasswordVM.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/vm/LoginVM.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/java/_package_/web/rest/vm/ManagedUserVM.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/resources/banner-no-color.txt (100%) rename generators/{server => spring-boot}/templates/src/main/resources/banner.txt (100%) rename generators/{server => spring-boot}/templates/src/main/resources/banner_react.txt (100%) rename generators/{server => spring-boot}/templates/src/main/resources/banner_vue.txt (100%) rename generators/{server => spring-boot}/templates/src/main/resources/config/application-dev.yml.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/resources/config/application-prod.yml.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/resources/config/application-tls.yml.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/resources/config/application.yml.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/resources/config/bootstrap-prod.yml.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/resources/config/bootstrap.yml.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/resources/i18n/messages.properties.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/resources/logback-spring.xml.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/resources/static/index_microservices.html.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/resources/templates/error.html.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/resources/templates/mail/activationEmail.html.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/resources/templates/mail/creationEmail.html.ejs (100%) rename generators/{server => spring-boot}/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/IntegrationTest.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/config/AsyncSyncConfiguration.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/config/CRLFLogConverterTest.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/config/JHipsterBlockHoundIntegration.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/config/SpringBootTestClassOrderer.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/config/TestSecurityConfiguration.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/security/jwt/TokenAuthenticationIT.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/security/oauth2/AudienceValidatorTest.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/service/MailServiceIT.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_imperative.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/web/rest/AccountResourceIT_skipUserManagement.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/web/rest/AuthenticateControllerIT.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/web/rest/LogoutResourceIT.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/resources/config/application.yml.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/resources/config/bootstrap.yml.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/resources/i18n/messages_en.properties.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/resources/junit-platform.properties.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/resources/logback.xml.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/resources/templates/mail/activationEmail.html.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/resources/templates/mail/creationEmail.html.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs (100%) rename generators/{server => spring-boot}/templates/src/test/resources/templates/mail/testEmail.html.ejs (100%) diff --git a/generators/spring-boot/generator.ts b/generators/spring-boot/generator.ts index 53c37d95e7a9..3d4771fee2ca 100644 --- a/generators/spring-boot/generator.ts +++ b/generators/spring-boot/generator.ts @@ -453,7 +453,7 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) { async writeFiles({ application }) { return this.writeFiles({ sections: serverFiles, - rootTemplatesPath: ['', '../../server/templates/', '../../java/generators/domain/templates/'], + rootTemplatesPath: ['', '../../java/generators/domain/templates/'], context: application, }); }, diff --git a/generators/server/templates/.devcontainer/Dockerfile.ejs b/generators/spring-boot/templates/.devcontainer/Dockerfile.ejs similarity index 100% rename from generators/server/templates/.devcontainer/Dockerfile.ejs rename to generators/spring-boot/templates/.devcontainer/Dockerfile.ejs diff --git a/generators/server/templates/.devcontainer/devcontainer.json.ejs b/generators/spring-boot/templates/.devcontainer/devcontainer.json.ejs similarity index 100% rename from generators/server/templates/.devcontainer/devcontainer.json.ejs rename to generators/spring-boot/templates/.devcontainer/devcontainer.json.ejs diff --git a/generators/server/templates/README.md.jhi.spring-boot.ejs b/generators/spring-boot/templates/README.md.jhi.spring-boot.ejs similarity index 100% rename from generators/server/templates/README.md.jhi.spring-boot.ejs rename to generators/spring-boot/templates/README.md.jhi.spring-boot.ejs diff --git a/generators/server/templates/build.gradle.ejs b/generators/spring-boot/templates/build.gradle.ejs similarity index 100% rename from generators/server/templates/build.gradle.ejs rename to generators/spring-boot/templates/build.gradle.ejs diff --git a/generators/server/templates/gradle.properties.ejs b/generators/spring-boot/templates/gradle.properties.ejs similarity index 100% rename from generators/server/templates/gradle.properties.ejs rename to generators/spring-boot/templates/gradle.properties.ejs diff --git a/generators/server/templates/gradle/profile_dev.gradle.ejs b/generators/spring-boot/templates/gradle/profile_dev.gradle.ejs similarity index 100% rename from generators/server/templates/gradle/profile_dev.gradle.ejs rename to generators/spring-boot/templates/gradle/profile_dev.gradle.ejs diff --git a/generators/server/templates/gradle/profile_prod.gradle.ejs b/generators/spring-boot/templates/gradle/profile_prod.gradle.ejs similarity index 100% rename from generators/server/templates/gradle/profile_prod.gradle.ejs rename to generators/spring-boot/templates/gradle/profile_prod.gradle.ejs diff --git a/generators/server/templates/gradle/war.gradle.ejs b/generators/spring-boot/templates/gradle/war.gradle.ejs similarity index 100% rename from generators/server/templates/gradle/war.gradle.ejs rename to generators/spring-boot/templates/gradle/war.gradle.ejs diff --git a/generators/server/templates/gradle/zipkin.gradle.ejs b/generators/spring-boot/templates/gradle/zipkin.gradle.ejs similarity index 100% rename from generators/server/templates/gradle/zipkin.gradle.ejs rename to generators/spring-boot/templates/gradle/zipkin.gradle.ejs diff --git a/generators/server/templates/micro_services_architecture.md b/generators/spring-boot/templates/micro_services_architecture.md similarity index 100% rename from generators/server/templates/micro_services_architecture.md rename to generators/spring-boot/templates/micro_services_architecture.md diff --git a/generators/server/templates/package.json.ejs b/generators/spring-boot/templates/package.json.ejs similarity index 100% rename from generators/server/templates/package.json.ejs rename to generators/spring-boot/templates/package.json.ejs diff --git a/generators/server/templates/pom.xml.ejs b/generators/spring-boot/templates/pom.xml.ejs similarity index 100% rename from generators/server/templates/pom.xml.ejs rename to generators/spring-boot/templates/pom.xml.ejs diff --git a/generators/server/templates/settings.gradle.ejs b/generators/spring-boot/templates/settings.gradle.ejs similarity index 100% rename from generators/server/templates/settings.gradle.ejs rename to generators/spring-boot/templates/settings.gradle.ejs diff --git a/generators/server/templates/src/main/java/_package_/Application.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/Application.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/Application.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/Application.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/ApplicationWebXml.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/ApplicationWebXml.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/ApplicationWebXml.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/ApplicationWebXml.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/_entityPackage_/service/mapper/EntityMapper.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/mapper/EntityMapper.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/_entityPackage_/service/mapper/EntityMapper.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/mapper/EntityMapper.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/Constants.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/Constants.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/Constants.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/Constants.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/DateTimeFormatConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/DateTimeFormatConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/DateTimeFormatConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/DateTimeFormatConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/EurekaWorkaroundConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/EurekaWorkaroundConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/EurekaWorkaroundConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/EurekaWorkaroundConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/LoggingAspectConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/LoggingAspectConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/LoggingAspectConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/LoggingAspectConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/LoggingConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/LoggingConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/LoggingConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/LoggingConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/OAuth2Configuration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/OAuth2Configuration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/OAuth2Configuration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/OAuth2Configuration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/OpenApiConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/OpenApiConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/OpenApiConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/OpenApiConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/ReactorConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/ReactorConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/ReactorConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/ReactorConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/SecurityInMemoryConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityInMemoryConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/SecurityInMemoryConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/SecurityInMemoryConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/config/WebConfigurer.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/WebConfigurer.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/config/WebConfigurer.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/config/WebConfigurer.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/domain/AbstractAuditingEntity.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/domain/AbstractAuditingEntity.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/domain/AbstractAuditingEntity.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/domain/AbstractAuditingEntity.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/domain/PersistentToken.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/domain/PersistentToken.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/domain/PersistentToken.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/domain/PersistentToken.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/domain/User.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/domain/User.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/domain/User.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/domain/User.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/repository/PersistentTokenRepository.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/repository/PersistentTokenRepository.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/repository/PersistentTokenRepository.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/repository/PersistentTokenRepository.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/SecurityUtils.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/SecurityUtils.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/SecurityUtils.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/SecurityUtils.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/SpringSecurityAuditorAware.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/SpringSecurityAuditorAware.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/SpringSecurityAuditorAware.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/SpringSecurityAuditorAware.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/UserNotActivatedException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/UserNotActivatedException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/UserNotActivatedException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/UserNotActivatedException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/MailService.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/MailService.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/MailService.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/MailService.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/dto/AdminUserDTO.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/dto/AdminUserDTO.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/dto/AdminUserDTO.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/dto/AdminUserDTO.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/filter/SpaWebFilter_reactive.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/filter/SpaWebFilter_reactive.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/filter/SpaWebFilter_reactive.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/filter/SpaWebFilter_reactive.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/EmailAlreadyUsedException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/EmailAlreadyUsedException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/errors/EmailAlreadyUsedException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/EmailAlreadyUsedException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/LoginAlreadyUsedException.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/LoginAlreadyUsedException.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/errors/LoginAlreadyUsedException.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/LoginAlreadyUsedException.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/vm/KeyAndPasswordVM.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/vm/KeyAndPasswordVM.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/vm/KeyAndPasswordVM.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/vm/KeyAndPasswordVM.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/vm/LoginVM.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/vm/LoginVM.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/vm/LoginVM.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/vm/LoginVM.java.ejs diff --git a/generators/server/templates/src/main/java/_package_/web/rest/vm/ManagedUserVM.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/vm/ManagedUserVM.java.ejs similarity index 100% rename from generators/server/templates/src/main/java/_package_/web/rest/vm/ManagedUserVM.java.ejs rename to generators/spring-boot/templates/src/main/java/_package_/web/rest/vm/ManagedUserVM.java.ejs diff --git a/generators/server/templates/src/main/resources/banner-no-color.txt b/generators/spring-boot/templates/src/main/resources/banner-no-color.txt similarity index 100% rename from generators/server/templates/src/main/resources/banner-no-color.txt rename to generators/spring-boot/templates/src/main/resources/banner-no-color.txt diff --git a/generators/server/templates/src/main/resources/banner.txt b/generators/spring-boot/templates/src/main/resources/banner.txt similarity index 100% rename from generators/server/templates/src/main/resources/banner.txt rename to generators/spring-boot/templates/src/main/resources/banner.txt diff --git a/generators/server/templates/src/main/resources/banner_react.txt b/generators/spring-boot/templates/src/main/resources/banner_react.txt similarity index 100% rename from generators/server/templates/src/main/resources/banner_react.txt rename to generators/spring-boot/templates/src/main/resources/banner_react.txt diff --git a/generators/server/templates/src/main/resources/banner_vue.txt b/generators/spring-boot/templates/src/main/resources/banner_vue.txt similarity index 100% rename from generators/server/templates/src/main/resources/banner_vue.txt rename to generators/spring-boot/templates/src/main/resources/banner_vue.txt diff --git a/generators/server/templates/src/main/resources/config/application-dev.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/application-dev.yml.ejs similarity index 100% rename from generators/server/templates/src/main/resources/config/application-dev.yml.ejs rename to generators/spring-boot/templates/src/main/resources/config/application-dev.yml.ejs diff --git a/generators/server/templates/src/main/resources/config/application-prod.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/application-prod.yml.ejs similarity index 100% rename from generators/server/templates/src/main/resources/config/application-prod.yml.ejs rename to generators/spring-boot/templates/src/main/resources/config/application-prod.yml.ejs diff --git a/generators/server/templates/src/main/resources/config/application-tls.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/application-tls.yml.ejs similarity index 100% rename from generators/server/templates/src/main/resources/config/application-tls.yml.ejs rename to generators/spring-boot/templates/src/main/resources/config/application-tls.yml.ejs diff --git a/generators/server/templates/src/main/resources/config/application.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/application.yml.ejs similarity index 100% rename from generators/server/templates/src/main/resources/config/application.yml.ejs rename to generators/spring-boot/templates/src/main/resources/config/application.yml.ejs diff --git a/generators/server/templates/src/main/resources/config/bootstrap-prod.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/bootstrap-prod.yml.ejs similarity index 100% rename from generators/server/templates/src/main/resources/config/bootstrap-prod.yml.ejs rename to generators/spring-boot/templates/src/main/resources/config/bootstrap-prod.yml.ejs diff --git a/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/bootstrap.yml.ejs similarity index 100% rename from generators/server/templates/src/main/resources/config/bootstrap.yml.ejs rename to generators/spring-boot/templates/src/main/resources/config/bootstrap.yml.ejs diff --git a/generators/server/templates/src/main/resources/i18n/messages.properties.ejs b/generators/spring-boot/templates/src/main/resources/i18n/messages.properties.ejs similarity index 100% rename from generators/server/templates/src/main/resources/i18n/messages.properties.ejs rename to generators/spring-boot/templates/src/main/resources/i18n/messages.properties.ejs diff --git a/generators/server/templates/src/main/resources/logback-spring.xml.ejs b/generators/spring-boot/templates/src/main/resources/logback-spring.xml.ejs similarity index 100% rename from generators/server/templates/src/main/resources/logback-spring.xml.ejs rename to generators/spring-boot/templates/src/main/resources/logback-spring.xml.ejs diff --git a/generators/server/templates/src/main/resources/static/index_microservices.html.ejs b/generators/spring-boot/templates/src/main/resources/static/index_microservices.html.ejs similarity index 100% rename from generators/server/templates/src/main/resources/static/index_microservices.html.ejs rename to generators/spring-boot/templates/src/main/resources/static/index_microservices.html.ejs diff --git a/generators/server/templates/src/main/resources/templates/error.html.ejs b/generators/spring-boot/templates/src/main/resources/templates/error.html.ejs similarity index 100% rename from generators/server/templates/src/main/resources/templates/error.html.ejs rename to generators/spring-boot/templates/src/main/resources/templates/error.html.ejs diff --git a/generators/server/templates/src/main/resources/templates/mail/activationEmail.html.ejs b/generators/spring-boot/templates/src/main/resources/templates/mail/activationEmail.html.ejs similarity index 100% rename from generators/server/templates/src/main/resources/templates/mail/activationEmail.html.ejs rename to generators/spring-boot/templates/src/main/resources/templates/mail/activationEmail.html.ejs diff --git a/generators/server/templates/src/main/resources/templates/mail/creationEmail.html.ejs b/generators/spring-boot/templates/src/main/resources/templates/mail/creationEmail.html.ejs similarity index 100% rename from generators/server/templates/src/main/resources/templates/mail/creationEmail.html.ejs rename to generators/spring-boot/templates/src/main/resources/templates/mail/creationEmail.html.ejs diff --git a/generators/server/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs b/generators/spring-boot/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs similarity index 100% rename from generators/server/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs rename to generators/spring-boot/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs diff --git a/generators/server/templates/src/test/java/_package_/IntegrationTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/IntegrationTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/IntegrationTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/IntegrationTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/AsyncSyncConfiguration.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/AsyncSyncConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/AsyncSyncConfiguration.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/AsyncSyncConfiguration.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/CRLFLogConverterTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/CRLFLogConverterTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/CRLFLogConverterTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/CRLFLogConverterTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/JHipsterBlockHoundIntegration.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/JHipsterBlockHoundIntegration.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/JHipsterBlockHoundIntegration.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/JHipsterBlockHoundIntegration.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/SpringBootTestClassOrderer.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/SpringBootTestClassOrderer.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/SpringBootTestClassOrderer.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/SpringBootTestClassOrderer.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/TestSecurityConfiguration.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/TestSecurityConfiguration.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/TestSecurityConfiguration.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/TestSecurityConfiguration.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/jwt/TokenAuthenticationIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/jwt/TokenAuthenticationIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/oauth2/AudienceValidatorTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/oauth2/AudienceValidatorTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/oauth2/AudienceValidatorTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/oauth2/AudienceValidatorTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/service/MailServiceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/service/MailServiceIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/service/MailServiceIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/service/MailServiceIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_imperative.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_imperative.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_imperative.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_imperative.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT_skipUserManagement.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT_skipUserManagement.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT_skipUserManagement.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT_skipUserManagement.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/AuthenticateControllerIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/AuthenticateControllerIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/AuthenticateControllerIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/AuthenticateControllerIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/LogoutResourceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/LogoutResourceIT.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/LogoutResourceIT.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/LogoutResourceIT.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs diff --git a/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs similarity index 100% rename from generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs diff --git a/generators/server/templates/src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration.ejs b/generators/spring-boot/templates/src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration.ejs similarity index 100% rename from generators/server/templates/src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration.ejs rename to generators/spring-boot/templates/src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration.ejs diff --git a/generators/server/templates/src/test/resources/config/application.yml.ejs b/generators/spring-boot/templates/src/test/resources/config/application.yml.ejs similarity index 100% rename from generators/server/templates/src/test/resources/config/application.yml.ejs rename to generators/spring-boot/templates/src/test/resources/config/application.yml.ejs diff --git a/generators/server/templates/src/test/resources/config/bootstrap.yml.ejs b/generators/spring-boot/templates/src/test/resources/config/bootstrap.yml.ejs similarity index 100% rename from generators/server/templates/src/test/resources/config/bootstrap.yml.ejs rename to generators/spring-boot/templates/src/test/resources/config/bootstrap.yml.ejs diff --git a/generators/server/templates/src/test/resources/i18n/messages_en.properties.ejs b/generators/spring-boot/templates/src/test/resources/i18n/messages_en.properties.ejs similarity index 100% rename from generators/server/templates/src/test/resources/i18n/messages_en.properties.ejs rename to generators/spring-boot/templates/src/test/resources/i18n/messages_en.properties.ejs diff --git a/generators/server/templates/src/test/resources/junit-platform.properties.ejs b/generators/spring-boot/templates/src/test/resources/junit-platform.properties.ejs similarity index 100% rename from generators/server/templates/src/test/resources/junit-platform.properties.ejs rename to generators/spring-boot/templates/src/test/resources/junit-platform.properties.ejs diff --git a/generators/server/templates/src/test/resources/logback.xml.ejs b/generators/spring-boot/templates/src/test/resources/logback.xml.ejs similarity index 100% rename from generators/server/templates/src/test/resources/logback.xml.ejs rename to generators/spring-boot/templates/src/test/resources/logback.xml.ejs diff --git a/generators/server/templates/src/test/resources/templates/mail/activationEmail.html.ejs b/generators/spring-boot/templates/src/test/resources/templates/mail/activationEmail.html.ejs similarity index 100% rename from generators/server/templates/src/test/resources/templates/mail/activationEmail.html.ejs rename to generators/spring-boot/templates/src/test/resources/templates/mail/activationEmail.html.ejs diff --git a/generators/server/templates/src/test/resources/templates/mail/creationEmail.html.ejs b/generators/spring-boot/templates/src/test/resources/templates/mail/creationEmail.html.ejs similarity index 100% rename from generators/server/templates/src/test/resources/templates/mail/creationEmail.html.ejs rename to generators/spring-boot/templates/src/test/resources/templates/mail/creationEmail.html.ejs diff --git a/generators/server/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs b/generators/spring-boot/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs similarity index 100% rename from generators/server/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs rename to generators/spring-boot/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs diff --git a/generators/server/templates/src/test/resources/templates/mail/testEmail.html.ejs b/generators/spring-boot/templates/src/test/resources/templates/mail/testEmail.html.ejs similarity index 100% rename from generators/server/templates/src/test/resources/templates/mail/testEmail.html.ejs rename to generators/spring-boot/templates/src/test/resources/templates/mail/testEmail.html.ejs From d352d0e87d7ce6682c4ccda01c1149eb7a877ee4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 00:14:59 +0000 Subject: [PATCH 181/938] Bump hazelcast/management-center in /generators/server/resources Bumps hazelcast/management-center from 5.5.0 to 5.5.1. --- updated-dependencies: - dependency-name: hazelcast/management-center dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/server/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile index f41c7df7affd..22d31c4cd253 100644 --- a/generators/server/resources/Dockerfile +++ b/generators/server/resources/Dockerfile @@ -33,7 +33,7 @@ LABEL ALIAS=mssql FROM neo4j:5.22.0 -FROM hazelcast/management-center:5.5.0 +FROM hazelcast/management-center:5.5.1 LABEL ALIAS=hazelcast FROM memcached:1.6.29-alpine From a48c78a053497fc9dd23434317fa23024a7a6b80 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 02:17:09 +0000 Subject: [PATCH 182/938] Bump vite from 5.3.5 to 5.4.0 in /generators/vue/resources Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.3.5 to 5.4.0. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/create-vite@5.4.0/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 4b2a56abc999..5a2077ba3600 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -57,7 +57,7 @@ "ts-loader": "9.5.1", "typescript": "5.5.4", "typescript-eslint": "8.0.1", - "vite": "5.3.5", + "vite": "5.4.0", "vite-plugin-static-copy": "1.0.6", "vitest": "2.0.5", "vitest-sonar-reporter": "2.0.0", From 373ddd798516664421e83c4ca2a4ffe41cbc2899 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 03:29:47 +0000 Subject: [PATCH 183/938] Bump the angular group in /generators/angular/resources with 2 updates Bumps the angular group in /generators/angular/resources with 2 updates: [@angular/common](https://github.com/angular/angular/tree/HEAD/packages/common) and [@angular/cli](https://github.com/angular/angular-cli). Updates `@angular/common` from 18.1.3 to 18.1.4 - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/18.1.4/packages/common) Updates `@angular/cli` from 18.1.3 to 18.1.4 - [Release notes](https://github.com/angular/angular-cli/releases) - [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular-cli/compare/18.1.3...18.1.4) --- updated-dependencies: - dependency-name: "@angular/common" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: angular - dependency-name: "@angular/cli" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: angular ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 75aadb301ce8..b5f576808991 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "@angular/common": "18.1.3", + "@angular/common": "18.1.4", "@fortawesome/angular-fontawesome": "0.15.0", "@fortawesome/fontawesome-svg-core": "6.6.0", "@fortawesome/free-solid-svg-icons": "6.6.0", @@ -23,7 +23,7 @@ "@angular-architects/module-federation-runtime": "18.0.4", "@angular-builders/custom-webpack": "18.0.0", "@angular-builders/jest": "18.0.0", - "@angular/cli": "18.1.3", + "@angular/cli": "18.1.4", "@types/jest": "29.5.12", "@types/node": "20.11.25", "@types/sockjs-client": "1.5.4", From 23d48ae243153491231a6b44b6c6047e6c20566d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 07:45:02 +0000 Subject: [PATCH 184/938] Bump lighthouse from 12.1.0 to 12.2.0 in /generators/client/resources Bumps [lighthouse](https://github.com/GoogleChrome/lighthouse) from 12.1.0 to 12.2.0. - [Release notes](https://github.com/GoogleChrome/lighthouse/releases) - [Changelog](https://github.com/GoogleChrome/lighthouse/blob/main/changelog.md) - [Commits](https://github.com/GoogleChrome/lighthouse/compare/v12.1.0...v12.2.0) --- updated-dependencies: - dependency-name: lighthouse dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/client/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/resources/package.json b/generators/client/resources/package.json index c971ab1c3ca4..0ed737d3dcfa 100644 --- a/generators/client/resources/package.json +++ b/generators/client/resources/package.json @@ -9,7 +9,7 @@ "cypress": "13.13.2", "cypress-audit": "1.1.0", "eslint-plugin-cypress": "3.4.0", - "lighthouse": "12.1.0", + "lighthouse": "12.2.0", "nyc": "17.0.0", "swagger-ui-dist": "5.17.14" } From 93bee2c8ac201291a7a9862231b245cae7203eaa Mon Sep 17 00:00:00 2001 From: Quentin Date: Tue, 6 Aug 2024 22:02:48 +0200 Subject: [PATCH 185/938] Upgrade org.liquibase.gradle 3.0.0 --- generators/app/__snapshots__/generator.spec.ts.snap | 3 +++ generators/liquibase/generator.ts | 7 ++++++- generators/server/resources/gradle/libs.versions.toml | 4 +++- generators/spring-boot/templates/settings.gradle.ejs | 10 ++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/generators/app/__snapshots__/generator.spec.ts.snap b/generators/app/__snapshots__/generator.spec.ts.snap index 654289992775..8ea4e3699971 100644 --- a/generators/app/__snapshots__/generator.spec.ts.snap +++ b/generators/app/__snapshots__/generator.spec.ts.snap @@ -509,6 +509,7 @@ exports[`generator - app with default config should match snapshot 1`] = ` "gradle-enterprise": "'GRADLE-ENTERPRISE-VERSION'", "gradle-git-properties": "'GRADLE-GIT-PROPERTIES-VERSION'", "gradle-liquibase": "'GRADLE-LIQUIBASE-VERSION'", + "gradle-liquibase-core": "'GRADLE-LIQUIBASE-CORE-VERSION'", "gradle-modernizer-plugin": "'GRADLE-MODERNIZER-PLUGIN-VERSION'", "gradle-openapi-generator": "'GRADLE-OPENAPI-GENERATOR-VERSION'", "gradle-sonarqube": "'GRADLE-SONARQUBE-VERSION'", @@ -1127,6 +1128,7 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "gradle-enterprise": "'GRADLE-ENTERPRISE-VERSION'", "gradle-git-properties": "'GRADLE-GIT-PROPERTIES-VERSION'", "gradle-liquibase": "'GRADLE-LIQUIBASE-VERSION'", + "gradle-liquibase-core": "'GRADLE-LIQUIBASE-CORE-VERSION'", "gradle-modernizer-plugin": "'GRADLE-MODERNIZER-PLUGIN-VERSION'", "gradle-openapi-generator": "'GRADLE-OPENAPI-GENERATOR-VERSION'", "gradle-sonarqube": "'GRADLE-SONARQUBE-VERSION'", @@ -1739,6 +1741,7 @@ exports[`generator - app with microservice should match snapshot 1`] = ` "gradle-enterprise": "'GRADLE-ENTERPRISE-VERSION'", "gradle-git-properties": "'GRADLE-GIT-PROPERTIES-VERSION'", "gradle-liquibase": "'GRADLE-LIQUIBASE-VERSION'", + "gradle-liquibase-core": "'GRADLE-LIQUIBASE-CORE-VERSION'", "gradle-modernizer-plugin": "'GRADLE-MODERNIZER-PLUGIN-VERSION'", "gradle-openapi-generator": "'GRADLE-OPENAPI-GENERATOR-VERSION'", "gradle-sonarqube": "'GRADLE-SONARQUBE-VERSION'", diff --git a/generators/liquibase/generator.ts b/generators/liquibase/generator.ts index 5031644822cd..dcaeeb76e05d 100644 --- a/generators/liquibase/generator.ts +++ b/generators/liquibase/generator.ts @@ -482,7 +482,11 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator { throw new Error('Some application fields are be mandatory'); } - const { liquibase: liquibaseVersion, 'gradle-liquibase': gradleLiquibaseVersion } = application.javaDependencies; + const { + liquibase: liquibaseVersion, + 'gradle-liquibase': gradleLiquibaseVersion, + 'gradle-liquibase-core': gradleLiquibaseCoreVersion, + } = application.javaDependencies; if (!liquibaseVersion) { this.log.warn('liquibaseVersion is required by gradle-liquibase-plugin, make sure to add it to your dependencies'); } else { @@ -491,6 +495,7 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator { source.addGradleProperty?.({ property: 'liquibaseTaskPrefix', value: 'liquibase' }); source.addGradleProperty?.({ property: 'liquibasePluginVersion', value: gradleLiquibaseVersion }); + source.addGradleProperty?.({ property: 'liquibaseCoreVersion', value: gradleLiquibaseCoreVersion }); source.applyFromGradle?.({ script: 'gradle/liquibase.gradle' }); source.addGradlePlugin?.({ id: 'org.liquibase.gradle' }); diff --git a/generators/server/resources/gradle/libs.versions.toml b/generators/server/resources/gradle/libs.versions.toml index 69ef0f91215b..b86d19950c33 100644 --- a/generators/server/resources/gradle/libs.versions.toml +++ b/generators/server/resources/gradle/libs.versions.toml @@ -21,7 +21,9 @@ gradle-git-properties = { id = 'com.gorylenko.gradle-git-properties', version = node-gradle = { id = 'com.github.node-gradle.node', version = '7.0.2' } -gradle-liquibase = { id = 'org.liquibase.gradle', version = '2.2.2' } +gradle-liquibase = { id = 'org.liquibase.gradle', version = '3.0.0' } + +gradle-liquibase-core = { id = 'org.liquibase', version = '4.27.0' } gradle-sonarqube = { id = 'org.sonarqube', version = '5.1.0.4882' } diff --git a/generators/spring-boot/templates/settings.gradle.ejs b/generators/spring-boot/templates/settings.gradle.ejs index 19600935ebac..f8b7dcda1b47 100644 --- a/generators/spring-boot/templates/settings.gradle.ejs +++ b/generators/spring-boot/templates/settings.gradle.ejs @@ -26,6 +26,16 @@ pluginManagement { <%_ } _%> // jhipster-needle-gradle-plugin-management-repositories - JHipster will add additional entries here } +<%_ if (databaseMigrationLiquibase) { _%> + buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath group: 'org.liquibase', name: 'liquibase-core', version: "${liquibaseCoreVersion}" + } + } +<%_ } _%> plugins { id 'com.gorylenko.gradle-git-properties' version "${gitPropertiesPluginVersion}" <%_ if (enableGradleEnterprise) { _%> From 87bda929a465902765ab2a1616d3f30c727bdb4c Mon Sep 17 00:00:00 2001 From: Quentin Date: Thu, 8 Aug 2024 14:46:43 +0200 Subject: [PATCH 186/938] Upgrade org.liquibase.gradle 3.0.0 (v2) --- generators/app/__snapshots__/generator.spec.ts.snap | 3 --- generators/liquibase/generator.ts | 10 ++++------ generators/server/resources/gradle/libs.versions.toml | 2 -- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/generators/app/__snapshots__/generator.spec.ts.snap b/generators/app/__snapshots__/generator.spec.ts.snap index 8ea4e3699971..654289992775 100644 --- a/generators/app/__snapshots__/generator.spec.ts.snap +++ b/generators/app/__snapshots__/generator.spec.ts.snap @@ -509,7 +509,6 @@ exports[`generator - app with default config should match snapshot 1`] = ` "gradle-enterprise": "'GRADLE-ENTERPRISE-VERSION'", "gradle-git-properties": "'GRADLE-GIT-PROPERTIES-VERSION'", "gradle-liquibase": "'GRADLE-LIQUIBASE-VERSION'", - "gradle-liquibase-core": "'GRADLE-LIQUIBASE-CORE-VERSION'", "gradle-modernizer-plugin": "'GRADLE-MODERNIZER-PLUGIN-VERSION'", "gradle-openapi-generator": "'GRADLE-OPENAPI-GENERATOR-VERSION'", "gradle-sonarqube": "'GRADLE-SONARQUBE-VERSION'", @@ -1128,7 +1127,6 @@ exports[`generator - app with gateway should match snapshot 1`] = ` "gradle-enterprise": "'GRADLE-ENTERPRISE-VERSION'", "gradle-git-properties": "'GRADLE-GIT-PROPERTIES-VERSION'", "gradle-liquibase": "'GRADLE-LIQUIBASE-VERSION'", - "gradle-liquibase-core": "'GRADLE-LIQUIBASE-CORE-VERSION'", "gradle-modernizer-plugin": "'GRADLE-MODERNIZER-PLUGIN-VERSION'", "gradle-openapi-generator": "'GRADLE-OPENAPI-GENERATOR-VERSION'", "gradle-sonarqube": "'GRADLE-SONARQUBE-VERSION'", @@ -1741,7 +1739,6 @@ exports[`generator - app with microservice should match snapshot 1`] = ` "gradle-enterprise": "'GRADLE-ENTERPRISE-VERSION'", "gradle-git-properties": "'GRADLE-GIT-PROPERTIES-VERSION'", "gradle-liquibase": "'GRADLE-LIQUIBASE-VERSION'", - "gradle-liquibase-core": "'GRADLE-LIQUIBASE-CORE-VERSION'", "gradle-modernizer-plugin": "'GRADLE-MODERNIZER-PLUGIN-VERSION'", "gradle-openapi-generator": "'GRADLE-OPENAPI-GENERATOR-VERSION'", "gradle-sonarqube": "'GRADLE-SONARQUBE-VERSION'", diff --git a/generators/liquibase/generator.ts b/generators/liquibase/generator.ts index dcaeeb76e05d..d25ba2b1efff 100644 --- a/generators/liquibase/generator.ts +++ b/generators/liquibase/generator.ts @@ -482,11 +482,7 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator { throw new Error('Some application fields are be mandatory'); } - const { - liquibase: liquibaseVersion, - 'gradle-liquibase': gradleLiquibaseVersion, - 'gradle-liquibase-core': gradleLiquibaseCoreVersion, - } = application.javaDependencies; + const { liquibase: liquibaseVersion, 'gradle-liquibase': gradleLiquibaseVersion } = application.javaDependencies; if (!liquibaseVersion) { this.log.warn('liquibaseVersion is required by gradle-liquibase-plugin, make sure to add it to your dependencies'); } else { @@ -495,7 +491,9 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator { source.addGradleProperty?.({ property: 'liquibaseTaskPrefix', value: 'liquibase' }); source.addGradleProperty?.({ property: 'liquibasePluginVersion', value: gradleLiquibaseVersion }); - source.addGradleProperty?.({ property: 'liquibaseCoreVersion', value: gradleLiquibaseCoreVersion }); + if (application.javaManagedProperties && application.javaManagedProperties['liquibase.version']) { + source.addGradleProperty?.({ property: 'liquibaseCoreVersion', value: application.javaManagedProperties['liquibase.version'] }); + } source.applyFromGradle?.({ script: 'gradle/liquibase.gradle' }); source.addGradlePlugin?.({ id: 'org.liquibase.gradle' }); diff --git a/generators/server/resources/gradle/libs.versions.toml b/generators/server/resources/gradle/libs.versions.toml index b86d19950c33..356228974758 100644 --- a/generators/server/resources/gradle/libs.versions.toml +++ b/generators/server/resources/gradle/libs.versions.toml @@ -23,8 +23,6 @@ node-gradle = { id = 'com.github.node-gradle.node', version = '7.0.2' } gradle-liquibase = { id = 'org.liquibase.gradle', version = '3.0.0' } -gradle-liquibase-core = { id = 'org.liquibase', version = '4.27.0' } - gradle-sonarqube = { id = 'org.sonarqube', version = '5.1.0.4882' } spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.25.0' } From 14dec30fff50869830453012e5516c3fec801bd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 23:18:15 +0000 Subject: [PATCH 187/938] Bump type-fest from 4.23.0 to 4.24.0 Bumps [type-fest](https://github.com/sindresorhus/type-fest) from 4.23.0 to 4.24.0. - [Release notes](https://github.com/sindresorhus/type-fest/releases) - [Commits](https://github.com/sindresorhus/type-fest/compare/v4.23.0...v4.24.0) --- updated-dependencies: - dependency-name: type-fest dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8a869a1385b4..8c277fef2833 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,7 +59,7 @@ "semver": "7.6.3", "simple-git": "3.25.0", "sort-keys": "5.0.0", - "type-fest": "4.23.0", + "type-fest": "4.24.0", "typescript": "5.4.5", "typescript-eslint": "8.0.1", "winston": "3.13.1", @@ -13418,10 +13418,9 @@ } }, "node_modules/type-fest": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.23.0.tgz", - "integrity": "sha512-ZiBujro2ohr5+Z/hZWHESLz3g08BBdrdLMieYFULJO+tWc437sn8kQsWLJoZErY8alNhxre9K4p3GURAG11n+w==", - "license": "(MIT OR CC0-1.0)", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.24.0.tgz", + "integrity": "sha512-spAaHzc6qre0TlZQQ2aA/nGMe+2Z/wyGk5Z+Ru2VUfdNwT6kWO6TjevOlpebsATEG1EIQ2sOiDszud3lO5mt/Q==", "engines": { "node": ">=16" }, diff --git a/package.json b/package.json index 9ec7ca68797b..fe915f16319b 100644 --- a/package.json +++ b/package.json @@ -167,7 +167,7 @@ "semver": "7.6.3", "simple-git": "3.25.0", "sort-keys": "5.0.0", - "type-fest": "4.23.0", + "type-fest": "4.24.0", "typescript": "5.4.5", "typescript-eslint": "8.0.1", "winston": "3.13.1", From 1423c0416516cca54fef581ec5340cf1b424b18a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 23:18:26 +0000 Subject: [PATCH 188/938] Bump winston from 3.13.1 to 3.14.1 Bumps [winston](https://github.com/winstonjs/winston) from 3.13.1 to 3.14.1. - [Release notes](https://github.com/winstonjs/winston/releases) - [Changelog](https://github.com/winstonjs/winston/blob/master/CHANGELOG.md) - [Commits](https://github.com/winstonjs/winston/compare/v3.13.1...v3.14.1) --- updated-dependencies: - dependency-name: winston dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8a869a1385b4..00672308b1dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -62,7 +62,7 @@ "type-fest": "4.23.0", "typescript": "5.4.5", "typescript-eslint": "8.0.1", - "winston": "3.13.1", + "winston": "3.14.1", "yaml": "2.5.0", "yeoman-environment": "4.4.1", "yeoman-generator": "7.3.2" @@ -13996,10 +13996,9 @@ } }, "node_modules/winston": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", - "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==", - "license": "MIT", + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.1.tgz", + "integrity": "sha512-CJi4Il/msz8HkdDfXOMu+r5Au/oyEjFiOZzbX2d23hRLY0narGjqfE5lFlrT5hfYJhPtM8b85/GNFsxIML/RVA==", "dependencies": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", diff --git a/package.json b/package.json index 9ec7ca68797b..505b2d9efd38 100644 --- a/package.json +++ b/package.json @@ -170,7 +170,7 @@ "type-fest": "4.23.0", "typescript": "5.4.5", "typescript-eslint": "8.0.1", - "winston": "3.13.1", + "winston": "3.14.1", "yaml": "2.5.0", "yeoman-environment": "4.4.1", "yeoman-generator": "7.3.2" From 7f815dda4ba914b620c455b9144f08676c419cb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 23:19:03 +0000 Subject: [PATCH 189/938] Bump eslint-plugin-unused-imports from 4.0.1 to 4.1.2 Bumps [eslint-plugin-unused-imports](https://github.com/sweepline/eslint-plugin-unused-imports) from 4.0.1 to 4.1.2. - [Commits](https://github.com/sweepline/eslint-plugin-unused-imports/commits/v4.1.2) --- updated-dependencies: - dependency-name: eslint-plugin-unused-imports dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 27 ++++++--------------------- package.json | 2 +- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8a869a1385b4..f12a732e2652 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "ejs": "3.1.10", "eslint": "9.8.0", "eslint-plugin-import": "2.29.1", - "eslint-plugin-unused-imports": "4.0.1", + "eslint-plugin-unused-imports": "4.1.2", "execa": "9.3.0", "fast-xml-parser": "4.4.1", "glob": "10.4.2", @@ -5951,18 +5951,12 @@ } }, "node_modules/eslint-plugin-unused-imports": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.0.1.tgz", - "integrity": "sha512-rax76s05z64uQgG9YXsWFmXrgjkaK79AvfeAWiSxhPP6RVGxeRaj4+2u+wxxu/mDy2pmJoOy1QTOEALMia2xGQ==", - "dependencies": { - "eslint-rule-composer": "^0.3.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.2.tgz", + "integrity": "sha512-A/Ypb0DQlDEzIbcoAv87NpLLcG3iwlE0gBEpS9Ud/62v2v3CoO15lZ/WfGyo2Wq7YraWJ2aE0TeHgJcpor6KQQ==", "peerDependencies": { - "@typescript-eslint/eslint-plugin": "^8.0.0-0", - "eslint": "^9.0.0" + "@typescript-eslint/eslint-plugin": "^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0", + "eslint": "^9.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "@typescript-eslint/eslint-plugin": { @@ -5970,15 +5964,6 @@ } } }, - "node_modules/eslint-rule-composer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz", - "integrity": "sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==", - "license": "MIT", - "engines": { - "node": ">=4.0.0" - } - }, "node_modules/eslint-scope": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz", diff --git a/package.json b/package.json index 9ec7ca68797b..2f36c47de6fe 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "ejs": "3.1.10", "eslint": "9.8.0", "eslint-plugin-import": "2.29.1", - "eslint-plugin-unused-imports": "4.0.1", + "eslint-plugin-unused-imports": "4.1.2", "execa": "9.3.0", "fast-xml-parser": "4.4.1", "glob": "10.4.2", From 6553f291226f42f03bfee7be601b962433c8a25e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 00:21:23 +0000 Subject: [PATCH 190/938] Bump postgres from 16.3 to 16.4 in /generators/server/resources Bumps postgres from 16.3 to 16.4. --- updated-dependencies: - dependency-name: postgres dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/server/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile index 22d31c4cd253..8d3fb9f259d5 100644 --- a/generators/server/resources/Dockerfile +++ b/generators/server/resources/Dockerfile @@ -10,7 +10,7 @@ LABEL ALIAS=jhipster-control-center FROM jhipster/consul-config-loader:v0.4.1 LABEL ALIAS=consul-config-loader -FROM postgres:16.3 +FROM postgres:16.4 LABEL ALIAS=postgresql FROM quay.io/keycloak/keycloak:25.0.1 From 54af4f0cb436644b5913c107b5c1c384167bb1dc Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 8 Aug 2024 21:55:30 -0300 Subject: [PATCH 191/938] don't parse xml tag value when parsing --- generators/maven/internal/xml-store.ts | 3 +- .../maven/support/dependabot-maven.spec.ts | 49 +++++++++++++++++++ generators/maven/support/dependabot-maven.ts | 5 +- 3 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 generators/maven/support/dependabot-maven.spec.ts diff --git a/generators/maven/internal/xml-store.ts b/generators/maven/internal/xml-store.ts index ddf534f08fdb..87613f1997cb 100644 --- a/generators/maven/internal/xml-store.ts +++ b/generators/maven/internal/xml-store.ts @@ -25,10 +25,11 @@ const defaultXmlCommonOptions: Partial = { ignoreAttributes: false, attributeNamePrefix: '@@', commentPropName: '#comment', - parseAttributeValue: false, }; export const defaultXmlParserOptions: Partial = { + parseAttributeValue: false, + parseTagValue: false, ...defaultXmlCommonOptions, }; diff --git a/generators/maven/support/dependabot-maven.spec.ts b/generators/maven/support/dependabot-maven.spec.ts new file mode 100644 index 000000000000..57955d7fdc5b --- /dev/null +++ b/generators/maven/support/dependabot-maven.spec.ts @@ -0,0 +1,49 @@ +/** + * Copyright 2013-2024 the original author or authors from the JHipster project. + * + * This file is part of the JHipster project, see https://www.jhipster.tech/ + * for more information. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { describe, expect } from 'esmocha'; +import { parseMavenPom } from './dependabot-maven.js'; + +describe('parseMavenPom', () => { + it('should parse a pom file', () => { + const pomContent = ` + + test + 1.0 + + 1.0 + +`; + const pom = parseMavenPom(pomContent); + expect(pom).toMatchInlineSnapshot(` +{ + "?xml": { + "@@encoding": "UTF-8", + "@@version": "1.0", + }, + "project": { + "artifactId": "test", + "properties": { + "test.version": "1.0", + }, + "version": "1.0", + }, +} +`); + }); +}); diff --git a/generators/maven/support/dependabot-maven.ts b/generators/maven/support/dependabot-maven.ts index 61ec67684b9c..afbfbf1a30e9 100644 --- a/generators/maven/support/dependabot-maven.ts +++ b/generators/maven/support/dependabot-maven.ts @@ -17,13 +17,14 @@ * limitations under the License. */ import { XMLParser } from 'fast-xml-parser'; +import { defaultXmlParserOptions } from '../internal/xml-store.js'; /** * Extract properties from pom content * @param pomContent */ export function getPomProperties(pomContent: string): Record { - return new XMLParser().parse(pomContent).project.properties; + return new XMLParser(defaultXmlParserOptions).parse(pomContent).project.properties; } export type MavenPom = { @@ -44,7 +45,7 @@ export type MavenPomAndVersions = { * @param fileContent */ export function parseMavenPom(fileContent: string): MavenPom { - return new XMLParser().parse(fileContent); + return new XMLParser(defaultXmlParserOptions).parse(fileContent); } /** From 9f5d0f0a3d13466752a77472f732449c5ed88097 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 02:26:46 +0000 Subject: [PATCH 192/938] Bump @vueuse/core from 10.11.0 to 10.11.1 in /generators/vue/resources Bumps [@vueuse/core](https://github.com/vueuse/vueuse/tree/HEAD/packages/core) from 10.11.0 to 10.11.1. - [Release notes](https://github.com/vueuse/vueuse/releases) - [Commits](https://github.com/vueuse/vueuse/commits/v10.11.1/packages/core) --- updated-dependencies: - dependency-name: "@vueuse/core" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 5a2077ba3600..44eb50f65b4b 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -6,7 +6,7 @@ "@stomp/rx-stomp": "2.0.0", "@vuelidate/core": "2.0.3", "@vuelidate/validators": "2.0.4", - "@vueuse/core": "10.11.0", + "@vueuse/core": "10.11.1", "axios": "1.7.3", "bootstrap": "4.6.2", "bootstrap-vue": "2.23.1", From cf46dad7fe81fd50472e8df192823c46dbf137c9 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 8 Aug 2024 22:53:14 -0300 Subject: [PATCH 193/938] add sort-imports to eslint base config --- lib/eslint/base.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/eslint/base.js b/lib/eslint/base.js index 6746f13dee26..cd7cd3daf063 100644 --- a/lib/eslint/base.js +++ b/lib/eslint/base.js @@ -14,7 +14,9 @@ const baseConfig = { import: fixupPluginRules(imports), }, rules: { - 'no-unused-vars': 'off', + 'sort-imports': ['error', { ignoreDeclarationSort: true }], + + // Configure unused-imports rule 'import/no-duplicates': 'error', 'import/order': 'error', 'unused-imports/no-unused-imports': 'error', From da7b8454f07f3e478a42dfbf3e266737110f02dc Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 9 Aug 2024 06:52:52 -0300 Subject: [PATCH 194/938] apply eslint --- .blueprint/generate-sample/generator.mjs | 2 +- cli/environment-builder.mjs | 2 +- cli/program.mjs | 2 +- cli/utils.mjs | 2 +- generators/angular/generator.spec.ts | 4 +-- generators/angular/generator.ts | 16 +++++----- .../angular/support/translate-angular.spec.ts | 2 +- generators/app/composing.spec.ts | 2 +- generators/app/generator.js | 2 +- generators/app/generator.spec.ts | 2 +- .../base-application/application-options.d.ts | 2 +- generators/base-application/generator.spec.ts | 2 +- generators/base-application/generator.ts | 2 +- generators/base-application/priorities.js | 2 +- .../base-application/support/entities.ts | 2 +- .../base-application/support/enum.spec.ts | 2 +- .../support/prepare-entity.spec.ts | 4 +-- .../support/prepare-entity.ts | 8 ++--- .../base-application/support/prepare-field.js | 2 +- .../support/prepare-field.spec.ts | 2 +- .../support/prepare-relationship.js | 2 +- .../base-application/support/relationship.ts | 4 +-- .../support/task-type-inference.ts | 2 +- generators/base-application/tasks.d.ts | 2 +- generators/base-core/generator-core.spec.ts | 2 +- generators/base-core/generator.ts | 22 +++++++------- generators/base-workspaces/generator.ts | 2 +- .../base-workspaces/internal/deployments.ts | 2 +- generators/base-workspaces/priorities.ts | 2 +- generators/base/api.d.ts | 2 +- generators/base/blueprints.spec.ts | 2 +- generators/base/generator.spec.ts | 2 +- generators/base/generator.ts | 2 +- generators/base/internal/blueprint.spec.ts | 2 +- generators/base/support/basename.spec.ts | 2 +- generators/base/support/config.spec.ts | 2 +- generators/base/support/contents.spec.ts | 2 +- generators/base/support/logger.ts | 2 +- generators/base/support/needles.spec.ts | 4 +-- generators/base/support/string.spec.ts | 2 +- generators/base/support/timestamp.spec.ts | 2 +- generators/base/support/write-files.spec.ts | 2 +- .../generator.spec.ts | 2 +- .../bootstrap-application-base/generator.ts | 2 +- .../generator.spec.ts | 2 +- .../bootstrap-application-client/generator.ts | 4 +-- .../generator.spec.ts | 2 +- .../bootstrap-application-server/generator.ts | 6 ++-- .../bootstrap-application/generator.spec.ts | 2 +- generators/bootstrap-application/generator.ts | 2 +- generators/bootstrap/generator.spec.ts | 2 +- generators/bootstrap/generator.ts | 14 ++++----- .../support/auto-crlf-transform.spec.ts | 2 +- .../support/eslint-transform.spec.ts | 2 +- .../bootstrap/support/prettier-worker.js | 2 +- generators/ci-cd/ci-cd.spec.ts | 2 +- generators/ci-cd/command.ts | 2 +- generators/ci-cd/generator.spec.js | 2 +- generators/client/generator-needles.spec.ts | 4 +-- generators/client/generator.js | 4 +-- generators/client/generator.spec.ts | 4 +-- .../generators/common/generator.spec.ts | 2 +- generators/client/needle-client.spec.ts | 4 +-- generators/client/prompts.spec.ts | 10 +++---- .../client/support/entity-definition.js | 2 +- generators/client/support/template-utils.js | 2 +- .../client/support/template-utils.spec.js | 2 +- generators/client/support/types-utils.spec.js | 2 +- generators/common/generator.js | 6 ++-- generators/common/generator.spec.js | 6 ++-- generators/cucumber/files.ts | 2 +- generators/cucumber/generator.spec.ts | 2 +- generators/cypress/generator.spec.ts | 6 ++-- generators/cypress/generator.ts | 4 +-- .../docker-compose/docker-compose.spec.ts | 4 +-- generators/docker-compose/generator.js | 2 +- generators/docker-compose/generator.spec.js | 2 +- generators/docker/generator.js | 2 +- generators/docker/generator.spec.ts | 6 ++-- .../support/docker-compose-file.spec.ts | 2 +- generators/entities/generator.spec.ts | 4 +-- generators/entity/database-changelog.spec.ts | 4 +-- generators/entity/generator.spec.js | 2 +- generators/entity/prompts.js | 6 ++-- generators/entity/single-entity.spec.ts | 4 +-- generators/export-jdl/export-jdl.spec.ts | 2 +- generators/export-jdl/generator.spec.ts | 2 +- generators/export-jdl/generator.ts | 2 +- generators/feign-client/generator.spec.ts | 4 +-- generators/gatling/files.ts | 2 +- generators/gatling/generator.spec.ts | 2 +- generators/generate-blueprint/generator.js | 26 ++++++++-------- .../generate-blueprint/generator.spec.js | 2 +- generators/git/generator.spec.ts | 2 +- generators/gradle/generator.spec.js | 2 +- generators/gradle/generator.ts | 12 ++++---- .../generators/code-quality/generator.spec.ts | 2 +- .../gradle/generators/jib/generator.spec.ts | 2 +- generators/gradle/internal/needles.ts | 10 +++---- generators/gradle/needles.spec.ts | 2 +- generators/heroku/generator.spec.js | 2 +- generators/heroku/heroku.spec.ts | 2 +- generators/info/generator.spec.ts | 2 +- generators/init/generator.spec.ts | 2 +- generators/java/generator.spec.ts | 2 +- .../generators/bootstrap/generator.spec.ts | 2 +- .../java/generators/bootstrap/generator.ts | 10 +++---- .../generators/build-tool/generator.spec.ts | 2 +- .../generators/code-quality/generator.spec.ts | 2 +- .../java/generators/domain/generator.spec.ts | 2 +- .../java/generators/jib/generator.spec.ts | 2 +- .../java/generators/node/generator.spec.ts | 2 +- .../openapi-generator/generator.spec.ts | 2 +- .../java/support/add-java-annotation.spec.ts | 2 +- .../java/support/checks/check-java.spec.ts | 2 +- generators/java/support/doc.spec.ts | 2 +- generators/java/support/files.ts | 2 +- .../generated-annotation-transform.spec.ts | 2 +- generators/java/support/key-store.ts | 2 +- generators/java/support/util.spec.ts | 2 +- .../generators/bootstrap/generator.spec.ts | 2 +- .../generators/eslint/generator.spec.ts | 2 +- .../generators/husky/generator.spec.ts | 2 +- .../generators/prettier/generator.spec.ts | 2 +- generators/jdl/generator.spec.ts | 2 +- generators/jdl/generator.ts | 4 +-- generators/kubernetes-helm/generator.js | 8 ++--- generators/kubernetes-helm/generator.spec.js | 2 +- .../kubernetes-helm/kubernetes.helm.spec.ts | 4 +-- generators/kubernetes-knative/generator.js | 8 ++--- .../kubernetes-knative/generator.spec.js | 2 +- generators/kubernetes-knative/knative.spec.ts | 4 +-- generators/kubernetes/files.js | 2 +- generators/kubernetes/generator.js | 4 +-- generators/kubernetes/generator.spec.js | 2 +- generators/kubernetes/kubernetes-base.js | 22 +++++++------- generators/kubernetes/kubernetes-constants.js | 2 +- generators/kubernetes/kubernetes.spec.ts | 4 +-- .../languages/generator-needles.spec.ts | 4 +-- generators/languages/generator.spec.js | 2 +- generators/languages/languages.spec.js | 2 +- .../languages/support/detect-language.ts | 2 +- .../languages/support/languages.spec.ts | 2 +- generators/languages/support/load-config.ts | 2 +- .../languages/support/translate.spec.js | 2 +- generators/liquibase/generator.spec.ts | 2 +- generators/liquibase/generator.ts | 12 ++++---- .../liquibase/incremental-liquibase.spec.ts | 2 +- generators/liquibase/needles.spec.ts | 2 +- .../liquibase/support/formatting.spec.ts | 2 +- generators/maven/generator.spec.ts | 2 +- generators/maven/generator.ts | 2 +- .../generators/code-quality/generator.spec.ts | 2 +- .../frontend-plugin/generator.spec.ts | 2 +- .../maven/generators/jib/generator.spec.ts | 2 +- generators/maven/internal/xml-store.ts | 2 +- generators/maven/needles.spec.ts | 2 +- generators/maven/support/pom-file-sort.ts | 2 +- generators/maven/support/pom-store.ts | 4 +-- generators/needle-base.ts | 2 +- generators/project-name/generator.js | 2 +- generators/project-name/generator.spec.ts | 2 +- generators/react/generator.js | 6 ++-- generators/react/generator.spec.ts | 4 +-- .../react/support/translate-react.spec.js | 2 +- generators/server/__test-support/index.ts | 6 ++-- generators/server/generator.js | 30 +++++++++---------- generators/server/generator.spec.js | 4 +-- .../server/jdl/application-definition.ts | 2 +- generators/server/needle-logback.spec.ts | 2 +- .../server/options/database-migration.spec.ts | 4 +-- .../server/options/feign-client.spec.ts | 4 +-- .../server/options/message-broker.spec.ts | 4 +-- .../server/options/sync-user-with-idp.spec.ts | 4 +-- generators/server/support/config.ts | 8 ++--- generators/server/support/database.spec.ts | 2 +- generators/server/support/needles.spec.ts | 2 +- .../server/support/spring-factories.spec.ts | 2 +- generators/server/support/string.spec.ts | 2 +- .../server/support/templates/field-values.js | 2 +- generators/spring-boot/command.ts | 2 +- generators/spring-boot/entity-files.js | 2 +- generators/spring-boot/files.ts | 2 +- generators/spring-boot/generator.spec.ts | 4 +-- generators/spring-boot/prompts.js | 2 +- generators/spring-cache/files.ts | 2 +- generators/spring-cache/generator.spec.ts | 4 +-- generators/spring-cache/needles.spec.ts | 2 +- .../generator-pulsar.spec.ts | 2 +- .../spring-cloud-stream/generator.spec.ts | 2 +- .../generators/kafka/files.ts | 2 +- .../generators/pulsar/files.ts | 2 +- .../generators/gateway/generator.spec.ts | 2 +- .../gateway/jdl/jdl-routes-option.spec.ts | 4 +-- .../database-changelog.spec.ts | 2 +- generators/spring-data-cassandra/files.js | 2 +- .../spring-data-cassandra/generator.spec.ts | 4 +-- generators/spring-data-couchbase/files.js | 2 +- .../spring-data-couchbase/generator.spec.ts | 8 ++--- .../__test-support/elastic-search-matcher.ts | 2 +- .../generator.spec.ts | 8 ++--- .../spring-data-mongodb/generator.spec.ts | 4 +-- generators/spring-data-neo4j/files.ts | 2 +- .../spring-data-neo4j/generator.spec.ts | 4 +-- generators/spring-data-relational/files.js | 4 +-- .../spring-data-relational/generator.spec.ts | 10 +++---- .../sql-entities.spec.ts | 10 +++---- .../support/database-url.spec.ts | 2 +- generators/spring-websocket/generator.spec.ts | 2 +- generators/upgrade/generator.spec.js | 2 +- generators/upgrade/upgrade.spec.ts | 4 +-- generators/vue/generator.js | 12 ++++---- generators/vue/generator.spec.ts | 4 +-- generators/vue/support/translate-vue.spec.ts | 4 +-- generators/workspaces/generator.spec.js | 2 +- ...basic-entity-information-converter.spec.ts | 2 +- .../jdl-to-json-field-converter.spec.ts | 2 +- .../jdl-to-json-option-converter.spec.ts | 4 +-- .../jdl-to-json-option-converter.ts | 2 +- ...jdl-to-json-relationship-converter.spec.ts | 4 +-- ...ith-applications-to-json-converter.spec.ts | 10 +++---- ...hout-application-to-json-converter.spec.ts | 10 +++---- .../json-to-jdl-application-converter.spec.ts | 2 +- jdl/converters/json-to-jdl-converter.spec.ts | 4 +-- jdl/converters/json-to-jdl-converter.ts | 4 +-- .../json-to-jdl-entity-converter.spec.ts | 4 +-- .../json-to-jdl-entity-converter.ts | 2 +- .../json-to-jdl-option-converter.spec.ts | 2 +- .../application-converter.spec.ts | 2 +- .../deployment-converter.spec.ts | 2 +- .../entity-converter.spec.ts | 2 +- .../enum-converter.spec.ts | 2 +- .../field-converter.spec.ts | 2 +- .../option-converter.spec.ts | 4 +-- .../option-converter.ts | 2 +- ...parsed-jdl-to-jdl-object-converter.spec.ts | 10 +++---- .../relationship-converter.spec.ts | 2 +- .../validation-converter.spec.ts | 2 +- jdl/converters/types.d.ts | 2 +- jdl/exporters/export-utils.spec.ts | 2 +- jdl/exporters/jdl-exporter.spec.ts | 2 +- .../jhipster-deployment-exporter.spec.ts | 2 +- .../jhipster-entity-exporter.spec.ts | 2 +- jdl/exporters/jhipster-entity-exporter.ts | 2 +- jdl/integration-test.spec.ts | 2 +- jdl/jdl-importer.spec.ts | 4 +-- jdl/jhipster/binary-options.spec.ts | 2 +- jdl/jhipster/database-types.spec.ts | 2 +- .../default-application-options.spec.ts | 2 +- jdl/jhipster/deployment-options.spec.ts | 2 +- .../entity-table-name-creator.spec.ts | 2 +- jdl/jhipster/field-types.spec.ts | 2 +- jdl/jhipster/json-entity.spec.ts | 2 +- jdl/jhipster/relationship-options.spec.ts | 2 +- jdl/jhipster/relationship-types.spec.ts | 2 +- jdl/jhipster/reserved-keywords.spec.ts | 2 +- jdl/jhipster/unary-options.spec.ts | 2 +- jdl/jhipster/validations.spec.ts | 2 +- jdl/linters/issues/entity-issue.spec.ts | 2 +- jdl/linters/issues/enum-issue.spec.ts | 2 +- jdl/linters/issues/field-issue.spec.ts | 2 +- jdl/linters/issues/issues.spec.ts | 2 +- jdl/linters/issues/relationship-issue.spec.ts | 2 +- jdl/linters/jdl-linter.spec.ts | 4 +-- jdl/linters/jdl-linter.ts | 2 +- jdl/linters/rule.spec.ts | 4 +-- jdl/linters/rule.ts | 2 +- jdl/linters/rules.spec.ts | 2 +- jdl/linters/rules.ts | 2 +- jdl/models/abstract-jdl-option.spec.ts | 2 +- ...-application-configuration-factory.spec.ts | 2 +- .../jdl-application-configuration.spec.ts | 2 +- jdl/models/jdl-application-definition.spec.ts | 2 +- jdl/models/jdl-application-entities.spec.ts | 2 +- jdl/models/jdl-application-factory.spec.ts | 2 +- jdl/models/jdl-application.spec.ts | 2 +- jdl/models/jdl-binary-option.spec.ts | 2 +- jdl/models/jdl-deployment.spec.ts | 2 +- jdl/models/jdl-deployment.ts | 2 +- jdl/models/jdl-entity.spec.ts | 2 +- jdl/models/jdl-enum-value.spec.ts | 2 +- jdl/models/jdl-enum.spec.ts | 2 +- jdl/models/jdl-enums.spec.ts | 2 +- jdl/models/jdl-field.spec.ts | 2 +- jdl/models/jdl-object-merger.spec.ts | 4 +-- jdl/models/jdl-object.spec.ts | 4 +-- jdl/models/jdl-options.spec.ts | 4 +-- jdl/models/jdl-relationship.spec.ts | 4 +-- jdl/models/jdl-relationship.ts | 2 +- jdl/models/jdl-relationships.spec.ts | 2 +- jdl/models/jdl-unary-option.spec.ts | 2 +- jdl/models/jdl-validation.spec.ts | 2 +- jdl/parsing/dsl-api.spec.ts | 2 +- jdl/parsing/exports.ts | 4 +-- jdl/parsing/grammar.spec.ts | 4 +-- jdl/parsing/jdl-ast-builder-visitor.ts | 2 +- jdl/parsing/lexer/application-tokens.ts | 2 +- jdl/parsing/lexer/lexer.spec.ts | 2 +- jdl/parsing/lexer/lexer.ts | 2 +- jdl/parsing/lexer/option-tokens.ts | 2 +- jdl/parsing/lexer/token-creator.spec.ts | 4 +-- jdl/parsing/lexer/token-creator.ts | 4 +-- jdl/parsing/validator.spec.ts | 2 +- jdl/readers/file-reader.spec.ts | 2 +- jdl/readers/jdl-reader.spec.ts | 2 +- jdl/readers/json-file-reader.spec.ts | 2 +- jdl/readers/json-reader.spec.ts | 4 +-- jdl/utils/array-utils.spec.ts | 2 +- jdl/utils/files-utils.spec.ts | 4 +-- jdl/utils/format-utils.spec.ts | 2 +- jdl/utils/object-utils.spec.ts | 2 +- jdl/utils/objects/logger.ts | 2 +- jdl/utils/set-utils.spec.ts | 2 +- jdl/utils/string_utils.spec.ts | 4 +-- .../binary-option-validator.spec.ts | 2 +- jdl/validators/deployment-validator.spec.ts | 4 +-- jdl/validators/deployment-validator.ts | 2 +- jdl/validators/entity-validator.spec.ts | 2 +- jdl/validators/enum-validator.spec.ts | 2 +- jdl/validators/field-validator.spec.ts | 2 +- .../jdl-with-application-validator.spec.ts | 2 +- .../jdl-with-application-validator.ts | 2 +- .../jdl-without-application-validator.spec.ts | 4 +-- .../jdl-without-application-validator.ts | 2 +- jdl/validators/relationship-validator.spec.ts | 2 +- jdl/validators/unary-option-validator.spec.ts | 2 +- jdl/validators/validation-validator.spec.ts | 2 +- lib/eslint/base.js | 1 + test-integration/scripts/99-write-matrix.js | 10 +++---- test/api.spec.js | 2 +- test/integration-test.spec.ts | 2 +- test/needle-api/needle-base.spec.ts | 2 +- .../needle-client-angular-generator.spec.ts | 2 +- test/needle-api/needle-client-angular.spec.ts | 4 +-- test/needle-api/needle-client-react.spec.ts | 4 +-- .../needle-client-vue-generator.spec.ts | 4 +-- test/needle-api/needle-client-vue.spec.ts | 2 +- test/support/check-enforcements.ts | 2 +- test/support/tests.js | 4 +-- testing/helpers.ts | 2 +- testing/support/client-samples.ts | 2 +- testing/support/server-samples.ts | 4 +-- 342 files changed, 551 insertions(+), 550 deletions(-) diff --git a/.blueprint/generate-sample/generator.mjs b/.blueprint/generate-sample/generator.mjs index d3dee4dada55..2ff2bd5a5c60 100644 --- a/.blueprint/generate-sample/generator.mjs +++ b/.blueprint/generate-sample/generator.mjs @@ -4,7 +4,7 @@ import BaseGenerator from '../../generators/base/index.js'; import { packageJson } from '../../lib/index.js'; import { promptSamplesFolder } from '../support.mjs'; import { GENERATOR_APP, GENERATOR_INFO, GENERATOR_JDL } from '../../generators/generator-list.js'; -import { generateSample, entitiesByType } from './support/index.js'; +import { entitiesByType, generateSample } from './support/index.js'; export default class extends BaseGenerator { sampleName; diff --git a/cli/environment-builder.mjs b/cli/environment-builder.mjs index 56396461c273..c84ff76461c2 100644 --- a/cli/environment-builder.mjs +++ b/cli/environment-builder.mjs @@ -26,7 +26,7 @@ import Environment from 'yeoman-environment'; import { QueuedAdapter } from '@yeoman/adapter'; import { createJHipsterLogger, packageNameToNamespace } from '../generators/base/support/index.js'; -import { parseBlueprintInfo, loadBlueprintsFromConfiguration, mergeBlueprints } from '../generators/base/internal/index.js'; +import { loadBlueprintsFromConfiguration, mergeBlueprints, parseBlueprintInfo } from '../generators/base/internal/index.js'; import { CLI_NAME, logger } from './utils.mjs'; const __filename = fileURLToPath(import.meta.url); diff --git a/cli/program.mjs b/cli/program.mjs index 054430053e0f..cc815d9ef32b 100644 --- a/cli/program.mjs +++ b/cli/program.mjs @@ -32,7 +32,7 @@ import logo from './logo.mjs'; import EnvironmentBuilder from './environment-builder.mjs'; import SUB_GENERATORS from './commands.mjs'; import JHipsterCommand from './jhipster-command.mjs'; -import { CLI_NAME, logger, getCommand, done } from './utils.mjs'; +import { CLI_NAME, done, getCommand, logger } from './utils.mjs'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/cli/utils.mjs b/cli/utils.mjs index ea71d11bd93e..bcb9f4384893 100644 --- a/cli/utils.mjs +++ b/cli/utils.mjs @@ -19,7 +19,7 @@ import chalk from 'chalk'; -import { createJHipsterLogger, CLI_LOGGER } from '../generators/base/support/index.js'; +import { CLI_LOGGER, createJHipsterLogger } from '../generators/base/support/index.js'; export const CLI_NAME = 'jhipster'; export const GENERATOR_NAME = 'generator-jhipster'; diff --git a/generators/angular/generator.spec.ts b/generators/angular/generator.spec.ts index f2e750afd1f9..b58aea760383 100644 --- a/generators/angular/generator.spec.ts +++ b/generators/angular/generator.spec.ts @@ -1,10 +1,10 @@ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { buildClientSamples, entitiesClientSamples as entities, defaultHelpers as helpers, runResult } from '../../testing/index.js'; -import { shouldSupportFeatures, testBlueprintSupport, checkEnforcements } from '../../test/support/index.js'; +import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js'; import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; import { GENERATOR_ANGULAR } from '../generator-list.js'; diff --git a/generators/angular/generator.ts b/generators/angular/generator.ts index d6ad1b473b28..3452b19b38ee 100644 --- a/generators/angular/generator.ts +++ b/generators/angular/generator.ts @@ -25,28 +25,28 @@ import { GENERATOR_ANGULAR, GENERATOR_CLIENT, GENERATOR_LANGUAGES } from '../gen import { defaultLanguage } from '../languages/support/index.js'; import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; import { + generateTypescriptTestEntity as generateTestEntity, generateEntityClientEnumImports as getClientEnumImportsFormat, getTypescriptKeyType as getTSKeyType, generateTestEntityId as getTestEntityId, generateTestEntityPrimaryKey as getTestEntityPrimaryKey, - generateTypescriptTestEntity as generateTestEntity, } from '../client/support/index.js'; import type { CommonClientServerApplication } from '../base-application/types.js'; import { createNeedleCallback, mutateData } from '../base/support/index.js'; import { writeEslintClientRootConfigFile } from '../javascript/generators/eslint/support/tasks.js'; -import { writeEntitiesFiles, postWriteEntitiesFiles, cleanupEntitiesFiles } from './entity-files-angular.js'; +import { cleanupEntitiesFiles, postWriteEntitiesFiles, writeEntitiesFiles } from './entity-files-angular.js'; import { writeFiles } from './files-angular.js'; import cleanupOldFilesTask from './cleanup.js'; import { - buildAngularFormPath as angularFormPath, addEntitiesRoute, + addIconImport, + addItemToAdminMenu, + addItemToMenu, + addRoute, addToEntitiesMenu, - translateAngularFilesTransform, + buildAngularFormPath as angularFormPath, isTranslatedAngularFile, - addRoute, - addItemToMenu, - addItemToAdminMenu, - addIconImport, + translateAngularFilesTransform, } from './support/index.js'; const { ANGULAR } = clientFrameworkTypes; diff --git a/generators/angular/support/translate-angular.spec.ts b/generators/angular/support/translate-angular.spec.ts index 63cdb13d2385..7e6972d97cef 100644 --- a/generators/angular/support/translate-angular.spec.ts +++ b/generators/angular/support/translate-angular.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { inspect } from 'node:util'; -import { it, describe, expect, esmocha, beforeEach } from 'esmocha'; +import { beforeEach, describe, esmocha, expect, it } from 'esmocha'; import { createTranslationReplacer } from './translate-angular.js'; describe('generator - angular - transform', () => { diff --git a/generators/app/composing.spec.ts b/generators/app/composing.spec.ts index 2ea92899a5d5..06059b1cef86 100644 --- a/generators/app/composing.spec.ts +++ b/generators/app/composing.spec.ts @@ -1,5 +1,5 @@ import assert from 'assert'; -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { defaultHelpers as helpers } from '../../testing/index.js'; import { GENERATOR_APP } from '../generator-list.js'; diff --git a/generators/app/generator.js b/generators/app/generator.js index 4c94539420ae..38e5c33a54d2 100644 --- a/generators/app/generator.js +++ b/generators/app/generator.js @@ -21,7 +21,7 @@ import chalk from 'chalk'; import { camelCase } from 'lodash-es'; import BaseApplicationGenerator from '../base-application/index.js'; -import { GENERATOR_COMMON, GENERATOR_CLIENT, GENERATOR_SERVER } from '../generator-list.js'; +import { GENERATOR_CLIENT, GENERATOR_COMMON, GENERATOR_SERVER } from '../generator-list.js'; import { getDefaultAppName } from '../project-name/support/index.js'; import { packageJson } from '../../lib/index.js'; diff --git a/generators/app/generator.spec.ts b/generators/app/generator.spec.ts index 01f254405c0f..b2b7524cb097 100644 --- a/generators/app/generator.spec.ts +++ b/generators/app/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { getCommandHelpOutput, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; diff --git a/generators/base-application/application-options.d.ts b/generators/base-application/application-options.d.ts index b6c9d1b1def1..9e54edd0479b 100644 --- a/generators/base-application/application-options.d.ts +++ b/generators/base-application/application-options.d.ts @@ -1,4 +1,4 @@ -import type { UnionToIntersection, StringKeyOf } from 'type-fest'; +import type { StringKeyOf, UnionToIntersection } from 'type-fest'; // Values<{ a: string, b: number }> = string | number type Values = T[keyof T]; diff --git a/generators/base-application/generator.spec.ts b/generators/base-application/generator.spec.ts index 0b0b746fff52..56815c0cb39a 100644 --- a/generators/base-application/generator.spec.ts +++ b/generators/base-application/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect, esmocha } from 'esmocha'; +import { before, describe, esmocha, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import EnvironmentBuilder from '../../cli/environment-builder.mjs'; diff --git a/generators/base-application/generator.ts b/generators/base-application/generator.ts index 50ed9bd8e078..3165fc91da77 100644 --- a/generators/base-application/generator.ts +++ b/generators/base-application/generator.ts @@ -21,7 +21,7 @@ import type { ComposeOptions, Storage } from 'yeoman-generator'; import BaseGenerator from '../base/index.js'; import { JHIPSTER_CONFIG_DIR } from '../generator-constants.js'; -import { GenericTaskGroup, GenericSourceTypeDefinition } from '../base/tasks.js'; +import { GenericSourceTypeDefinition, GenericTaskGroup } from '../base/tasks.js'; import { SpringBootSourceType } from '../server/types.js'; import { ClientSourceType } from '../client/types.js'; import { I18nApplication } from '../languages/types.js'; diff --git a/generators/base-application/priorities.js b/generators/base-application/priorities.js index fdee8c346827..14e5bc7a7c4e 100644 --- a/generators/base-application/priorities.js +++ b/generators/base-application/priorities.js @@ -17,7 +17,7 @@ * limitations under the License. */ -import { QUEUE_PREFIX, PRIORITY_NAMES as PRIORITY_NAMES_BASE, QUEUES as QUEUES_BASE } from '../base/priorities.js'; +import { PRIORITY_NAMES as PRIORITY_NAMES_BASE, QUEUES as QUEUES_BASE, QUEUE_PREFIX } from '../base/priorities.js'; const { DEFAULT, TRANSFORM, MULTISTEP_TRANSFORM } = PRIORITY_NAMES_BASE; diff --git a/generators/base-application/support/entities.ts b/generators/base-application/support/entities.ts index 8064825d6a36..1e1463d088c3 100644 --- a/generators/base-application/support/entities.ts +++ b/generators/base-application/support/entities.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { existsSync, opendirSync } from 'fs'; -import { extname, basename } from 'path'; +import { basename, extname } from 'path'; export function getEntitiesFromDir(configDir: string): string[] { if (!existsSync(configDir)) { diff --git a/generators/base-application/support/enum.spec.ts b/generators/base-application/support/enum.spec.ts index cf0ea0186785..a69fb2facb35 100644 --- a/generators/base-application/support/enum.spec.ts +++ b/generators/base-application/support/enum.spec.ts @@ -1,5 +1,5 @@ import assert from 'assert'; -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { getEnumInfo } from './enum.js'; describe('base-application - support - enum', () => { diff --git a/generators/base-application/support/prepare-entity.spec.ts b/generators/base-application/support/prepare-entity.spec.ts index 178f44bf6f04..5fbf8c7858b0 100644 --- a/generators/base-application/support/prepare-entity.spec.ts +++ b/generators/base-application/support/prepare-entity.spec.ts @@ -17,12 +17,12 @@ * limitations under the License. */ -import { it, describe, beforeEach } from 'esmocha'; +import { beforeEach, describe, it } from 'esmocha'; import { expect } from 'chai'; import { formatDateForChangelog } from '../../base/support/index.js'; import BaseGenerator from '../../base/index.js'; import { getConfigWithDefaults } from '../../../jdl/jhipster/index.js'; -import { prepareEntityPrimaryKeyForTemplates, entityDefaultConfig } from './prepare-entity.js'; +import { entityDefaultConfig, prepareEntityPrimaryKeyForTemplates } from './prepare-entity.js'; describe('generator - base-application - support - prepareEntity', () => { const defaultGenerator = { jhipsterConfig: getConfigWithDefaults() }; diff --git a/generators/base-application/support/prepare-entity.ts b/generators/base-application/support/prepare-entity.ts index a8f347c66234..91b11f7cd28f 100644 --- a/generators/base-application/support/prepare-entity.ts +++ b/generators/base-application/support/prepare-entity.ts @@ -16,20 +16,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { camelCase, kebabCase, startCase, upperFirst, sortedUniq, intersection, lowerFirst, uniq } from 'lodash-es'; +import { camelCase, intersection, kebabCase, lowerFirst, sortedUniq, startCase, uniq, upperFirst } from 'lodash-es'; import pluralize from 'pluralize'; import type BaseGenerator from '../../base-core/index.js'; import { getDatabaseTypeData, hibernateSnakeCase } from '../../server/support/index.js'; import { createFaker, + getMicroserviceAppName, + mutateData, parseChangelog, stringHashCode, upperFirstCamelCase, - getMicroserviceAppName, - mutateData, } from '../../base/support/index.js'; -import { getTypescriptKeyType, getEntityParentPathAddition } from '../../client/support/index.js'; +import { getEntityParentPathAddition, getTypescriptKeyType } from '../../client/support/index.js'; import { applicationTypes, binaryOptions, diff --git a/generators/base-application/support/prepare-field.js b/generators/base-application/support/prepare-field.js index b193b732ad58..ff2222f8b019 100644 --- a/generators/base-application/support/prepare-field.js +++ b/generators/base-application/support/prepare-field.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { snakeCase, startCase, upperFirst, defaults, kebabCase } from 'lodash-es'; +import { defaults, kebabCase, snakeCase, startCase, upperFirst } from 'lodash-es'; import { fieldTypes, validations } from '../../../jdl/jhipster/index.js'; import { getTypescriptType, prepareField as prepareClientFieldForTemplates } from '../../client/support/index.js'; import { prepareField as prepareServerFieldForTemplates } from '../../server/support/index.js'; diff --git a/generators/base-application/support/prepare-field.spec.ts b/generators/base-application/support/prepare-field.spec.ts index b34b2f320058..7746a7760139 100644 --- a/generators/base-application/support/prepare-field.spec.ts +++ b/generators/base-application/support/prepare-field.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe, beforeEach } from 'esmocha'; +import { beforeEach, describe, it } from 'esmocha'; import { expect } from 'chai'; import { formatDateForChangelog } from '../../base/support/index.js'; import BaseGenerator from '../../base/index.js'; diff --git a/generators/base-application/support/prepare-relationship.js b/generators/base-application/support/prepare-relationship.js index 71c454b8f50a..76f2781114d4 100644 --- a/generators/base-application/support/prepare-relationship.js +++ b/generators/base-application/support/prepare-relationship.js @@ -19,7 +19,7 @@ import { lowerFirst, startCase, upperFirst } from 'lodash-es'; import pluralize from 'pluralize'; -import { databaseTypes, entityOptions, validations, checkAndReturnRelationshipOnValue } from '../../../jdl/jhipster/index.js'; +import { checkAndReturnRelationshipOnValue, databaseTypes, entityOptions, validations } from '../../../jdl/jhipster/index.js'; import { getJoinTableName, hibernateSnakeCase } from '../../server/support/index.js'; import { mutateData } from '../../base/support/config.js'; import { stringifyApplicationData } from './debug.js'; diff --git a/generators/base-application/support/relationship.ts b/generators/base-application/support/relationship.ts index 5185384204ae..c58784f57403 100644 --- a/generators/base-application/support/relationship.ts +++ b/generators/base-application/support/relationship.ts @@ -17,9 +17,9 @@ * limitations under the License. */ -import { upperFirst, lowerFirst } from 'lodash-es'; +import { lowerFirst, upperFirst } from 'lodash-es'; -import { JSONRelationship, JSONEntity } from '../../../jdl/converters/types.js'; +import { JSONEntity, JSONRelationship } from '../../../jdl/converters/types.js'; import { ValidationResult } from '../../base/api.js'; import { stringifyApplicationData } from './debug.js'; import { findEntityInEntities } from './entity.js'; diff --git a/generators/base-application/support/task-type-inference.ts b/generators/base-application/support/task-type-inference.ts index 04347b06b386..db29a0a7a4c9 100644 --- a/generators/base-application/support/task-type-inference.ts +++ b/generators/base-application/support/task-type-inference.ts @@ -15,7 +15,7 @@ * limitations under the License. */ import CoreGenerator from '../../base-core/generator.js'; -import { WriteFileSection, WriteFileBlock } from '../../base/api.js'; +import { WriteFileBlock, WriteFileSection } from '../../base/api.js'; import { GeneratorDefinition } from '../generator.js'; export function asWriteFilesSection( diff --git a/generators/base-application/tasks.d.ts b/generators/base-application/tasks.d.ts index 4cbbea7d6752..c5402f6c47a8 100644 --- a/generators/base-application/tasks.d.ts +++ b/generators/base-application/tasks.d.ts @@ -1,5 +1,5 @@ import type { Storage } from 'yeoman-generator'; -import { ControlTaskParam, BaseGeneratorDefinition, SourceTaskParam, GenericSourceTypeDefinition } from '../base/tasks.js'; +import { BaseGeneratorDefinition, ControlTaskParam, GenericSourceTypeDefinition, SourceTaskParam } from '../base/tasks.js'; import { ClientSourceType } from '../client/types.js'; import { BaseChangelog } from '../base-entity-changes/types.js'; import { CommonClientServerApplication } from './types.js'; diff --git a/generators/base-core/generator-core.spec.ts b/generators/base-core/generator-core.spec.ts index 2964b1915e51..da114db1c5d6 100644 --- a/generators/base-core/generator-core.spec.ts +++ b/generators/base-core/generator-core.spec.ts @@ -1,4 +1,4 @@ -import { it, describe, expect as jestExpect, beforeEach } from 'esmocha'; +import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { basicHelpers as helpers } from '../../testing/index.js'; import { createJHipsterLogger } from '../base/support/logger.js'; diff --git a/generators/base-core/generator.ts b/generators/base-core/generator.ts index 3a0233e1cf98..d608b0f7b316 100644 --- a/generators/base-core/generator.ts +++ b/generators/base-core/generator.ts @@ -16,17 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { basename, join as joinPath, dirname, relative, isAbsolute, join, extname } from 'path'; +import { basename, dirname, extname, isAbsolute, join, join as joinPath, relative } from 'path'; import { relative as posixRelative } from 'path/posix'; import { createHash } from 'crypto'; import { fileURLToPath } from 'url'; -import { statSync, rmSync, existsSync, readFileSync } from 'fs'; +import { existsSync, readFileSync, rmSync, statSync } from 'fs'; import assert from 'assert'; import { requireNamespace } from '@yeoman/namespace'; import { GeneratorMeta } from '@yeoman/types'; import chalk from 'chalk'; import { parse as parseYaml, stringify as stringifyYaml } from 'yaml'; -import { kebabCase, snakeCase, merge, get, set, defaults, mergeWith } from 'lodash-es'; +import { defaults, get, kebabCase, merge, mergeWith, set, snakeCase } from 'lodash-es'; import { simpleGit } from 'simple-git'; import type { CopyOptions } from 'mem-fs-editor'; import type { Data as TemplateData, Options as TemplateOptions } from 'ejs'; @@ -37,28 +37,28 @@ import latestVersion from 'latest-version'; import SharedData from '../base/shared-data.js'; import { CUSTOM_PRIORITIES, PRIORITY_NAMES, PRIORITY_PREFIX, QUEUES } from '../base/priorities.js'; import { + Logger, createJHipster7Context, formatDateForChangelog, joinCallbacks, - Logger, removeFieldsWithNullishValues, } from '../base/support/index.js'; import type { - JHipsterGeneratorOptions, - JHipsterGeneratorFeatures, + CascatedEditFileCallback, EditFileCallback, EditFileOptions, - CascatedEditFileCallback, + JHipsterArguments, + JHipsterCommandDefinition, + JHipsterConfigs, + JHipsterGeneratorFeatures, + JHipsterGeneratorOptions, JHipsterOptions, ValidationResult, WriteFileOptions, - JHipsterArguments, - JHipsterConfigs, - JHipsterCommandDefinition, } from '../base/api.js'; import { packageJson } from '../../lib/index.js'; -import { CommonClientServerApplication, type BaseApplication } from '../base-application/types.js'; +import { type BaseApplication, CommonClientServerApplication } from '../base-application/types.js'; import { GENERATOR_BOOTSTRAP } from '../generator-list.js'; import NeedleApi from '../needle-api.js'; import command from '../base/command.js'; diff --git a/generators/base-workspaces/generator.ts b/generators/base-workspaces/generator.ts index d47d39e20cfe..fb20bef03a14 100644 --- a/generators/base-workspaces/generator.ts +++ b/generators/base-workspaces/generator.ts @@ -26,7 +26,7 @@ import { YO_RC_FILE } from '../generator-constants.js'; import { GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js'; import { normalizePathEnd } from '../base/support/path.js'; import command from './command.js'; -import { PRIORITY_NAMES, CUSTOM_PRIORITIES } from './priorities.js'; +import { CUSTOM_PRIORITIES, PRIORITY_NAMES } from './priorities.js'; const { PROMPTING_WORKSPACES, diff --git a/generators/base-workspaces/internal/deployments.ts b/generators/base-workspaces/internal/deployments.ts index 4c02235d0b19..87f443740cbf 100644 --- a/generators/base-workspaces/internal/deployments.ts +++ b/generators/base-workspaces/internal/deployments.ts @@ -18,7 +18,7 @@ */ import { defaults } from 'lodash-es'; import { applicationOptions, deploymentOptions } from '../../../jdl/index.js'; -import { loadDerivedPlatformConfig, loadPlatformConfig, loadDerivedServerAndPlatformProperties } from '../../server/support/index.js'; +import { loadDerivedPlatformConfig, loadDerivedServerAndPlatformProperties, loadPlatformConfig } from '../../server/support/index.js'; import type { GeneratorBaseCore } from '../../index.js'; const { OptionNames } = applicationOptions; diff --git a/generators/base-workspaces/priorities.ts b/generators/base-workspaces/priorities.ts index 3bc19e2559a4..19f6302e1644 100644 --- a/generators/base-workspaces/priorities.ts +++ b/generators/base-workspaces/priorities.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { QUEUE_PREFIX, PRIORITY_NAMES as PRIORITY_NAMES_BASE, QUEUES as QUEUES_BASE } from '../base/priorities.js'; +import { PRIORITY_NAMES as PRIORITY_NAMES_BASE, QUEUES as QUEUES_BASE, QUEUE_PREFIX } from '../base/priorities.js'; const { DEFAULT } = PRIORITY_NAMES_BASE; diff --git a/generators/base/api.d.ts b/generators/base/api.d.ts index 27d1bf214779..b38ec0904d28 100644 --- a/generators/base/api.d.ts +++ b/generators/base/api.d.ts @@ -1,4 +1,4 @@ -import type { BaseOptions, BaseFeatures, ArgumentSpec, CliOptionSpec } from 'yeoman-generator'; +import type { ArgumentSpec, BaseFeatures, BaseOptions, CliOptionSpec } from 'yeoman-generator'; import type { RequireAtLeastOne, SetOptional } from 'type-fest'; import type CoreGenerator from '../base-core/index.js'; diff --git a/generators/base/blueprints.spec.ts b/generators/base/blueprints.spec.ts index ee5f8b2f2ef5..4886e3aa2ae0 100644 --- a/generators/base/blueprints.spec.ts +++ b/generators/base/blueprints.spec.ts @@ -1,4 +1,4 @@ -import { before, it, describe, expect, esmocha } from 'esmocha'; +import { before, describe, esmocha, expect, it } from 'esmocha'; import { RunResult } from 'yeoman-test'; import { toHaveBeenCalledAfter } from 'jest-extended'; diff --git a/generators/base/generator.spec.ts b/generators/base/generator.spec.ts index a17308665791..49aede1e41e8 100644 --- a/generators/base/generator.spec.ts +++ b/generators/base/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect, esmocha } from 'esmocha'; +import { before, describe, esmocha, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import EnvironmentBuilder from '../../cli/environment-builder.mjs'; diff --git a/generators/base/generator.ts b/generators/base/generator.ts index 2a6e591161ec..471085f1b8dd 100644 --- a/generators/base/generator.ts +++ b/generators/base/generator.ts @@ -26,7 +26,7 @@ import { packageJson } from '../../lib/index.js'; import CoreGenerator from '../base-core/index.js'; import { loadStoredAppOptions } from '../app/support/index.js'; import { packageNameToNamespace } from './support/index.js'; -import { mergeBlueprints, parseBluePrints, loadBlueprintsFromConfiguration, normalizeBlueprintName } from './internal/index.js'; +import { loadBlueprintsFromConfiguration, mergeBlueprints, normalizeBlueprintName, parseBluePrints } from './internal/index.js'; import { PRIORITY_NAMES } from './priorities.js'; import { BaseGeneratorDefinition, GenericTaskGroup } from './tasks.js'; import type { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from './api.js'; diff --git a/generators/base/internal/blueprint.spec.ts b/generators/base/internal/blueprint.spec.ts index 44705ca8f09b..1cbc5330e8b5 100644 --- a/generators/base/internal/blueprint.spec.ts +++ b/generators/base/internal/blueprint.spec.ts @@ -1,5 +1,5 @@ import assert from 'assert'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { mergeBlueprints, normalizeBlueprintName, parseBluePrints, removeBlueprintDuplicates } from './blueprint.js'; describe('generator - base - internal - blueprint', () => { diff --git a/generators/base/support/basename.spec.ts b/generators/base/support/basename.spec.ts index 610ce5d2eaa0..573a994ca3be 100644 --- a/generators/base/support/basename.spec.ts +++ b/generators/base/support/basename.spec.ts @@ -1,4 +1,4 @@ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { getFrontendAppName } from './basename.js'; describe('generator > base', () => { diff --git a/generators/base/support/config.spec.ts b/generators/base/support/config.spec.ts index bec80e7998d0..3e313a6bcc87 100644 --- a/generators/base/support/config.spec.ts +++ b/generators/base/support/config.spec.ts @@ -1,4 +1,4 @@ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { removeFieldsWithNullishValues } from './config.js'; describe('generator - base - support - config', () => { diff --git a/generators/base/support/contents.spec.ts b/generators/base/support/contents.spec.ts index 566cd67b188d..4d6ef9e13d69 100644 --- a/generators/base/support/contents.spec.ts +++ b/generators/base/support/contents.spec.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { normalizeLineEndings, stripMargin } from './contents.js'; describe('generator - base - support - contents', () => { diff --git a/generators/base/support/logger.ts b/generators/base/support/logger.ts index 4a53ba1ccee8..73215195e7e3 100644 --- a/generators/base/support/logger.ts +++ b/generators/base/support/logger.ts @@ -18,7 +18,7 @@ */ import chalk from 'chalk'; import type { Logger as LoggerApi } from '@yeoman/types'; -import { createLogger, LoggerOptions, Logger as DefaultLogger } from '@yeoman/adapter'; +import { Logger as DefaultLogger, LoggerOptions, createLogger } from '@yeoman/adapter'; import createDebug from 'debug'; /** diff --git a/generators/base/support/needles.spec.ts b/generators/base/support/needles.spec.ts index 0261ad78dbc4..4e6263bd676b 100644 --- a/generators/base/support/needles.spec.ts +++ b/generators/base/support/needles.spec.ts @@ -16,8 +16,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { it, describe, expect, esmocha, beforeEach } from 'esmocha'; -import { checkContentIn, insertContentBeforeNeedle, createNeedleCallback, createBaseNeedle } from './needles.js'; +import { beforeEach, describe, esmocha, expect, it } from 'esmocha'; +import { checkContentIn, createBaseNeedle, createNeedleCallback, insertContentBeforeNeedle } from './needles.js'; describe('needles - support', () => { describe('checkContentIn', () => { diff --git a/generators/base/support/string.spec.ts b/generators/base/support/string.spec.ts index 396f4bcac294..2ce687154666 100644 --- a/generators/base/support/string.spec.ts +++ b/generators/base/support/string.spec.ts @@ -1,5 +1,5 @@ import assert from 'assert'; -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { stringHashCode } from './string.js'; describe('generator - base - support - string', () => { diff --git a/generators/base/support/timestamp.spec.ts b/generators/base/support/timestamp.spec.ts index 304e9363abec..1cc04f25b114 100644 --- a/generators/base/support/timestamp.spec.ts +++ b/generators/base/support/timestamp.spec.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { parseChangelog } from './timestamp.js'; describe('generator - base - support - timestamp', () => { diff --git a/generators/base/support/write-files.spec.ts b/generators/base/support/write-files.spec.ts index 5d837b7a6781..9a98ff181cf2 100644 --- a/generators/base/support/write-files.spec.ts +++ b/generators/base/support/write-files.spec.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { it, describe, expect, esmocha } from 'esmocha'; +import { describe, esmocha, expect, it } from 'esmocha'; import { EditFileCallback } from '../api.js'; import { joinCallbacks } from './write-files.js'; diff --git a/generators/bootstrap-application-base/generator.spec.ts b/generators/bootstrap-application-base/generator.spec.ts index b2de2d9d2972..a647775f845b 100644 --- a/generators/bootstrap-application-base/generator.spec.ts +++ b/generators/bootstrap-application-base/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect, beforeEach } from 'esmocha'; +import { before, beforeEach, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { defaultHelpers as helpers, runResult } from '../../testing/index.js'; diff --git a/generators/bootstrap-application-base/generator.ts b/generators/bootstrap-application-base/generator.ts index 062dcd37edae..c1ced6a2c432 100644 --- a/generators/bootstrap-application-base/generator.ts +++ b/generators/bootstrap-application-base/generator.ts @@ -28,10 +28,10 @@ import { addFakerToEntity, loadEntitiesAnnotations, loadEntitiesOtherSide, - stringifyApplicationData, prepareEntity as prepareEntityForTemplates, prepareField as prepareFieldForTemplates, prepareRelationship, + stringifyApplicationData, } from '../base-application/support/index.js'; import { JAVA_DOCKER_DIR } from '../generator-constants.js'; import { GENERATOR_BOOTSTRAP, GENERATOR_COMMON, GENERATOR_PROJECT_NAME } from '../generator-list.js'; diff --git a/generators/bootstrap-application-client/generator.spec.ts b/generators/bootstrap-application-client/generator.spec.ts index 2e519225e9bc..f53fc3a41a0c 100644 --- a/generators/bootstrap-application-client/generator.spec.ts +++ b/generators/bootstrap-application-client/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { defaultHelpers as helpers } from '../../testing/index.js'; diff --git a/generators/bootstrap-application-client/generator.ts b/generators/bootstrap-application-client/generator.ts index 4f71d030177e..80d4fed32a1f 100644 --- a/generators/bootstrap-application-client/generator.ts +++ b/generators/bootstrap-application-client/generator.ts @@ -17,11 +17,11 @@ * limitations under the License. */ import { + filterEntitiesAndPropertiesForClient, + filterEntitiesForClient, loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties, - filterEntitiesAndPropertiesForClient, - filterEntitiesForClient, } from '../client/support/index.js'; import BaseApplicationGenerator from '../base-application/index.js'; import { loadStoredAppOptions } from '../app/support/index.js'; diff --git a/generators/bootstrap-application-server/generator.spec.ts b/generators/bootstrap-application-server/generator.spec.ts index 2e519225e9bc..f53fc3a41a0c 100644 --- a/generators/bootstrap-application-server/generator.spec.ts +++ b/generators/bootstrap-application-server/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { defaultHelpers as helpers } from '../../testing/index.js'; diff --git a/generators/bootstrap-application-server/generator.ts b/generators/bootstrap-application-server/generator.ts index 1d525fbb5c24..1717c35398e1 100644 --- a/generators/bootstrap-application-server/generator.ts +++ b/generators/bootstrap-application-server/generator.ts @@ -30,12 +30,12 @@ import { } from '../generator-constants.js'; import { loadRequiredConfigIntoEntity, prepareEntityPrimaryKeyForTemplates } from '../base-application/support/index.js'; import { - loadRequiredConfigDerivedProperties, - prepareEntity as prepareEntityServerForTemplates, addEntitiesOtherRelationships, hibernateSnakeCase, - loadServerConfig, loadDerivedServerConfig, + loadRequiredConfigDerivedProperties, + loadServerConfig, + prepareEntity as prepareEntityServerForTemplates, prepareRelationship, } from '../server/support/index.js'; import { getGradleLibsVersionsProperties } from '../gradle/support/index.js'; diff --git a/generators/bootstrap-application/generator.spec.ts b/generators/bootstrap-application/generator.spec.ts index 3b09bd3c66d0..e29f6f97be78 100644 --- a/generators/bootstrap-application/generator.spec.ts +++ b/generators/bootstrap-application/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { defaultHelpers as helpers, result as runResult } from '../../testing/index.js'; diff --git a/generators/bootstrap-application/generator.ts b/generators/bootstrap-application/generator.ts index d57707b27b1d..97ff0768fc6c 100644 --- a/generators/bootstrap-application/generator.ts +++ b/generators/bootstrap-application/generator.ts @@ -21,10 +21,10 @@ import assert from 'assert'; import BaseApplicationGenerator from '../base-application/index.js'; import { validations } from '../../jdl/jhipster/index.js'; import { - stringifyApplicationData, derivedPrimaryKeyProperties, preparePostEntitiesCommonDerivedProperties, preparePostEntityCommonDerivedProperties, + stringifyApplicationData, } from '../base-application/support/index.js'; import { preparePostEntityServerDerivedProperties } from '../server/support/index.js'; diff --git a/generators/bootstrap/generator.spec.ts b/generators/bootstrap/generator.spec.ts index b25895cf89f4..d90bf385002d 100644 --- a/generators/bootstrap/generator.spec.ts +++ b/generators/bootstrap/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures } from '../../test/support/tests.js'; diff --git a/generators/bootstrap/generator.ts b/generators/bootstrap/generator.ts index be5b84b6a41e..a96d57bed5eb 100644 --- a/generators/bootstrap/generator.ts +++ b/generators/bootstrap/generator.ts @@ -17,9 +17,9 @@ * limitations under the License. */ import { Duplex } from 'stream'; -import { forceYoFiles, createConflicterTransform, createYoResolveTransform } from '@yeoman/conflicter'; +import { createConflicterTransform, createYoResolveTransform, forceYoFiles } from '@yeoman/conflicter'; import type { MemFsEditorFile } from 'mem-fs-editor'; -import { isFileStateModified, isFilePending } from 'mem-fs-editor/state'; +import { isFilePending, isFileStateModified } from 'mem-fs-editor/state'; import { createCommitTransform } from 'mem-fs-editor/transform'; import { Options as PrettierOptions } from 'prettier'; import type { FileTransform, PipelineOptions } from 'mem-fs'; @@ -31,14 +31,14 @@ import { PRIORITY_NAMES, QUEUES } from '../base-application/priorities.js'; import type { BaseGeneratorDefinition, GenericTaskGroup } from '../base/tasks.js'; import { loadStoredAppOptions } from '../app/support/index.js'; import { - createMultiStepTransform, - createPrettierTransform, - createForceWriteConfigFilesTransform, autoCrlfTransform, - isPrettierConfigFilePath, - createSortConfigFilesTransform, createESLintTransform, + createForceWriteConfigFilesTransform, + createMultiStepTransform, + createPrettierTransform, createRemoveUnusedImportsTransform, + createSortConfigFilesTransform, + isPrettierConfigFilePath, } from './support/index.js'; const { MULTISTEP_TRANSFORM, PRE_CONFLICTS } = PRIORITY_NAMES; diff --git a/generators/bootstrap/support/auto-crlf-transform.spec.ts b/generators/bootstrap/support/auto-crlf-transform.spec.ts index 776cb4968133..bea661055653 100644 --- a/generators/bootstrap/support/auto-crlf-transform.spec.ts +++ b/generators/bootstrap/support/auto-crlf-transform.spec.ts @@ -1,4 +1,4 @@ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { defaultHelpers as helpers } from '../../../testing/index.js'; import { detectCrLf } from './auto-crlf-transform.js'; diff --git a/generators/bootstrap/support/eslint-transform.spec.ts b/generators/bootstrap/support/eslint-transform.spec.ts index 108fdc6cc192..a5b3131968ce 100644 --- a/generators/bootstrap/support/eslint-transform.spec.ts +++ b/generators/bootstrap/support/eslint-transform.spec.ts @@ -1,6 +1,6 @@ import { Readable } from 'stream'; import { pipeline } from 'stream/promises'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { transform } from 'p-transform'; import { setModifiedFileState } from 'mem-fs-editor/state'; diff --git a/generators/bootstrap/support/prettier-worker.js b/generators/bootstrap/support/prettier-worker.js index e9fda01600b4..4ddafb94a9a4 100644 --- a/generators/bootstrap/support/prettier-worker.js +++ b/generators/bootstrap/support/prettier-worker.js @@ -1,4 +1,4 @@ -import { resolveConfig, format } from 'prettier'; +import { format, resolveConfig } from 'prettier'; import prettierPluginJava from 'prettier-plugin-java'; import prettierPluginProperties from 'prettier-plugin-properties'; import prettierPluginPackagejson from 'prettier-plugin-packagejson'; diff --git a/generators/ci-cd/ci-cd.spec.ts b/generators/ci-cd/ci-cd.spec.ts index e3fa7454ce36..14cad421280e 100644 --- a/generators/ci-cd/ci-cd.spec.ts +++ b/generators/ci-cd/ci-cd.spec.ts @@ -1,4 +1,4 @@ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { GENERATOR_CI_CD } from '../generator-list.js'; import { dryRunHelpers as helpers } from '../../testing/index.js'; diff --git a/generators/ci-cd/command.ts b/generators/ci-cd/command.ts index e8d94b563e34..28b8b2991fb4 100644 --- a/generators/ci-cd/command.ts +++ b/generators/ci-cd/command.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import chalk from 'chalk'; -import { kebabCase, intersection } from 'lodash-es'; +import { intersection, kebabCase } from 'lodash-es'; import type { JHipsterCommandDefinition } from '../base/api.js'; const includesValue = (prop, values) => answers => answers[prop] && intersection(answers[prop], values).length > 0; diff --git a/generators/ci-cd/generator.spec.js b/generators/ci-cd/generator.spec.js index 2ba7f42964c7..eac371cd8f9f 100644 --- a/generators/ci-cd/generator.spec.js +++ b/generators/ci-cd/generator.spec.js @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; diff --git a/generators/client/generator-needles.spec.ts b/generators/client/generator-needles.spec.ts index 5a942476496e..eacdd5496f04 100644 --- a/generators/client/generator-needles.spec.ts +++ b/generators/client/generator-needles.spec.ts @@ -1,5 +1,5 @@ -import { before, it, describe } from 'esmocha'; -import { basicHelpers as helpers, result as runResult, getGenerator } from '../../testing/index.js'; +import { before, describe, it } from 'esmocha'; +import { getGenerator, basicHelpers as helpers, result as runResult } from '../../testing/index.js'; import { CLIENT_WEBPACK_DIR } from '../generator-constants.js'; import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; import ClientGenerator from './index.js'; diff --git a/generators/client/generator.js b/generators/client/generator.js index b368ce829759..6b5d5c6537a7 100644 --- a/generators/client/generator.js +++ b/generators/client/generator.js @@ -20,9 +20,9 @@ import BaseApplicationGenerator from '../base-application/index.js'; import { LOGIN_REGEX_JS } from '../generator-constants.js'; -import { GENERATOR_CYPRESS, GENERATOR_COMMON, GENERATOR_CLIENT } from '../generator-list.js'; +import { GENERATOR_CLIENT, GENERATOR_COMMON, GENERATOR_CYPRESS } from '../generator-list.js'; -import { testFrameworkTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.js'; +import { clientFrameworkTypes, testFrameworkTypes } from '../../jdl/jhipster/index.js'; import { createNeedleCallback } from '../base/support/index.js'; import { loadStoredAppOptions } from '../app/support/index.js'; import { addEnumerationFiles } from './entity-files.js'; diff --git a/generators/client/generator.spec.ts b/generators/client/generator.spec.ts index 2855902ac727..bde54c4f4a4f 100644 --- a/generators/client/generator.spec.ts +++ b/generators/client/generator.spec.ts @@ -20,8 +20,8 @@ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; import assert from 'assert'; import { snakeCase } from 'lodash-es'; -import { before, it, describe, expect } from 'esmocha'; -import { shouldSupportFeatures, testBlueprintSupport, checkEnforcements } from '../../test/support/index.js'; +import { before, describe, expect, it } from 'esmocha'; +import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js'; import { defaultHelpers as helpers, result } from '../../testing/index.js'; import { testFrameworkTypes } from '../../jdl/jhipster/index.js'; import { GENERATOR_CLIENT } from '../generator-list.js'; diff --git a/generators/client/generators/common/generator.spec.ts b/generators/client/generators/common/generator.spec.ts index 56dfe4af5064..efabf488d39b 100644 --- a/generators/client/generators/common/generator.spec.ts +++ b/generators/client/generators/common/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/client/needle-client.spec.ts b/generators/client/needle-client.spec.ts index 0c89ff173d4d..7c8cea6a2c8e 100644 --- a/generators/client/needle-client.spec.ts +++ b/generators/client/needle-client.spec.ts @@ -1,7 +1,7 @@ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import ClientGenerator from '../../generators/client/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; -import { dryRunHelpers as helpers, result as runResult, getGenerator } from '../../testing/index.js'; +import { getGenerator, dryRunHelpers as helpers, result as runResult } from '../../testing/index.js'; const mockBlueprintSubGen: any = class extends ClientGenerator { constructor(args, opts, features) { diff --git a/generators/client/prompts.spec.ts b/generators/client/prompts.spec.ts index 613a908d7e15..4bb60fdaffd2 100644 --- a/generators/client/prompts.spec.ts +++ b/generators/client/prompts.spec.ts @@ -1,13 +1,13 @@ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { defaultHelpers as helpers } from '../../testing/index.js'; import { applicationTypes, - databaseTypes, - cacheTypes, authenticationTypes, - testFrameworkTypes, - clientFrameworkTypes, buildToolTypes, + cacheTypes, + clientFrameworkTypes, + databaseTypes, + testFrameworkTypes, } from '../../jdl/jhipster/index.js'; import { GENERATOR_APP } from '../generator-list.js'; diff --git a/generators/client/support/entity-definition.js b/generators/client/support/entity-definition.js index b5f7e14dfa37..cec5896faa3a 100644 --- a/generators/client/support/entity-definition.js +++ b/generators/client/support/entity-definition.js @@ -17,7 +17,7 @@ * limitations under the License. */ -import { fieldTypes, validations, clientFrameworkTypes } from '../../../jdl/jhipster/index.js'; +import { clientFrameworkTypes, fieldTypes, validations } from '../../../jdl/jhipster/index.js'; import getTypescriptKeyType from './types-utils.js'; import { filterRelevantRelationships } from './template-utils.js'; diff --git a/generators/client/support/template-utils.js b/generators/client/support/template-utils.js index 825c1f878cab..0247a35cc2ac 100644 --- a/generators/client/support/template-utils.js +++ b/generators/client/support/template-utils.js @@ -18,7 +18,7 @@ */ import path from 'path'; -import { fieldTypes, clientFrameworkTypes } from '../../../jdl/jhipster/index.js'; +import { clientFrameworkTypes, fieldTypes } from '../../../jdl/jhipster/index.js'; import { getEntryIfTypeOrTypeAttribute } from './types-utils.js'; const { STRING: TYPE_STRING, UUID: TYPE_UUID } = fieldTypes.CommonDBTypes; diff --git a/generators/client/support/template-utils.spec.js b/generators/client/support/template-utils.spec.js index 4cb69f2b2e5e..58eb75dbddbb 100644 --- a/generators/client/support/template-utils.spec.js +++ b/generators/client/support/template-utils.spec.js @@ -1,6 +1,6 @@ import path from 'path'; import { expect } from 'chai'; -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { entityOptions } from '../../../jdl/jhipster/index.js'; import { generateEntityClientImports, generateTestEntityId, getEntityParentPathAddition } from './template-utils.js'; diff --git a/generators/client/support/types-utils.spec.js b/generators/client/support/types-utils.spec.js index 4b7affef8c92..890b3f2adc1f 100644 --- a/generators/client/support/types-utils.spec.js +++ b/generators/client/support/types-utils.spec.js @@ -1,4 +1,4 @@ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { fieldTypes } from '../../../jdl/jhipster/index.js'; import { getTypescriptType } from './types-utils.js'; diff --git a/generators/common/generator.js b/generators/common/generator.js index 6870df0fe179..84d2bbed0a00 100644 --- a/generators/common/generator.js +++ b/generators/common/generator.js @@ -21,11 +21,11 @@ import { isFileStateModified } from 'mem-fs-editor/state'; import BaseApplicationGenerator from '../base-application/index.js'; import { + JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, + JHIPSTER_DOCUMENTATION_URL, MAIN_DIR, - TEST_DIR, SERVER_MAIN_RES_DIR, - JHIPSTER_DOCUMENTATION_URL, - JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, + TEST_DIR, } from '../generator-constants.js'; import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; import { GENERATOR_COMMON, GENERATOR_GIT } from '../generator-list.js'; diff --git a/generators/common/generator.spec.js b/generators/common/generator.spec.js index 46d459222184..c2c9c414e7cd 100644 --- a/generators/common/generator.spec.js +++ b/generators/common/generator.spec.js @@ -18,11 +18,11 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; -import { defaultHelpers as helpers, basicHelpers, runResult } from '../../testing/index.js'; -import { shouldSupportFeatures, testBlueprintSupport, checkEnforcements } from '../../test/support/index.js'; +import { basicHelpers, defaultHelpers as helpers, runResult } from '../../testing/index.js'; +import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js'; import { GENERATOR_COMMON } from '../generator-list.js'; import Generator from './index.js'; diff --git a/generators/cucumber/files.ts b/generators/cucumber/files.ts index 3dee663fabbc..9788c87fd211 100644 --- a/generators/cucumber/files.ts +++ b/generators/cucumber/files.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { moveToJavaPackageTestDir } from '../server/support/index.js'; -import { SERVER_TEST_SRC_DIR, SERVER_TEST_RES_DIR, GRADLE_BUILD_SRC_MAIN_DIR } from '../generator-constants.js'; +import { GRADLE_BUILD_SRC_MAIN_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR } from '../generator-constants.js'; import { WriteFileSection } from '../base/api.js'; import { CommonClientServerApplication } from '../base-application/types.js'; import Generator from './generator.js'; diff --git a/generators/cucumber/generator.spec.ts b/generators/cucumber/generator.spec.ts index ea55093f8c63..5916773ed2f6 100644 --- a/generators/cucumber/generator.spec.ts +++ b/generators/cucumber/generator.spec.ts @@ -1,6 +1,6 @@ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; diff --git a/generators/cypress/generator.spec.ts b/generators/cypress/generator.spec.ts index 1e3eeb21c774..c2cdb11c41c8 100644 --- a/generators/cypress/generator.spec.ts +++ b/generators/cypress/generator.spec.ts @@ -18,11 +18,11 @@ */ import path, { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, after, expect } from 'esmocha'; +import { after, before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { clientFrameworkTypes, testFrameworkTypes } from '../../jdl/jhipster/index.js'; -import { fromMatrix, extendMatrix, AuthenticationTypeMatrix, defaultHelpers as helpers } from '../../testing/index.js'; -import { shouldSupportFeatures, testBlueprintSupport, checkEnforcements } from '../../test/support/index.js'; +import { AuthenticationTypeMatrix, extendMatrix, fromMatrix, defaultHelpers as helpers } from '../../testing/index.js'; +import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js'; import { GENERATOR_CYPRESS } from '../generator-list.js'; import Generator from './generator.js'; diff --git a/generators/cypress/generator.ts b/generators/cypress/generator.ts index 87d2fa1b3456..6cc95cad1c6d 100644 --- a/generators/cypress/generator.ts +++ b/generators/cypress/generator.ts @@ -17,13 +17,13 @@ * limitations under the License. */ -import { stringHashCode, createFaker } from '../base/support/index.js'; +import { createFaker, stringHashCode } from '../base/support/index.js'; import BaseApplicationGenerator from '../base-application/index.js'; import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; import { generateTestEntity as entityWithFakeValues } from '../client/support/index.js'; -import { cypressFiles, cypressEntityFiles } from './files.js'; +import { cypressEntityFiles, cypressFiles } from './files.js'; const { ANGULAR } = clientFrameworkTypes; diff --git a/generators/docker-compose/docker-compose.spec.ts b/generators/docker-compose/docker-compose.spec.ts index ae3ddf4cca04..5754fbb49f26 100644 --- a/generators/docker-compose/docker-compose.spec.ts +++ b/generators/docker-compose/docker-compose.spec.ts @@ -1,8 +1,8 @@ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import monitoringTypes from '../../jdl/jhipster/monitoring-types.js'; import applicationTypes from '../../jdl/jhipster/application-types.js'; import { GENERATOR_DOCKER_COMPOSE } from '../generator-list.js'; -import { defaultHelpers as helpers, getGenerator, runResult } from '../../testing/index.js'; +import { getGenerator, defaultHelpers as helpers, runResult } from '../../testing/index.js'; const { PROMETHEUS } = monitoringTypes; const { MICROSERVICE, MONOLITH } = applicationTypes; diff --git a/generators/docker-compose/generator.js b/generators/docker-compose/generator.js index a214616051ac..8e85d37a75b6 100644 --- a/generators/docker-compose/generator.js +++ b/generators/docker-compose/generator.js @@ -27,7 +27,7 @@ import BaseWorkspacesGenerator from '../base-workspaces/index.js'; import { deploymentOptions, monitoringTypes, serviceDiscoveryTypes } from '../../jdl/jhipster/index.js'; import { GENERATOR_BOOTSTRAP_WORKSPACES } from '../generator-list.js'; -import { stringHashCode, createFaker, convertSecretToBase64, createBase64Secret } from '../base/support/index.js'; +import { convertSecretToBase64, createBase64Secret, createFaker, stringHashCode } from '../base/support/index.js'; import { checkDocker } from '../base-workspaces/internal/docker-base.js'; import { loadDockerDependenciesTask } from '../base-workspaces/internal/index.js'; import { loadDerivedPlatformConfig, loadPlatformConfig } from '../server/support/index.js'; diff --git a/generators/docker-compose/generator.spec.js b/generators/docker-compose/generator.spec.js index b25895cf89f4..d90bf385002d 100644 --- a/generators/docker-compose/generator.spec.js +++ b/generators/docker-compose/generator.spec.js @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures } from '../../test/support/tests.js'; diff --git a/generators/docker/generator.js b/generators/docker/generator.js index e3db19b46686..79f51189821e 100644 --- a/generators/docker/generator.js +++ b/generators/docker/generator.js @@ -20,7 +20,7 @@ import { intersection } from 'lodash-es'; import BaseApplicationGenerator from '../base-application/index.js'; import { createDockerComposeFile, createDockerExtendedServices } from '../docker/support/index.js'; -import { stringHashCode, createFaker } from '../base/support/index.js'; +import { createFaker, stringHashCode } from '../base/support/index.js'; import { getJdbcUrl, getR2dbcUrl } from '../spring-data-relational/support/index.js'; import { dockerFiles } from './files.js'; import { SERVICE_COMPLETED_SUCCESSFULLY, SERVICE_HEALTHY } from './constants.js'; diff --git a/generators/docker/generator.spec.ts b/generators/docker/generator.spec.ts index 1fae3f0666b8..0148cb1566a2 100644 --- a/generators/docker/generator.spec.ts +++ b/generators/docker/generator.spec.ts @@ -18,20 +18,20 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { buildSamplesFromMatrix, + buildServerMatrix, extendFilteredMatrix, extendMatrix, defaultHelpers as helpers, runResult, - buildServerMatrix, } from '../../testing/index.js'; import { matchElasticSearchDocker } from '../spring-data-elasticsearch/__test-support/elastic-search-matcher.js'; -import { databaseTypes, searchEngineTypes, serviceDiscoveryTypes, cacheTypes } from '../../jdl/jhipster/index.js'; +import { cacheTypes, databaseTypes, searchEngineTypes, serviceDiscoveryTypes } from '../../jdl/jhipster/index.js'; import { MESSAGE_BROKER_KAFKA, MESSAGE_BROKER_NO, MESSAGE_BROKER_PULSAR } from '../server/options/message-broker.js'; import { shouldSupportFeatures } from '../../test/support/tests.js'; import { matchConsul, matchEureka } from './__test-support/service-discovery-matcher.js'; diff --git a/generators/docker/support/docker-compose-file.spec.ts b/generators/docker/support/docker-compose-file.spec.ts index 2f3cc1fe68cd..fca234be36de 100644 --- a/generators/docker/support/docker-compose-file.spec.ts +++ b/generators/docker/support/docker-compose-file.spec.ts @@ -1,4 +1,4 @@ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { createDockerComposeFile } from './docker-compose-file.js'; describe('generator - docker - docker-compose-file', () => { diff --git a/generators/entities/generator.spec.ts b/generators/entities/generator.spec.ts index 94cb19108dad..6620f64b7b9c 100644 --- a/generators/entities/generator.spec.ts +++ b/generators/entities/generator.spec.ts @@ -18,10 +18,10 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; -import { SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; +import { CLIENT_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR } from '../generator-constants.js'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import { skipPrettierHelpers as helpers, result as runResult } from '../../testing/index.js'; import Generator from './generator.js'; diff --git a/generators/entity/database-changelog.spec.ts b/generators/entity/database-changelog.spec.ts index d2d06a1491c0..d5cb2139fa2f 100644 --- a/generators/entity/database-changelog.spec.ts +++ b/generators/entity/database-changelog.spec.ts @@ -1,5 +1,5 @@ -import { before, it, describe } from 'esmocha'; -import { defaultHelpers as helpers, runResult, getGenerator } from '../../testing/index.js'; +import { before, describe, it } from 'esmocha'; +import { getGenerator, defaultHelpers as helpers, runResult } from '../../testing/index.js'; import { SERVER_MAIN_RES_DIR } from '../generator-constants.js'; import BaseApplicationGenerator from '../base-application/generator.js'; diff --git a/generators/entity/generator.spec.js b/generators/entity/generator.spec.js index 8dc47a0b505b..2e293135ab20 100644 --- a/generators/entity/generator.spec.js +++ b/generators/entity/generator.spec.js @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; diff --git a/generators/entity/prompts.js b/generators/entity/prompts.js index 7619f80f7dc2..17e2701a7b23 100644 --- a/generators/entity/prompts.js +++ b/generators/entity/prompts.js @@ -20,13 +20,13 @@ import fs from 'fs'; import chalk from 'chalk'; import { isArray, lowerFirst, snakeCase, uniq, upperFirst } from 'lodash-es'; import { - reservedKeywords, - databaseTypes, applicationTypes, + clientFrameworkTypes, + databaseTypes, entityOptions, fieldTypes, + reservedKeywords, validations, - clientFrameworkTypes, } from '../../jdl/jhipster/index.js'; import { inputIsNumber, inputIsSignedDecimalNumber, inputIsSignedNumber } from './support/index.js'; diff --git a/generators/entity/single-entity.spec.ts b/generators/entity/single-entity.spec.ts index 60bb4cdbe71c..f5860a204578 100644 --- a/generators/entity/single-entity.spec.ts +++ b/generators/entity/single-entity.spec.ts @@ -1,6 +1,6 @@ -import { before, it, describe, after, expect } from 'esmocha'; +import { after, before, describe, expect, it } from 'esmocha'; import { skipPrettierHelpers as helpers, result as runResult } from '../../testing/index.js'; -import { SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; +import { CLIENT_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR } from '../generator-constants.js'; import BaseApplicationGenerator from '../base-application/generator.js'; import { GENERATOR_ENTITY } from '../generator-list.js'; diff --git a/generators/export-jdl/export-jdl.spec.ts b/generators/export-jdl/export-jdl.spec.ts index a54d6fbeec6d..69d615c19340 100644 --- a/generators/export-jdl/export-jdl.spec.ts +++ b/generators/export-jdl/export-jdl.spec.ts @@ -1,4 +1,4 @@ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { defaultHelpers as helpers } from '../../testing/index.js'; import { GENERATOR_EXPORT_JDL } from '../generator-list.js'; diff --git a/generators/export-jdl/generator.spec.ts b/generators/export-jdl/generator.spec.ts index b25895cf89f4..d90bf385002d 100644 --- a/generators/export-jdl/generator.spec.ts +++ b/generators/export-jdl/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures } from '../../test/support/tests.js'; diff --git a/generators/export-jdl/generator.ts b/generators/export-jdl/generator.ts index 1c3411f3792d..c381a060ca40 100644 --- a/generators/export-jdl/generator.ts +++ b/generators/export-jdl/generator.ts @@ -22,7 +22,7 @@ import BaseGenerator from '../base/index.js'; import { applicationOptions } from '../../jdl/jhipster/index.js'; import JSONToJDLConverter from '../../jdl/converters/json-to-jdl-converter.js'; -import type { JHipsterGeneratorOptions, JHipsterGeneratorFeatures } from '../base/api.js'; +import type { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from '../base/api.js'; const { OptionNames } = applicationOptions; diff --git a/generators/feign-client/generator.spec.ts b/generators/feign-client/generator.spec.ts index ef896b7559f3..2807193b43d5 100644 --- a/generators/feign-client/generator.spec.ts +++ b/generators/feign-client/generator.spec.ts @@ -1,8 +1,8 @@ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { defaultHelpers as helpers, runResult } from '../../testing/index.js'; -import { shouldSupportFeatures, testBlueprintSupport, checkEnforcements } from '../../test/support/index.js'; +import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js'; import Generator from '../server/index.js'; import { GENERATOR_FEIGN_CLIENT } from '../generator-list.js'; diff --git a/generators/gatling/files.ts b/generators/gatling/files.ts index e9b70c5529b4..5d6df17f266b 100644 --- a/generators/gatling/files.ts +++ b/generators/gatling/files.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { TEST_DIR, GRADLE_BUILD_SRC_MAIN_DIR } from '../generator-constants.js'; +import { GRADLE_BUILD_SRC_MAIN_DIR, TEST_DIR } from '../generator-constants.js'; import { WriteFileSection } from '../base/api.js'; import { SpringBootApplication } from '../server/types.js'; import Generator from './generator.js'; diff --git a/generators/gatling/generator.spec.ts b/generators/gatling/generator.spec.ts index 3eac68382a35..833e2cbb423a 100644 --- a/generators/gatling/generator.spec.ts +++ b/generators/gatling/generator.spec.ts @@ -1,6 +1,6 @@ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; diff --git a/generators/generate-blueprint/generator.js b/generators/generate-blueprint/generator.js index 29208857a971..b9871b05e7f4 100644 --- a/generators/generate-blueprint/generator.js +++ b/generators/generate-blueprint/generator.js @@ -17,7 +17,7 @@ * limitations under the License. */ import chalk from 'chalk'; -import { camelCase, upperFirst, snakeCase } from 'lodash-es'; +import { camelCase, snakeCase, upperFirst } from 'lodash-es'; import BaseGenerator from '../base-application/index.js'; import { PRIORITY_NAMES_LIST as BASE_PRIORITY_NAMES_LIST } from '../base/priorities.js'; @@ -27,23 +27,23 @@ import { packageJson } from '../../lib/index.js'; import { BLUEPRINT_API_VERSION, NODE_VERSION } from '../generator-constants.js'; import { files, generatorFiles } from './files.js'; import { - requiredConfig, - defaultConfig, - defaultSubGeneratorConfig, - allGeneratorsConfig, - prompts, - subGeneratorPrompts, - GENERATE_SNAPSHOTS, - LINK_JHIPSTER_DEPENDENCY, + ADDITIONAL_SUB_GENERATORS, ALL_GENERATORS, + ALL_PRIORITIES, + DYNAMIC, + GENERATE_SNAPSHOTS, GENERATORS, + LINK_JHIPSTER_DEPENDENCY, + LOCAL_BLUEPRINT_OPTION, PRIORITIES, SUB_GENERATORS, - ADDITIONAL_SUB_GENERATORS, WRITTEN, - LOCAL_BLUEPRINT_OPTION, - ALL_PRIORITIES, - DYNAMIC, + allGeneratorsConfig, + defaultConfig, + defaultSubGeneratorConfig, + prompts, + requiredConfig, + subGeneratorPrompts, } from './constants.js'; const { GENERATOR_PROJECT_NAME, GENERATOR_INIT } = GENERATOR_LIST; diff --git a/generators/generate-blueprint/generator.spec.js b/generators/generate-blueprint/generator.spec.js index 6450c03acac1..ddf1f4718c95 100644 --- a/generators/generate-blueprint/generator.spec.js +++ b/generators/generate-blueprint/generator.spec.js @@ -18,7 +18,7 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { defaultHelpers as helpers, runResult } from '../../testing/index.js'; diff --git a/generators/git/generator.spec.ts b/generators/git/generator.spec.ts index bced2abedc1f..671b894575a6 100644 --- a/generators/git/generator.spec.ts +++ b/generators/git/generator.spec.ts @@ -19,7 +19,7 @@ import { basename, dirname, join, resolve } from 'path'; import { fileURLToPath } from 'url'; import { access } from 'fs/promises'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { testBlueprintSupport } from '../../test/support/tests.js'; import { skipPrettierHelpers as helpers } from '../../testing/index.js'; import { GENERATOR_GIT } from '../generator-list.js'; diff --git a/generators/gradle/generator.spec.js b/generators/gradle/generator.spec.js index 8ee34a1d5518..a8d91fe5e2ee 100644 --- a/generators/gradle/generator.spec.js +++ b/generators/gradle/generator.spec.js @@ -18,7 +18,7 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { testBlueprintSupport } from '../../test/support/tests.js'; import { defaultHelpers as helpers, runResult } from '../../testing/index.js'; import { GENERATOR_JHIPSTER } from '../generator-constants.js'; diff --git a/generators/gradle/generator.ts b/generators/gradle/generator.ts index a178a7fbd46d..53481f17ffbb 100644 --- a/generators/gradle/generator.ts +++ b/generators/gradle/generator.ts @@ -28,18 +28,18 @@ import files from './files.js'; import { GRADLE } from './constants.js'; import cleanupOldServerFilesTask from './cleanup.js'; import { - applyFromGradleCallback, addGradleDependenciesCallback, - addGradleMavenRepositoryCallback, - addGradlePluginCallback, - addGradlePluginManagementCallback, - addGradlePropertyCallback, addGradleDependenciesCatalogVersionCallback, addGradleDependencyCatalogLibrariesCallback, addGradleDependencyCatalogPluginsCallback, + addGradleMavenRepositoryCallback, + addGradlePluginCallback, addGradlePluginFromCatalogCallback, - sortDependencies, + addGradlePluginManagementCallback, + addGradlePropertyCallback, + applyFromGradleCallback, gradleNeedleOptionsWithDefaults, + sortDependencies, } from './internal/needles.js'; import { GradleDependency } from './types.js'; diff --git a/generators/gradle/generators/code-quality/generator.spec.ts b/generators/gradle/generators/code-quality/generator.spec.ts index 1a83f071acf4..5dc2b4c4b8b5 100644 --- a/generators/gradle/generators/code-quality/generator.spec.ts +++ b/generators/gradle/generators/code-quality/generator.spec.ts @@ -1,6 +1,6 @@ import { basename, dirname, resolve } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/gradle/generators/jib/generator.spec.ts b/generators/gradle/generators/jib/generator.spec.ts index 1a83f071acf4..5dc2b4c4b8b5 100644 --- a/generators/gradle/generators/jib/generator.spec.ts +++ b/generators/gradle/generators/jib/generator.spec.ts @@ -1,6 +1,6 @@ import { basename, dirname, resolve } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/gradle/internal/needles.ts b/generators/gradle/internal/needles.ts index 6d6dd23f21f9..68f74084aa90 100644 --- a/generators/gradle/internal/needles.ts +++ b/generators/gradle/internal/needles.ts @@ -18,16 +18,16 @@ */ import { createNeedleCallback } from '../../base/support/index.js'; import type { - GradleScript, + GradleComment, GradleDependency, + GradleLibraryDependency, + GradleNeedleOptions, GradlePlugin, GradleProperty, GradleRepository, - GradleTomlVersion, + GradleScript, GradleTomlPlugin, - GradleComment, - GradleNeedleOptions, - GradleLibraryDependency, + GradleTomlVersion, } from '../types.js'; const tomlItemToString = (item: Record) => diff --git a/generators/gradle/needles.spec.ts b/generators/gradle/needles.spec.ts index 9c4b112d7f56..365328daee4e 100644 --- a/generators/gradle/needles.spec.ts +++ b/generators/gradle/needles.spec.ts @@ -1,4 +1,4 @@ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { dryRunHelpers as helpers, result as runResult } from '../../testing/index.js'; import BaseApplicationGenerator from '../base-application/index.js'; import { GENERATOR_SERVER } from '../generator-list.js'; diff --git a/generators/heroku/generator.spec.js b/generators/heroku/generator.spec.js index 2ba7f42964c7..eac371cd8f9f 100644 --- a/generators/heroku/generator.spec.js +++ b/generators/heroku/generator.spec.js @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; diff --git a/generators/heroku/heroku.spec.ts b/generators/heroku/heroku.spec.ts index 6ef288bc4283..1b198e65f99c 100644 --- a/generators/heroku/heroku.spec.ts +++ b/generators/heroku/heroku.spec.ts @@ -1,5 +1,5 @@ import sinon, { SinonStub } from 'sinon'; -import { it, describe, expect, beforeEach } from 'esmocha'; +import { beforeEach, describe, expect, it } from 'esmocha'; import { SERVER_MAIN_RES_DIR } from '../generator-constants.js'; import { defaultHelpers as helpers, runResult } from '../../testing/index.js'; import { GENERATOR_HEROKU } from '../generator-list.js'; diff --git a/generators/info/generator.spec.ts b/generators/info/generator.spec.ts index b25895cf89f4..d90bf385002d 100644 --- a/generators/info/generator.spec.ts +++ b/generators/info/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures } from '../../test/support/tests.js'; diff --git a/generators/init/generator.spec.ts b/generators/init/generator.spec.ts index 84ea06219dd3..b88ba3f4bfa7 100644 --- a/generators/init/generator.spec.ts +++ b/generators/init/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { basicTests, getCommandHelpOutput, testBlueprintSupport } from '../../test/support/tests.js'; import { defaultHelpers as helpers, result } from '../../testing/index.js'; import { GENERATOR_INIT } from '../generator-list.js'; diff --git a/generators/java/generator.spec.ts b/generators/java/generator.spec.ts index d72cd0a9a9ad..359d763cc29e 100644 --- a/generators/java/generator.spec.ts +++ b/generators/java/generator.spec.ts @@ -1,6 +1,6 @@ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; diff --git a/generators/java/generators/bootstrap/generator.spec.ts b/generators/java/generators/bootstrap/generator.spec.ts index f46d90524453..34542f9f4209 100644 --- a/generators/java/generators/bootstrap/generator.spec.ts +++ b/generators/java/generators/bootstrap/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/java/generators/bootstrap/generator.ts b/generators/java/generators/bootstrap/generator.ts index ee1bdd67d682..6966b248030c 100644 --- a/generators/java/generators/bootstrap/generator.ts +++ b/generators/java/generators/bootstrap/generator.ts @@ -20,14 +20,14 @@ import { isFileStateModified } from 'mem-fs-editor/state'; import BaseApplicationGenerator from '../../../base-application/index.js'; import { JAVA_COMPATIBLE_VERSIONS } from '../../../generator-constants.js'; import { - packageInfoTransform, - generatedAnnotationTransform, + addJavaAnnotation, + addJavaImport, checkJava, + generatedAnnotationTransform, isReservedJavaKeyword, - matchMainJavaFiles, javaMainPackageTemplatesBlock, - addJavaImport, - addJavaAnnotation, + matchMainJavaFiles, + packageInfoTransform, } from '../../support/index.js'; export default class BootstrapGenerator extends BaseApplicationGenerator { diff --git a/generators/java/generators/build-tool/generator.spec.ts b/generators/java/generators/build-tool/generator.spec.ts index 426b8cc3e0d0..9df72024194a 100644 --- a/generators/java/generators/build-tool/generator.spec.ts +++ b/generators/java/generators/build-tool/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/java/generators/code-quality/generator.spec.ts b/generators/java/generators/code-quality/generator.spec.ts index 0597abe19d97..6d6c8119832e 100644 --- a/generators/java/generators/code-quality/generator.spec.ts +++ b/generators/java/generators/code-quality/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/java/generators/domain/generator.spec.ts b/generators/java/generators/domain/generator.spec.ts index d92e55178220..97f3a9e24815 100644 --- a/generators/java/generators/domain/generator.spec.ts +++ b/generators/java/generators/domain/generator.spec.ts @@ -1,6 +1,6 @@ import { basename, dirname, resolve } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/java/generators/jib/generator.spec.ts b/generators/java/generators/jib/generator.spec.ts index 1a2be8d0ef13..cb03e83638cc 100644 --- a/generators/java/generators/jib/generator.spec.ts +++ b/generators/java/generators/jib/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/java/generators/node/generator.spec.ts b/generators/java/generators/node/generator.spec.ts index 3f0278cca9e9..e485937724c8 100644 --- a/generators/java/generators/node/generator.spec.ts +++ b/generators/java/generators/node/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/java/generators/openapi-generator/generator.spec.ts b/generators/java/generators/openapi-generator/generator.spec.ts index 0b4a4a5b9690..80c47cdb6537 100644 --- a/generators/java/generators/openapi-generator/generator.spec.ts +++ b/generators/java/generators/openapi-generator/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { fromMatrix, defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/java/support/add-java-annotation.spec.ts b/generators/java/support/add-java-annotation.spec.ts index b9ec5a9caa7f..2a8c9f1bf93e 100644 --- a/generators/java/support/add-java-annotation.spec.ts +++ b/generators/java/support/add-java-annotation.spec.ts @@ -1,4 +1,4 @@ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { addJavaAnnotation, addJavaImport } from './add-java-annotation.js'; describe('generator > java', () => { diff --git a/generators/java/support/checks/check-java.spec.ts b/generators/java/support/checks/check-java.spec.ts index 0dd2b76ba5bd..abc3ec1f31cd 100644 --- a/generators/java/support/checks/check-java.spec.ts +++ b/generators/java/support/checks/check-java.spec.ts @@ -1,4 +1,4 @@ -import { after, before, it, describe, expect, resetAllMocks, esmocha } from 'esmocha'; +import { after, before, describe, esmocha, expect, it, resetAllMocks } from 'esmocha'; import quibble from 'quibble'; const execa = { execa: esmocha.fn(), execaSync: esmocha.fn(), execaCommandSync: esmocha.fn(), execaCommand: esmocha.fn() }; diff --git a/generators/java/support/doc.spec.ts b/generators/java/support/doc.spec.ts index e08c8fe2c518..e3122a3065f7 100644 --- a/generators/java/support/doc.spec.ts +++ b/generators/java/support/doc.spec.ts @@ -1,4 +1,4 @@ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { formatDocAsApiDescription, formatDocAsJavaDoc } from './doc.js'; describe('generator - server - support - doc', () => { diff --git a/generators/java/support/files.ts b/generators/java/support/files.ts index d6025fa705cf..4d53a55beecc 100644 --- a/generators/java/support/files.ts +++ b/generators/java/support/files.ts @@ -19,7 +19,7 @@ import type { WriteFileBlock } from '../../base/api.js'; import type CoreGenerator from '../../base-core/generator.js'; -import { SERVER_TEST_SRC_DIR, SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_RES_DIR } from '../../generator-constants.js'; +import { SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR } from '../../generator-constants.js'; export const replaceEntityFilePathVariables = (data: any, filePath: string) => { filePath = filePath diff --git a/generators/java/support/generated-annotation-transform.spec.ts b/generators/java/support/generated-annotation-transform.spec.ts index 6a5a44115364..d9455d9ba061 100644 --- a/generators/java/support/generated-annotation-transform.spec.ts +++ b/generators/java/support/generated-annotation-transform.spec.ts @@ -1,5 +1,5 @@ import { Readable } from 'stream'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { pipeline } from 'p-transform'; import generatedAnnotationTransform from './generated-annotation-transform.js'; diff --git a/generators/java/support/key-store.ts b/generators/java/support/key-store.ts index 2c5620ed4508..f06f665c35b0 100644 --- a/generators/java/support/key-store.ts +++ b/generators/java/support/key-store.ts @@ -1,4 +1,4 @@ -import { mkdir, lstat } from 'fs/promises'; +import { lstat, mkdir } from 'fs/promises'; import { dirname } from 'path'; import { execa } from 'execa'; import { ValidationResult } from '../../base/api.js'; diff --git a/generators/java/support/util.spec.ts b/generators/java/support/util.spec.ts index 027acae9d473..b6b6e825e905 100644 --- a/generators/java/support/util.spec.ts +++ b/generators/java/support/util.spec.ts @@ -1,4 +1,4 @@ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { getMainClassName } from './util.js'; describe('generator > java', () => { diff --git a/generators/javascript/generators/bootstrap/generator.spec.ts b/generators/javascript/generators/bootstrap/generator.spec.ts index 5a209ad1d74d..c430ee0e73d5 100644 --- a/generators/javascript/generators/bootstrap/generator.spec.ts +++ b/generators/javascript/generators/bootstrap/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { extendMatrix, fromMatrix, defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/javascript/generators/eslint/generator.spec.ts b/generators/javascript/generators/eslint/generator.spec.ts index c3fe18868704..6d5d804ac9d7 100644 --- a/generators/javascript/generators/eslint/generator.spec.ts +++ b/generators/javascript/generators/eslint/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/javascript/generators/husky/generator.spec.ts b/generators/javascript/generators/husky/generator.spec.ts index 6e8615121907..b7d633b1a86e 100644 --- a/generators/javascript/generators/husky/generator.spec.ts +++ b/generators/javascript/generators/husky/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { fromMatrix, defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/javascript/generators/prettier/generator.spec.ts b/generators/javascript/generators/prettier/generator.spec.ts index 314d8625b2d2..7f4cc7bc6107 100644 --- a/generators/javascript/generators/prettier/generator.spec.ts +++ b/generators/javascript/generators/prettier/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { fromMatrix, defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/jdl/generator.spec.ts b/generators/jdl/generator.spec.ts index b670f2a34b23..5356d7793b1a 100644 --- a/generators/jdl/generator.spec.ts +++ b/generators/jdl/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { SinonSpy } from 'sinon'; diff --git a/generators/jdl/generator.ts b/generators/jdl/generator.ts index 8208adfb9cd8..fac0ca03be26 100644 --- a/generators/jdl/generator.ts +++ b/generators/jdl/generator.ts @@ -19,8 +19,8 @@ import { extname } from 'path'; import { readFile } from 'fs/promises'; import { upperFirst } from 'lodash-es'; -import { create as createMemFs, type Store as MemFs } from 'mem-fs'; -import { create as createMemFsEditor, type MemFsEditor } from 'mem-fs-editor'; +import { type Store as MemFs, create as createMemFs } from 'mem-fs'; +import { type MemFsEditor, create as createMemFsEditor } from 'mem-fs-editor'; import BaseGenerator from '../base/index.js'; import { downloadJdlFile } from '../../cli/download.mjs'; diff --git a/generators/kubernetes-helm/generator.js b/generators/kubernetes-helm/generator.js index 69d215650847..bf7f82905763 100644 --- a/generators/kubernetes-helm/generator.js +++ b/generators/kubernetes-helm/generator.js @@ -23,14 +23,14 @@ import chalk from 'chalk'; import BaseWorkspacesGenerator from '../base-workspaces/index.js'; import prompts from '../kubernetes/prompts.js'; -import { checkImages, generateJwtSecret, configureImageNames, loadFromYoRc } from '../base-workspaces/internal/docker-base.js'; +import { checkImages, configureImageNames, generateJwtSecret, loadFromYoRc } from '../base-workspaces/internal/docker-base.js'; import { - checkKubernetes, checkHelm, + checkKubernetes, + derivedKubernetesPlatformProperties, loadConfig, - setupKubernetesConstants, setupHelmConstants, - derivedKubernetesPlatformProperties, + setupKubernetesConstants, } from '../kubernetes/kubernetes-base.js'; import { messageBrokerTypes } from '../../jdl/jhipster/index.js'; import { getJdbcUrl, getR2dbcUrl } from '../spring-data-relational/support/index.js'; diff --git a/generators/kubernetes-helm/generator.spec.js b/generators/kubernetes-helm/generator.spec.js index b25895cf89f4..d90bf385002d 100644 --- a/generators/kubernetes-helm/generator.spec.js +++ b/generators/kubernetes-helm/generator.spec.js @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures } from '../../test/support/tests.js'; diff --git a/generators/kubernetes-helm/kubernetes.helm.spec.ts b/generators/kubernetes-helm/kubernetes.helm.spec.ts index ffd54128d57e..9c408dac86a8 100644 --- a/generators/kubernetes-helm/kubernetes.helm.spec.ts +++ b/generators/kubernetes-helm/kubernetes.helm.spec.ts @@ -1,5 +1,5 @@ -import { before, it, describe, expect } from 'esmocha'; -import { basicHelpers as helpers, getGenerator } from '../../testing/index.js'; +import { before, describe, expect, it } from 'esmocha'; +import { getGenerator, basicHelpers as helpers } from '../../testing/index.js'; import { GENERATOR_KUBERNETES_HELM } from '../generator-list.js'; const expectedFiles = { diff --git a/generators/kubernetes-knative/generator.js b/generators/kubernetes-knative/generator.js index 8107b533493a..e0559f21e30b 100644 --- a/generators/kubernetes-knative/generator.js +++ b/generators/kubernetes-knative/generator.js @@ -22,16 +22,16 @@ import chalk from 'chalk'; import BaseWorkspacesGenerator from '../base-workspaces/index.js'; -import { checkImages, generateJwtSecret, configureImageNames, loadFromYoRc } from '../base-workspaces/internal/docker-base.js'; +import { checkImages, configureImageNames, generateJwtSecret, loadFromYoRc } from '../base-workspaces/internal/docker-base.js'; import { checkHelm, checkKubernetes, + derivedKubernetesPlatformProperties, loadConfig, - setupKubernetesConstants, setupHelmConstants, - derivedKubernetesPlatformProperties, + setupKubernetesConstants, } from '../kubernetes/kubernetes-base.js'; -import { kubernetesPlatformTypes, buildToolTypes, messageBrokerTypes } from '../../jdl/jhipster/index.js'; +import { buildToolTypes, kubernetesPlatformTypes, messageBrokerTypes } from '../../jdl/jhipster/index.js'; import { getJdbcUrl } from '../spring-data-relational/support/index.js'; import { loadDeploymentConfig, loadDockerDependenciesTask } from '../base-workspaces/internal/index.js'; import { checkDocker } from '../docker/support/index.js'; diff --git a/generators/kubernetes-knative/generator.spec.js b/generators/kubernetes-knative/generator.spec.js index b25895cf89f4..d90bf385002d 100644 --- a/generators/kubernetes-knative/generator.spec.js +++ b/generators/kubernetes-knative/generator.spec.js @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures } from '../../test/support/tests.js'; diff --git a/generators/kubernetes-knative/knative.spec.ts b/generators/kubernetes-knative/knative.spec.ts index da73577302c7..5bf81bdf99d0 100644 --- a/generators/kubernetes-knative/knative.spec.ts +++ b/generators/kubernetes-knative/knative.spec.ts @@ -1,5 +1,5 @@ -import { before, it, describe, expect } from 'esmocha'; -import { dryRunHelpers as helpers, getGenerator } from '../../testing/index.js'; +import { before, describe, expect, it } from 'esmocha'; +import { getGenerator, dryRunHelpers as helpers } from '../../testing/index.js'; import { GENERATOR_KUBERNETES_KNATIVE } from '../generator-list.js'; const expectedFiles = { diff --git a/generators/kubernetes/files.js b/generators/kubernetes/files.js index 004c91ec2498..f790d16ac26c 100644 --- a/generators/kubernetes/files.js +++ b/generators/kubernetes/files.js @@ -22,10 +22,10 @@ import { applicationTypes, authenticationTypes, databaseTypes, + ingressTypes, monitoringTypes, searchEngineTypes, serviceDiscoveryTypes, - ingressTypes, } from '../../jdl/jhipster/index.js'; const { ELASTICSEARCH } = searchEngineTypes; diff --git a/generators/kubernetes/generator.js b/generators/kubernetes/generator.js index e786099bbca9..df2e9384e8b8 100644 --- a/generators/kubernetes/generator.js +++ b/generators/kubernetes/generator.js @@ -24,13 +24,13 @@ import BaseWorkspacesGenerator from '../base-workspaces/index.js'; import { buildToolTypes, messageBrokerTypes } from '../../jdl/jhipster/index.js'; -import { checkImages, generateJwtSecret, configureImageNames, loadFromYoRc } from '../base-workspaces/internal/docker-base.js'; +import { checkImages, configureImageNames, generateJwtSecret, loadFromYoRc } from '../base-workspaces/internal/docker-base.js'; import { getJdbcUrl, getR2dbcUrl } from '../spring-data-relational/support/index.js'; import { loadDeploymentConfig, loadDockerDependenciesTask } from '../base-workspaces/internal/index.js'; import { checkDocker } from '../docker/support/index.js'; import { loadDerivedServerConfig } from '../server/support/index.js'; import { loadDerivedAppConfig } from '../app/support/index.js'; -import { checkKubernetes, loadConfig, setupKubernetesConstants, derivedKubernetesPlatformProperties } from './kubernetes-base.js'; +import { checkKubernetes, derivedKubernetesPlatformProperties, loadConfig, setupKubernetesConstants } from './kubernetes-base.js'; import { writeFiles } from './files.js'; import prompts from './prompts.js'; diff --git a/generators/kubernetes/generator.spec.js b/generators/kubernetes/generator.spec.js index b25895cf89f4..d90bf385002d 100644 --- a/generators/kubernetes/generator.spec.js +++ b/generators/kubernetes/generator.spec.js @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures } from '../../test/support/tests.js'; diff --git a/generators/kubernetes/kubernetes-base.js b/generators/kubernetes/kubernetes-base.js index f86b7d535c7a..85e7e5f6bc5a 100644 --- a/generators/kubernetes/kubernetes-base.js +++ b/generators/kubernetes/kubernetes-base.js @@ -21,22 +21,22 @@ import { defaults } from 'lodash-es'; import { loadFromYoRc } from '../base-workspaces/internal/docker-base.js'; import { - KUBERNETES_CORE_API_VERSION, - KUBERNETES_BATCH_API_VERSION, - KUBERNETES_DEPLOYMENT_API_VERSION, - KUBERNETES_STATEFULSET_API_VERSION, - KUBERNETES_INGRESS_API_VERSION, - KUBERNETES_ISTIO_NETWORKING_API_VERSION, - KUBERNETES_RBAC_API_VERSION, - HELM_KAFKA, + HELM_COUCHBASE_OPERATOR, HELM_ELASTICSEARCH, - HELM_PROMETHEUS, HELM_GRAFANA, + HELM_KAFKA, HELM_MARIADB, + HELM_MONGODB_REPLICASET, HELM_MYSQL, HELM_POSTGRESQL, - HELM_MONGODB_REPLICASET, - HELM_COUCHBASE_OPERATOR, + HELM_PROMETHEUS, + KUBERNETES_BATCH_API_VERSION, + KUBERNETES_CORE_API_VERSION, + KUBERNETES_DEPLOYMENT_API_VERSION, + KUBERNETES_INGRESS_API_VERSION, + KUBERNETES_ISTIO_NETWORKING_API_VERSION, + KUBERNETES_RBAC_API_VERSION, + KUBERNETES_STATEFULSET_API_VERSION, } from '../generator-constants.js'; import { applicationTypes, kubernetesPlatformTypes } from '../../jdl/jhipster/index.js'; import { defaultKubernetesConfig } from './kubernetes-constants.js'; diff --git a/generators/kubernetes/kubernetes-constants.js b/generators/kubernetes/kubernetes-constants.js index 5fa155bf1841..c51b6681bc40 100644 --- a/generators/kubernetes/kubernetes-constants.js +++ b/generators/kubernetes/kubernetes-constants.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { monitoringTypes, kubernetesPlatformTypes } from '../../jdl/jhipster/index.js'; +import { kubernetesPlatformTypes, monitoringTypes } from '../../jdl/jhipster/index.js'; const { NO } = monitoringTypes; const { ServiceTypes, IngressTypes, GeneratorTypes } = kubernetesPlatformTypes; diff --git a/generators/kubernetes/kubernetes.spec.ts b/generators/kubernetes/kubernetes.spec.ts index f9781ed11094..3d98666f1e77 100644 --- a/generators/kubernetes/kubernetes.spec.ts +++ b/generators/kubernetes/kubernetes.spec.ts @@ -1,5 +1,5 @@ -import { before, it, describe, expect } from 'esmocha'; -import { basicHelpers as helpers, getGenerator, runResult } from '../../testing/index.js'; +import { before, describe, expect, it } from 'esmocha'; +import { getGenerator, basicHelpers as helpers, runResult } from '../../testing/index.js'; import { GENERATOR_KUBERNETES } from '../generator-list.js'; const expectedFiles = { diff --git a/generators/languages/generator-needles.spec.ts b/generators/languages/generator-needles.spec.ts index ce54900da800..93b47b7998de 100644 --- a/generators/languages/generator-needles.spec.ts +++ b/generators/languages/generator-needles.spec.ts @@ -1,5 +1,5 @@ -import { before, it, describe } from 'esmocha'; -import { defaultHelpers as helpers, result as runResult, getGenerator } from '../../testing/index.js'; +import { before, describe, it } from 'esmocha'; +import { getGenerator, defaultHelpers as helpers, result as runResult } from '../../testing/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; import LanguagesGenerator from './index.js'; diff --git a/generators/languages/generator.spec.js b/generators/languages/generator.spec.js index 7a87d7ddc914..88e4f7011711 100644 --- a/generators/languages/generator.spec.js +++ b/generators/languages/generator.spec.js @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { defaultHelpers as helpers, result as runResult } from '../../testing/index.js'; diff --git a/generators/languages/languages.spec.js b/generators/languages/languages.spec.js index ec8cbd974a48..4cccbb67356a 100644 --- a/generators/languages/languages.spec.js +++ b/generators/languages/languages.spec.js @@ -1,6 +1,6 @@ import { fileURLToPath } from 'url'; import { dirname, join } from 'path'; -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { basicHelpers, defaultHelpers as helpers, result as runResult } from '../../testing/index.js'; import { CLIENT_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR } from '../generator-constants.js'; diff --git a/generators/languages/support/detect-language.ts b/generators/languages/support/detect-language.ts index 83b642f47841..b52fa1900ae4 100644 --- a/generators/languages/support/detect-language.ts +++ b/generators/languages/support/detect-language.ts @@ -18,7 +18,7 @@ */ import { osLocaleSync } from 'os-locale'; -import { findLanguageForTag, Language, supportedLanguages } from './languages.js'; +import { Language, findLanguageForTag, supportedLanguages } from './languages.js'; const detectLanguage = (languages: readonly Language[] = supportedLanguages) => { const locale = osLocaleSync(); diff --git a/generators/languages/support/languages.spec.ts b/generators/languages/support/languages.spec.ts index 4f88f2d20a93..26d6f52153c5 100644 --- a/generators/languages/support/languages.spec.ts +++ b/generators/languages/support/languages.spec.ts @@ -1,4 +1,4 @@ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { findLanguageForTag, generateLanguagesWebappOptions } from './languages.js'; describe('generator - languages - support', () => { diff --git a/generators/languages/support/load-config.ts b/generators/languages/support/load-config.ts index b990df9bf9fb..ebbb8fcb1fe4 100644 --- a/generators/languages/support/load-config.ts +++ b/generators/languages/support/load-config.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { type I18nApplication } from '../types.js'; -import { findLanguageForTag, supportedLanguages as baseSupportedLanguages, type Language } from './languages.js'; +import { type Language, supportedLanguages as baseSupportedLanguages, findLanguageForTag } from './languages.js'; /** * Load translation config into application diff --git a/generators/languages/support/translate.spec.js b/generators/languages/support/translate.spec.js index 96e80293dbf6..6aa5366dafd0 100644 --- a/generators/languages/support/translate.spec.js +++ b/generators/languages/support/translate.spec.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { beforeEach, it, describe, expect, esmocha } from 'esmocha'; +import { beforeEach, describe, esmocha, expect, it } from 'esmocha'; import { createJhiTransformTranslateReplacer, createJhiTransformTranslateStringifyReplacer, diff --git a/generators/liquibase/generator.spec.ts b/generators/liquibase/generator.spec.ts index 09dcf8638160..abe1797b8e97 100644 --- a/generators/liquibase/generator.spec.ts +++ b/generators/liquibase/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; diff --git a/generators/liquibase/generator.ts b/generators/liquibase/generator.ts index d25ba2b1efff..30fc57f64212 100644 --- a/generators/liquibase/generator.ts +++ b/generators/liquibase/generator.ts @@ -22,21 +22,21 @@ import { escape, min } from 'lodash-es'; import BaseEntityChangesGenerator from '../base-entity-changes/index.js'; import { getFKConstraintName, getUXConstraintName, prepareEntity as prepareEntityForServer } from '../server/support/index.js'; import { + loadRequiredConfigIntoEntity, + prepareEntity, prepareEntityPrimaryKeyForTemplates, - prepareRelationship, prepareField, - prepareEntity, - loadRequiredConfigIntoEntity, + prepareRelationship, } from '../base-application/support/index.js'; import { prepareSqlApplicationProperties } from '../spring-data-relational/support/index.js'; import { fieldTypes } from '../../jdl/jhipster/index.js'; import type { MavenProperty } from '../maven/types.js'; import { liquibaseFiles } from './files.js'; import { - prepareField as prepareFieldForLiquibase, + liquibaseComment, postPrepareEntity, + prepareField as prepareFieldForLiquibase, prepareRelationshipForLiquibase, - liquibaseComment, } from './support/index.js'; import mavenPlugin from './support/maven-plugin.js'; import { @@ -44,7 +44,7 @@ import { addLiquibaseConstraintsChangelogCallback, addLiquibaseIncrementalChangelogCallback, } from './internal/needles.js'; -import { addEntityFiles, updateEntityFiles, updateConstraintsFiles, updateMigrateFiles, fakeFiles } from './changelog-files.js'; +import { addEntityFiles, fakeFiles, updateConstraintsFiles, updateEntityFiles, updateMigrateFiles } from './changelog-files.js'; const { CommonDBTypes: { LONG: TYPE_LONG, INTEGER: TYPE_INTEGER }, diff --git a/generators/liquibase/incremental-liquibase.spec.ts b/generators/liquibase/incremental-liquibase.spec.ts index 06bfea5aa103..3f9557ec6001 100644 --- a/generators/liquibase/incremental-liquibase.spec.ts +++ b/generators/liquibase/incremental-liquibase.spec.ts @@ -1,7 +1,7 @@ import path, { basename, join } from 'path'; import { existsSync, mkdirSync, writeFileSync } from 'fs'; import { fileURLToPath } from 'url'; -import { before, it, describe, after, expect } from 'esmocha'; +import { after, before, describe, expect, it } from 'esmocha'; import { skipPrettierHelpers as helpers, runResult } from '../../testing/index.js'; import { SERVER_MAIN_RES_DIR } from '../generator-constants.js'; import { createImporterFromContent } from '../../jdl/jdl-importer.js'; diff --git a/generators/liquibase/needles.spec.ts b/generators/liquibase/needles.spec.ts index 9dc5bf36dbd1..11a86956b55f 100644 --- a/generators/liquibase/needles.spec.ts +++ b/generators/liquibase/needles.spec.ts @@ -1,4 +1,4 @@ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { dryRunHelpers as helpers, result as runResult } from '../../testing/index.js'; import BaseApplicationGenerator from '../base-application/index.js'; import { SERVER_MAIN_RES_DIR } from '../generator-constants.js'; diff --git a/generators/liquibase/support/formatting.spec.ts b/generators/liquibase/support/formatting.spec.ts index c2cd7fc9b071..bb1691e5eea8 100644 --- a/generators/liquibase/support/formatting.spec.ts +++ b/generators/liquibase/support/formatting.spec.ts @@ -1,4 +1,4 @@ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import formatAsLiquibaseRemarks from './formatting.js'; describe('generator - liquibase - support - formatting', () => { diff --git a/generators/maven/generator.spec.ts b/generators/maven/generator.spec.ts index e59357f428c1..33d607efec08 100644 --- a/generators/maven/generator.spec.ts +++ b/generators/maven/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { testBlueprintSupport } from '../../test/support/tests.js'; import { defaultHelpers as helpers, result as runResult } from '../../testing/index.js'; import { GENERATOR_MAVEN } from '../generator-list.js'; diff --git a/generators/maven/generator.ts b/generators/maven/generator.ts index 2f1ed46293bd..abfefdf04741 100644 --- a/generators/maven/generator.ts +++ b/generators/maven/generator.ts @@ -27,7 +27,7 @@ import { type GeneratorDefinition as SpringBootGeneratorDefinition } from '../se import files from './files.js'; import { MAVEN } from './constants.js'; import cleanupOldServerFilesTask from './cleanup.js'; -import { createPomStorage, sortPomFile, type PomStorage } from './support/index.js'; +import { type PomStorage, createPomStorage, sortPomFile } from './support/index.js'; export default class MavenGenerator extends BaseApplicationGenerator { pomStorage!: PomStorage; diff --git a/generators/maven/generators/code-quality/generator.spec.ts b/generators/maven/generators/code-quality/generator.spec.ts index 4db1e2896450..3d0512a73699 100644 --- a/generators/maven/generators/code-quality/generator.spec.ts +++ b/generators/maven/generators/code-quality/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/maven/generators/frontend-plugin/generator.spec.ts b/generators/maven/generators/frontend-plugin/generator.spec.ts index 67446df55f0b..213bab1e05f8 100644 --- a/generators/maven/generators/frontend-plugin/generator.spec.ts +++ b/generators/maven/generators/frontend-plugin/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/maven/generators/jib/generator.spec.ts b/generators/maven/generators/jib/generator.spec.ts index 8db761c07cab..86d348aadb67 100644 --- a/generators/maven/generators/jib/generator.spec.ts +++ b/generators/maven/generators/jib/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/maven/internal/xml-store.ts b/generators/maven/internal/xml-store.ts index ddf534f08fdb..a50d0d0958ca 100644 --- a/generators/maven/internal/xml-store.ts +++ b/generators/maven/internal/xml-store.ts @@ -18,7 +18,7 @@ */ import assert from 'assert'; -import { XMLParser, XMLBuilder, XmlBuilderOptions, X2jOptions } from 'fast-xml-parser'; +import { X2jOptions, XMLBuilder, XMLParser, XmlBuilderOptions } from 'fast-xml-parser'; import { merge } from 'lodash-es'; const defaultXmlCommonOptions: Partial = { diff --git a/generators/maven/needles.spec.ts b/generators/maven/needles.spec.ts index ec026506edb9..33c31846056f 100644 --- a/generators/maven/needles.spec.ts +++ b/generators/maven/needles.spec.ts @@ -1,4 +1,4 @@ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { dryRunHelpers as helpers, result as runResult } from '../../testing/index.js'; import BaseApplicationGenerator from '../base-application/index.js'; import { GENERATOR_MAVEN } from '../generator-list.js'; diff --git a/generators/maven/support/pom-file-sort.ts b/generators/maven/support/pom-file-sort.ts index 0536357b010f..04fb21e9e63f 100644 --- a/generators/maven/support/pom-file-sort.ts +++ b/generators/maven/support/pom-file-sort.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { XMLParser, XMLBuilder, XmlBuilderOptions, X2jOptions } from 'fast-xml-parser'; +import { X2jOptions, XMLBuilder, XMLParser, XmlBuilderOptions } from 'fast-xml-parser'; import { defaultXmlBuildOptions, defaultXmlParserOptions } from '../internal/xml-store.js'; import { formatPomFirstLevel, sortPomProject } from '../internal/pom-sort.js'; diff --git a/generators/maven/support/pom-store.ts b/generators/maven/support/pom-store.ts index 3464b5b3d5a9..51a87b2a11be 100644 --- a/generators/maven/support/pom-store.ts +++ b/generators/maven/support/pom-store.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { set, get } from 'lodash-es'; +import { get, set } from 'lodash-es'; import CoreGenerator from '../../base-core/index.js'; import XmlStorage from '../internal/xml-store.js'; @@ -31,7 +31,7 @@ import { MavenProperty, MavenRepository, } from '../types.js'; -import { sortPomProject, formatPomFirstLevel } from '../internal/pom-sort.js'; +import { formatPomFirstLevel, sortPomProject } from '../internal/pom-sort.js'; const artifactEquals = (a: MavenArtifact, b: MavenArtifact) => { return a.groupId === b.groupId && a.artifactId === b.artifactId; diff --git a/generators/needle-base.ts b/generators/needle-base.ts index 56d0f397f82f..01bcf456b9b7 100644 --- a/generators/needle-base.ts +++ b/generators/needle-base.ts @@ -18,7 +18,7 @@ */ import chalk from 'chalk'; import BaseGenerator from './base/index.js'; -import { createNeedleCallback, NeedleInsertion } from './base/support/needles.js'; +import { NeedleInsertion, createNeedleCallback } from './base/support/needles.js'; export type NeedleFileModel = { /** diff --git a/generators/project-name/generator.js b/generators/project-name/generator.js index 0a5f84318f4c..ebe4f49dc6a6 100644 --- a/generators/project-name/generator.js +++ b/generators/project-name/generator.js @@ -17,7 +17,7 @@ * limitations under the License. */ -import { defaults, kebabCase, upperFirst, camelCase, startCase } from 'lodash-es'; +import { camelCase, defaults, kebabCase, startCase, upperFirst } from 'lodash-es'; import BaseApplicationGenerator from '../base-application/index.js'; import { getHipster } from '../base/support/index.js'; diff --git a/generators/project-name/generator.spec.ts b/generators/project-name/generator.spec.ts index cf104de3ce71..b4b1a2e838a9 100644 --- a/generators/project-name/generator.spec.ts +++ b/generators/project-name/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { basicTests, testBlueprintSupport } from '../../test/support/tests.js'; import { GENERATOR_PROJECT_NAME } from '../generator-list.js'; diff --git a/generators/react/generator.js b/generators/react/generator.js index 55d93cbea4f9..e45103b35f7b 100644 --- a/generators/react/generator.js +++ b/generators/react/generator.js @@ -22,17 +22,17 @@ import { camelCase, startCase } from 'lodash-es'; import BaseApplicationGenerator from '../base-application/index.js'; import { GENERATOR_CLIENT, GENERATOR_LANGUAGES, GENERATOR_REACT } from '../generator-list.js'; -import { fieldTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.js'; +import { clientFrameworkTypes, fieldTypes } from '../../jdl/jhipster/index.js'; import { + generateEntityClientImports as formatEntityClientImports, generateEntityClientEnumImports as getClientEnumImportsFormat, generateEntityClientFields as getHydratedEntityClientFields, - generateEntityClientImports as formatEntityClientImports, generateTestEntityId as getTestEntityId, generateTestEntityPrimaryKey as getTestEntityPrimaryKey, } from '../client/support/index.js'; import { createNeedleCallback, upperFirstCamelCase } from '../base/support/index.js'; import { writeEslintClientRootConfigFile } from '../javascript/generators/eslint/support/tasks.js'; -import { writeEntitiesFiles, postWriteEntitiesFiles, cleanupEntitiesFiles } from './entity-files-react.js'; +import { cleanupEntitiesFiles, postWriteEntitiesFiles, writeEntitiesFiles } from './entity-files-react.js'; import cleanupOldFilesTask from './cleanup.js'; import { writeFiles } from './files-react.js'; import { prepareEntity } from './application/entities/index.js'; diff --git a/generators/react/generator.spec.ts b/generators/react/generator.spec.ts index 5c0aeb7f6b35..e3c7b389cbbf 100644 --- a/generators/react/generator.spec.ts +++ b/generators/react/generator.spec.ts @@ -1,10 +1,10 @@ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { buildClientSamples, entitiesClientSamples as entities, defaultHelpers as helpers, runResult } from '../../testing/index.js'; -import { shouldSupportFeatures, testBlueprintSupport, checkEnforcements } from '../../test/support/index.js'; +import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js'; import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; diff --git a/generators/react/support/translate-react.spec.js b/generators/react/support/translate-react.spec.js index 20699c99e054..78d961dcfa21 100644 --- a/generators/react/support/translate-react.spec.js +++ b/generators/react/support/translate-react.spec.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { beforeEach, it, describe, expect, esmocha } from 'esmocha'; +import { beforeEach, describe, esmocha, expect, it } from 'esmocha'; import { createTranslationReplacer } from './translate-react.js'; describe('generator - react - transform', () => { diff --git a/generators/server/__test-support/index.ts b/generators/server/__test-support/index.ts index 5e96ed8c93b3..cfbc9768e270 100644 --- a/generators/server/__test-support/index.ts +++ b/generators/server/__test-support/index.ts @@ -1,13 +1,13 @@ import assert from 'assert'; -import { messageBrokerTypes, databaseTypes } from '../../../jdl/jhipster/index.js'; +import { databaseTypes, messageBrokerTypes } from '../../../jdl/jhipster/index.js'; import { - GENERATOR_SPRING_CLOUD_STREAM, + GENERATOR_BOOTSTRAP, GENERATOR_JAVA, GENERATOR_PROJECT_NAME, GENERATOR_SERVER, GENERATOR_SPRING_BOOT, - GENERATOR_BOOTSTRAP, + GENERATOR_SPRING_CLOUD_STREAM, } from '../../generator-list.js'; const { KAFKA, PULSAR } = messageBrokerTypes; diff --git a/generators/server/generator.js b/generators/server/generator.js index 6a0e55bcb89b..23fc8fc2738d 100644 --- a/generators/server/generator.js +++ b/generators/server/generator.js @@ -24,29 +24,29 @@ import { GENERATOR_COMMON, GENERATOR_SPRING_BOOT } from '../generator-list.js'; import BaseApplicationGenerator from '../base-application/index.js'; import { packageJson } from '../../lib/index.js'; import { - SERVER_MAIN_SRC_DIR, - SERVER_MAIN_RES_DIR, - SERVER_TEST_SRC_DIR, - SERVER_TEST_RES_DIR, CLIENT_WEBPACK_DIR, - MAIN_DIR, - LOGIN_REGEX, - TEST_DIR, - JAVA_VERSION, JAVA_COMPATIBLE_VERSIONS, + JAVA_VERSION, JHIPSTER_DEPENDENCIES_VERSION, + LOGIN_REGEX, + MAIN_DIR, + SERVER_MAIN_RES_DIR, + SERVER_MAIN_SRC_DIR, + SERVER_TEST_RES_DIR, + SERVER_TEST_SRC_DIR, + TEST_DIR, } from '../generator-constants.js'; import { applicationTypes, buildToolTypes, + clientFrameworkTypes, databaseTypes, - fieldTypes, entityOptions, - validations, + fieldTypes, reservedKeywords, searchEngineTypes, - clientFrameworkTypes, + validations, } from '../../jdl/jhipster/index.js'; import { stringifyApplicationData } from '../base-application/support/index.js'; import { createNeedleCallback, mutateData } from '../base/support/index.js'; @@ -54,13 +54,13 @@ import { isReservedPaginationWords } from '../../jdl/jhipster/reserved-keywords. import { loadStoredAppOptions } from '../app/support/index.js'; import { isReservedH2Keyword } from '../spring-data-relational/support/h2-reserved-keywords.js'; import { - buildJavaGet as javaGetCall, - javaBeanCase as javaBeanClassNameFormat, - buildJavaGetter as javaGetter, - buildJavaSetter as javaSetter, getJavaValueGeneratorForType as getJavaValueForType, getPrimaryKeyValue as getPKValue, hibernateSnakeCase, + javaBeanCase as javaBeanClassNameFormat, + buildJavaGet as javaGetCall, + buildJavaGetter as javaGetter, + buildJavaSetter as javaSetter, } from './support/index.js'; const dbTypes = fieldTypes; diff --git a/generators/server/generator.spec.js b/generators/server/generator.spec.js index ff59637adab3..41c0bd7d0585 100644 --- a/generators/server/generator.spec.js +++ b/generators/server/generator.spec.js @@ -18,10 +18,10 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; -import { shouldSupportFeatures, testBlueprintSupport, checkEnforcements } from '../../test/support/index.js'; +import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js'; import { defaultHelpers as helpers, result as runResult } from '../../testing/index.js'; import { GENERATOR_SERVER, GENERATOR_SPRING_BOOT } from '../generator-list.js'; import { filterBasicServerGenerators, shouldComposeWithCouchbase, shouldComposeWithSpringCloudStream } from './__test-support/index.js'; diff --git a/generators/server/jdl/application-definition.ts b/generators/server/jdl/application-definition.ts index b5990d68d407..037ba1839c20 100644 --- a/generators/server/jdl/application-definition.ts +++ b/generators/server/jdl/application-definition.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { upperCase, snakeCase } from 'lodash-es'; +import { snakeCase, upperCase } from 'lodash-es'; import { JDLApplicationConfig, JHipsterOptionDefinition } from '../../../jdl/types/types.js'; import databaseMigrationOption from '../options/database-migration.js'; import messageBrokerOption from '../options/message-broker.js'; diff --git a/generators/server/needle-logback.spec.ts b/generators/server/needle-logback.spec.ts index 29f85ca37d49..462b035b5b93 100644 --- a/generators/server/needle-logback.spec.ts +++ b/generators/server/needle-logback.spec.ts @@ -1,4 +1,4 @@ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { dryRunHelpers as helpers, result as runResult } from '../../testing/index.js'; import BaseApplicationGenerator from '../base-application/index.js'; import { SERVER_MAIN_RES_DIR } from '../generator-constants.js'; diff --git a/generators/server/options/database-migration.spec.ts b/generators/server/options/database-migration.spec.ts index 2f40b0933b7d..681ec47c1def 100644 --- a/generators/server/options/database-migration.spec.ts +++ b/generators/server/options/database-migration.spec.ts @@ -1,5 +1,5 @@ -import { before, it, describe, expect } from 'esmocha'; -import { createImporterFromContent, ImportState } from '../../../jdl/jdl-importer.js'; +import { before, describe, expect, it } from 'esmocha'; +import { ImportState, createImporterFromContent } from '../../../jdl/jdl-importer.js'; import optionDefinition from './database-migration.js'; import { DATABASE_MIGRATION as optionName } from './index.js'; diff --git a/generators/server/options/feign-client.spec.ts b/generators/server/options/feign-client.spec.ts index 1de2e8ea01c4..349ecab2425b 100644 --- a/generators/server/options/feign-client.spec.ts +++ b/generators/server/options/feign-client.spec.ts @@ -1,5 +1,5 @@ -import { before, it, describe, expect } from 'esmocha'; -import { createImporterFromContent, ImportState } from '../../../jdl/jdl-importer.js'; +import { before, describe, expect, it } from 'esmocha'; +import { ImportState, createImporterFromContent } from '../../../jdl/jdl-importer.js'; import { FEIGN_CLIENT as optionName } from './index.js'; describe(`generators - server - jdl - ${optionName}`, () => { diff --git a/generators/server/options/message-broker.spec.ts b/generators/server/options/message-broker.spec.ts index d8ed76c310a9..d0c20e4dad02 100644 --- a/generators/server/options/message-broker.spec.ts +++ b/generators/server/options/message-broker.spec.ts @@ -1,5 +1,5 @@ -import { before, it, describe, expect } from 'esmocha'; -import { createImporterFromContent, ImportState } from '../../../jdl/jdl-importer.js'; +import { before, describe, expect, it } from 'esmocha'; +import { ImportState, createImporterFromContent } from '../../../jdl/jdl-importer.js'; import optionDefinition from './message-broker.js'; import { MESSAGE_BROKER } from './index.js'; diff --git a/generators/server/options/sync-user-with-idp.spec.ts b/generators/server/options/sync-user-with-idp.spec.ts index 3e77fedbe47b..f20e78b897b7 100644 --- a/generators/server/options/sync-user-with-idp.spec.ts +++ b/generators/server/options/sync-user-with-idp.spec.ts @@ -1,5 +1,5 @@ -import { before, it, describe, expect } from 'esmocha'; -import { createImporterFromContent, ImportState } from '../../../jdl/jdl-importer.js'; +import { before, describe, expect, it } from 'esmocha'; +import { ImportState, createImporterFromContent } from '../../../jdl/jdl-importer.js'; import { SYNC_USER_WITH_IDP as optionName } from './sync-user-with-idp.js'; describe(`generators - server - jdl - ${optionName}`, () => { diff --git a/generators/server/support/config.ts b/generators/server/support/config.ts index 42524dd9a4a6..65c39d821f27 100644 --- a/generators/server/support/config.ts +++ b/generators/server/support/config.ts @@ -1,14 +1,14 @@ import { mutateData, normalizePathEnd, pickFields } from '../../base/support/index.js'; import { - databaseTypes, - monitoringTypes, authenticationTypes, buildToolTypes, cacheTypes, - websocketTypes, - serviceDiscoveryTypes, + databaseTypes, + monitoringTypes, searchEngineTypes, + serviceDiscoveryTypes, + websocketTypes, } from '../../../jdl/jhipster/index.js'; import { prepareSqlApplicationProperties } from '../../spring-data-relational/support/index.js'; import { diff --git a/generators/server/support/database.spec.ts b/generators/server/support/database.spec.ts index 26c0e0cae7b6..140fb6e76bb4 100644 --- a/generators/server/support/database.spec.ts +++ b/generators/server/support/database.spec.ts @@ -1,4 +1,4 @@ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { databaseTypes } from '../../../jdl/jhipster/index.js'; import { getDBTypeFromDBValue, getFKConstraintName, getJoinTableName, getUXConstraintName } from './database.js'; import { hibernateSnakeCase } from './string.js'; diff --git a/generators/server/support/needles.spec.ts b/generators/server/support/needles.spec.ts index 91c391222fab..3cb7d02e9cd3 100644 --- a/generators/server/support/needles.spec.ts +++ b/generators/server/support/needles.spec.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { defaultHelpers as helpers, runResult } from '../../../testing/index.js'; import { GENERATOR_SPRING_BOOT } from '../../generator-list.js'; import type { SpringBootApplication } from '../types.js'; diff --git a/generators/server/support/spring-factories.spec.ts b/generators/server/support/spring-factories.spec.ts index 23c3a35970de..60d15965585c 100644 --- a/generators/server/support/spring-factories.spec.ts +++ b/generators/server/support/spring-factories.spec.ts @@ -1,4 +1,4 @@ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { addSpringFactory } from './spring-factories.js'; describe('generator - server - support - spring-factories', () => { diff --git a/generators/server/support/string.spec.ts b/generators/server/support/string.spec.ts index 4870d5d229d3..c8a1208498fe 100644 --- a/generators/server/support/string.spec.ts +++ b/generators/server/support/string.spec.ts @@ -1,4 +1,4 @@ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { hibernateSnakeCase } from './string.js'; describe('generator - server - support - string', () => { diff --git a/generators/server/support/templates/field-values.js b/generators/server/support/templates/field-values.js index 3439e2f35ae0..5b3df8cfea6c 100644 --- a/generators/server/support/templates/field-values.js +++ b/generators/server/support/templates/field-values.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { fieldTypes, databaseTypes } from '../../../../jdl/jhipster/index.js'; +import { databaseTypes, fieldTypes } from '../../../../jdl/jhipster/index.js'; const dbTypes = fieldTypes; const { STRING, UUID, LONG, INTEGER } = dbTypes.CommonDBTypes; diff --git a/generators/spring-boot/command.ts b/generators/spring-boot/command.ts index 13ea15eb5396..3bbc4c48220b 100644 --- a/generators/spring-boot/command.ts +++ b/generators/spring-boot/command.ts @@ -20,7 +20,7 @@ import chalk from 'chalk'; import { JHipsterCommandDefinition } from '../base/api.js'; import { GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL } from '../generator-list.js'; import { createBase64Secret, createSecret } from '../base/support/secret.js'; -import { authenticationTypes, applicationTypes } from '../../jdl/index.js'; +import { applicationTypes, authenticationTypes } from '../../jdl/index.js'; const { OAUTH2, SESSION, JWT } = authenticationTypes; const { GATEWAY, MICROSERVICE } = applicationTypes; diff --git a/generators/spring-boot/entity-files.js b/generators/spring-boot/entity-files.js index a0e3c628fb82..645e0efc6481 100644 --- a/generators/spring-boot/entity-files.js +++ b/generators/spring-boot/entity-files.js @@ -19,7 +19,7 @@ import fs from 'fs'; import * as _ from 'lodash-es'; import chalk from 'chalk'; -import { moveToJavaPackageSrcDir, javaMainPackageTemplatesBlock, javaTestPackageTemplatesBlock } from '../java/support/index.js'; +import { javaMainPackageTemplatesBlock, javaTestPackageTemplatesBlock, moveToJavaPackageSrcDir } from '../java/support/index.js'; import { SERVER_TEST_SRC_DIR } from '../generator-constants.js'; import { databaseTypes, entityOptions } from '../../jdl/jhipster/index.js'; import { cleanupOldFiles } from './entity-cleanup.js'; diff --git a/generators/spring-boot/files.ts b/generators/spring-boot/files.ts index c30c1838b75f..df7a95786646 100644 --- a/generators/spring-boot/files.ts +++ b/generators/spring-boot/files.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_SRC_DIR, SERVER_TEST_RES_DIR } from '../generator-constants.js'; +import { SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR } from '../generator-constants.js'; import { addSectionsCondition, mergeSections } from '../base/support/index.js'; import { javaMainPackageTemplatesBlock, diff --git a/generators/spring-boot/generator.spec.ts b/generators/spring-boot/generator.spec.ts index db8ba27ba08b..af9db5162394 100644 --- a/generators/spring-boot/generator.spec.ts +++ b/generators/spring-boot/generator.spec.ts @@ -1,9 +1,9 @@ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { defaultHelpers as helpers, runResult } from '../../testing/index.js'; -import { shouldSupportFeatures, testBlueprintSupport, checkEnforcements } from '../../test/support/index.js'; +import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js'; import Generator from '../server/index.js'; import { filterBasicServerGenerators } from '../server/__test-support/index.js'; diff --git a/generators/spring-boot/prompts.js b/generators/spring-boot/prompts.js index 25d70ed78ce9..b7f38bcb448b 100644 --- a/generators/spring-boot/prompts.js +++ b/generators/spring-boot/prompts.js @@ -24,8 +24,8 @@ import { applicationOptions, applicationTypes, authenticationTypes, - databaseTypes, cacheTypes, + databaseTypes, testFrameworkTypes, } from '../../jdl/jhipster/index.js'; import { MESSAGE_BROKER } from '../server/options/index.js'; diff --git a/generators/spring-cache/files.ts b/generators/spring-cache/files.ts index a0ae79046d9f..90e344b84810 100644 --- a/generators/spring-cache/files.ts +++ b/generators/spring-cache/files.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir } from '../java/support/index.js'; -import { SERVER_MAIN_SRC_DIR, SERVER_TEST_SRC_DIR, GRADLE_BUILD_SRC_MAIN_DIR } from '../generator-constants.js'; +import { GRADLE_BUILD_SRC_MAIN_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_SRC_DIR } from '../generator-constants.js'; import { WriteFileSection } from '../base/api.js'; import Generator from './generator.js'; diff --git a/generators/spring-cache/generator.spec.ts b/generators/spring-cache/generator.spec.ts index acf2a8370f38..6d66d994c8d2 100644 --- a/generators/spring-cache/generator.spec.ts +++ b/generators/spring-cache/generator.spec.ts @@ -1,13 +1,13 @@ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { fromMatrix, defaultHelpers as helpers, result } from '../../testing/index.js'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import { GENERATOR_SPRING_CACHE } from '../generator-list.js'; -import { cacheTypes, buildToolTypes } from '../../jdl/jhipster/index.js'; +import { buildToolTypes, cacheTypes } from '../../jdl/jhipster/index.js'; import Generator from './index.js'; const __filename = fileURLToPath(import.meta.url); diff --git a/generators/spring-cache/needles.spec.ts b/generators/spring-cache/needles.spec.ts index ce1a668b1b72..128fc81edb99 100644 --- a/generators/spring-cache/needles.spec.ts +++ b/generators/spring-cache/needles.spec.ts @@ -1,4 +1,4 @@ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { defaultHelpers as helpers, result as runResult } from '../../testing/index.js'; import BaseApplicationGenerator from '../base-application/index.js'; import { SERVER_MAIN_SRC_DIR } from '../generator-constants.js'; diff --git a/generators/spring-cloud-stream/generator-pulsar.spec.ts b/generators/spring-cloud-stream/generator-pulsar.spec.ts index 2e7fbba64019..1aeda383bb91 100644 --- a/generators/spring-cloud-stream/generator-pulsar.spec.ts +++ b/generators/spring-cloud-stream/generator-pulsar.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, after, expect } from 'esmocha'; +import { after, before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; diff --git a/generators/spring-cloud-stream/generator.spec.ts b/generators/spring-cloud-stream/generator.spec.ts index 0a469fb493bd..596828f26dcb 100644 --- a/generators/spring-cloud-stream/generator.spec.ts +++ b/generators/spring-cloud-stream/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, after, expect } from 'esmocha'; +import { after, before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; diff --git a/generators/spring-cloud-stream/generators/kafka/files.ts b/generators/spring-cloud-stream/generators/kafka/files.ts index db420fcb5028..c1c134d93de8 100644 --- a/generators/spring-cloud-stream/generators/kafka/files.ts +++ b/generators/spring-cloud-stream/generators/kafka/files.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { WriteFileSection } from '../../../base/api.js'; -import { SERVER_MAIN_SRC_DIR, SERVER_TEST_SRC_DIR, GRADLE_BUILD_SRC_MAIN_DIR } from '../../../generator-constants.js'; +import { GRADLE_BUILD_SRC_MAIN_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_SRC_DIR } from '../../../generator-constants.js'; import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir } from '../../../server/support/index.js'; export const kafkaFiles: WriteFileSection = { diff --git a/generators/spring-cloud-stream/generators/pulsar/files.ts b/generators/spring-cloud-stream/generators/pulsar/files.ts index 6c6572e15cb7..f982393002df 100644 --- a/generators/spring-cloud-stream/generators/pulsar/files.ts +++ b/generators/spring-cloud-stream/generators/pulsar/files.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { WriteFileSection } from '../../../base/api.js'; -import { SERVER_TEST_SRC_DIR, GRADLE_BUILD_SRC_MAIN_DIR } from '../../../generator-constants.js'; +import { GRADLE_BUILD_SRC_MAIN_DIR, SERVER_TEST_SRC_DIR } from '../../../generator-constants.js'; import { moveToJavaPackageTestDir } from '../../../java/support/index.js'; export const pulsarFiles: WriteFileSection = { diff --git a/generators/spring-cloud/generators/gateway/generator.spec.ts b/generators/spring-cloud/generators/gateway/generator.spec.ts index fcf2f0c290e5..b5bbc2a797c8 100644 --- a/generators/spring-cloud/generators/gateway/generator.spec.ts +++ b/generators/spring-cloud/generators/gateway/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js'; import { defaultHelpers as helpers, result } from '../../../../testing/index.js'; diff --git a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts index 1709e34bd669..14e47570273c 100644 --- a/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts +++ b/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.spec.ts @@ -1,5 +1,5 @@ -import { before, it, describe, expect } from 'esmocha'; -import { createImporterFromContent, ImportState } from '../../../../../jdl/jdl-importer.js'; +import { before, describe, expect, it } from 'esmocha'; +import { ImportState, createImporterFromContent } from '../../../../../jdl/jdl-importer.js'; import { convertSingleContentToJDL } from '../../../../../jdl/converters/json-to-jdl-converter.js'; const optionName = 'routes'; diff --git a/generators/spring-data-cassandra/database-changelog.spec.ts b/generators/spring-data-cassandra/database-changelog.spec.ts index 76edb24994ce..8196adba5132 100644 --- a/generators/spring-data-cassandra/database-changelog.spec.ts +++ b/generators/spring-data-cassandra/database-changelog.spec.ts @@ -1,4 +1,4 @@ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { dryRunHelpers as helpers } from '../../testing/index.js'; import { SERVER_MAIN_RES_DIR } from '../generator-constants.js'; diff --git a/generators/spring-data-cassandra/files.js b/generators/spring-data-cassandra/files.js index cf432c14bafb..bddde7625448 100644 --- a/generators/spring-data-cassandra/files.js +++ b/generators/spring-data-cassandra/files.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_SRC_DIR } from '../generator-constants.js'; +import { SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_SRC_DIR } from '../generator-constants.js'; import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir } from '../server/support/index.js'; export const cassandraFiles = { diff --git a/generators/spring-data-cassandra/generator.spec.ts b/generators/spring-data-cassandra/generator.spec.ts index eb93dd421bec..6bed360a6ba3 100644 --- a/generators/spring-data-cassandra/generator.spec.ts +++ b/generators/spring-data-cassandra/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { buildServerSamples, entitiesSimple as entities, defaultHelpers as helpers, runResult } from '../../testing/index.js'; @@ -28,8 +28,8 @@ import Generator from '../server/index.js'; import { databaseTypes } from '../../jdl/jhipster/index.js'; import { filterBasicServerGenerators, - shouldComposeWithSpringCloudStream, shouldComposeWithLiquibase, + shouldComposeWithSpringCloudStream, } from '../server/__test-support/index.js'; const __filename = fileURLToPath(import.meta.url); diff --git a/generators/spring-data-couchbase/files.js b/generators/spring-data-couchbase/files.js index d40f1da65da0..86a4c7ffa3bb 100644 --- a/generators/spring-data-couchbase/files.js +++ b/generators/spring-data-couchbase/files.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_SRC_DIR } from '../generator-constants.js'; +import { SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_SRC_DIR } from '../generator-constants.js'; import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir } from '../server/support/index.js'; export const couchbaseFiles = { diff --git a/generators/spring-data-couchbase/generator.spec.ts b/generators/spring-data-couchbase/generator.spec.ts index fdb3ee4a686e..484373577460 100644 --- a/generators/spring-data-couchbase/generator.spec.ts +++ b/generators/spring-data-couchbase/generator.spec.ts @@ -18,14 +18,14 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { + buildSamplesFromMatrix, buildServerMatrix, - extendMatrix, entitiesSimple as entities, - buildSamplesFromMatrix, + extendMatrix, defaultHelpers as helpers, runResult, } from '../../testing/index.js'; @@ -34,8 +34,8 @@ import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/ import { databaseTypes } from '../../jdl/jhipster/index.js'; import { filterBasicServerGenerators, - shouldComposeWithSpringCloudStream, shouldComposeWithLiquibase, + shouldComposeWithSpringCloudStream, } from '../server/__test-support/index.js'; import Generator from './generator.js'; diff --git a/generators/spring-data-elasticsearch/__test-support/elastic-search-matcher.ts b/generators/spring-data-elasticsearch/__test-support/elastic-search-matcher.ts index 54298a9c73f7..2e9afd49d4af 100644 --- a/generators/spring-data-elasticsearch/__test-support/elastic-search-matcher.ts +++ b/generators/spring-data-elasticsearch/__test-support/elastic-search-matcher.ts @@ -1,6 +1,6 @@ import type { RunResult } from 'yeoman-test'; -import { SERVER_MAIN_SRC_DIR, JAVA_DOCKER_DIR } from '../../generator-constants.js'; +import { JAVA_DOCKER_DIR, SERVER_MAIN_SRC_DIR } from '../../generator-constants.js'; import { matchWrittenConfig, matchWrittenFiles } from '../../../testing/index.js'; const expectedElasticsearchFiles = () => { diff --git a/generators/spring-data-elasticsearch/generator.spec.ts b/generators/spring-data-elasticsearch/generator.spec.ts index f2c65a309f55..9597961cfa8f 100644 --- a/generators/spring-data-elasticsearch/generator.spec.ts +++ b/generators/spring-data-elasticsearch/generator.spec.ts @@ -18,19 +18,19 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { + buildSamplesFromMatrix, buildServerMatrix, - extendMatrix, entitiesServerSamples as entities, - buildSamplesFromMatrix, + extendMatrix, defaultHelpers as helpers, runResult, } from '../../testing/index.js'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; -import { databaseTypes, searchEngineTypes, authenticationTypes, applicationTypes } from '../../jdl/jhipster/index.js'; +import { applicationTypes, authenticationTypes, databaseTypes, searchEngineTypes } from '../../jdl/jhipster/index.js'; import { filterBasicServerGenerators, shouldComposeWithSpringCloudStream } from '../server/__test-support/index.js'; import Generator from './generator.js'; import { matchElasticSearch, matchElasticSearchUser } from './__test-support/elastic-search-matcher.js'; diff --git a/generators/spring-data-mongodb/generator.spec.ts b/generators/spring-data-mongodb/generator.spec.ts index a8f276b43296..4812b7bed174 100644 --- a/generators/spring-data-mongodb/generator.spec.ts +++ b/generators/spring-data-mongodb/generator.spec.ts @@ -18,7 +18,7 @@ */ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { @@ -34,8 +34,8 @@ import Generator from '../server/index.js'; import { databaseTypes } from '../../jdl/jhipster/index.js'; import { filterBasicServerGenerators, - shouldComposeWithSpringCloudStream, shouldComposeWithLiquibase, + shouldComposeWithSpringCloudStream, } from '../server/__test-support/index.js'; const __filename = fileURLToPath(import.meta.url); diff --git a/generators/spring-data-neo4j/files.ts b/generators/spring-data-neo4j/files.ts index b34b2fd33326..490c5a494007 100644 --- a/generators/spring-data-neo4j/files.ts +++ b/generators/spring-data-neo4j/files.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir } from '../server/support/index.js'; -import { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_SRC_DIR } from '../generator-constants.js'; +import { SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_SRC_DIR } from '../generator-constants.js'; import Generator from './generator.js'; export const neo4jFiles = { diff --git a/generators/spring-data-neo4j/generator.spec.ts b/generators/spring-data-neo4j/generator.spec.ts index 6db56dfaeeec..4c7911a7b716 100644 --- a/generators/spring-data-neo4j/generator.spec.ts +++ b/generators/spring-data-neo4j/generator.spec.ts @@ -1,6 +1,6 @@ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { buildSamplesFromMatrix, buildServerMatrix, @@ -14,8 +14,8 @@ import Generator from '../server/index.js'; import { databaseTypes } from '../../jdl/jhipster/index.js'; import { filterBasicServerGenerators, - shouldComposeWithSpringCloudStream, shouldComposeWithLiquibase, + shouldComposeWithSpringCloudStream, } from '../server/__test-support/index.js'; import { GENERATOR_SERVER } from '../generator-list.js'; diff --git a/generators/spring-data-relational/files.js b/generators/spring-data-relational/files.js index cd157ec26389..97471328db96 100644 --- a/generators/spring-data-relational/files.js +++ b/generators/spring-data-relational/files.js @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { mergeSections, addSectionsCondition } from '../base/support/index.js'; +import { addSectionsCondition, mergeSections } from '../base/support/index.js'; import { javaMainPackageTemplatesBlock, + javaMainResourceTemplatesBlock, javaTestPackageTemplatesBlock, javaTestResourceTemplatesBlock, - javaMainResourceTemplatesBlock, } from '../java/support/index.js'; export const sqlFiles = { diff --git a/generators/spring-data-relational/generator.spec.ts b/generators/spring-data-relational/generator.spec.ts index 2472c3789b23..6d61d2820638 100644 --- a/generators/spring-data-relational/generator.spec.ts +++ b/generators/spring-data-relational/generator.spec.ts @@ -1,24 +1,24 @@ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { + buildSamplesFromMatrix, buildServerMatrix, - extendMatrix, extendFilteredMatrix, - buildSamplesFromMatrix, + extendMatrix, defaultHelpers as helpers, runResult, } from '../../testing/index.js'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; import Generator from '../server/index.js'; -import { databaseTypes, cacheTypes } from '../../jdl/jhipster/index.js'; +import { cacheTypes, databaseTypes } from '../../jdl/jhipster/index.js'; import { filterBasicServerGenerators, - shouldComposeWithSpringCloudStream, shouldComposeWithLiquibase, + shouldComposeWithSpringCloudStream, } from '../server/__test-support/index.js'; import { GENERATOR_SERVER } from '../generator-list.js'; diff --git a/generators/spring-data-relational/sql-entities.spec.ts b/generators/spring-data-relational/sql-entities.spec.ts index e91f926598a3..1f24bfe4feed 100644 --- a/generators/spring-data-relational/sql-entities.spec.ts +++ b/generators/spring-data-relational/sql-entities.spec.ts @@ -1,16 +1,16 @@ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { + buildSamplesFromMatrix, buildServerMatrix, - extendMatrix, - extendFilteredMatrix, entitiesServerSamples as entities, - buildSamplesFromMatrix, + extendFilteredMatrix, + extendMatrix, defaultHelpers as helpers, runResult, } from '../../testing/index.js'; import { filterBasicServerGenerators } from '../server/__test-support/index.js'; -import { databaseTypes, cacheTypes } from '../../jdl/jhipster/index.js'; +import { cacheTypes, databaseTypes } from '../../jdl/jhipster/index.js'; import { GENERATOR_SERVER } from '../generator-list.js'; const { SQL: databaseType, H2_DISK, H2_MEMORY, POSTGRESQL, MARIADB, MYSQL, MSSQL, ORACLE } = databaseTypes; diff --git a/generators/spring-data-relational/support/database-url.spec.ts b/generators/spring-data-relational/support/database-url.spec.ts index c4ffc1667fee..ea0c4162a6e0 100644 --- a/generators/spring-data-relational/support/database-url.spec.ts +++ b/generators/spring-data-relational/support/database-url.spec.ts @@ -1,4 +1,4 @@ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { databaseTypes } from '../../../jdl/jhipster/index.js'; import { getJdbcUrl, getR2dbcUrl } from './database-url.js'; diff --git a/generators/spring-websocket/generator.spec.ts b/generators/spring-websocket/generator.spec.ts index 25f9e2cc0a48..fa50cc84f5bb 100644 --- a/generators/spring-websocket/generator.spec.ts +++ b/generators/spring-websocket/generator.spec.ts @@ -1,6 +1,6 @@ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; diff --git a/generators/upgrade/generator.spec.js b/generators/upgrade/generator.spec.js index 512092a9d8cd..cde8bac8e205 100644 --- a/generators/upgrade/generator.spec.js +++ b/generators/upgrade/generator.spec.js @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect, before, fn } from 'esmocha'; +import { before, describe, expect, fn, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import git from 'simple-git'; diff --git a/generators/upgrade/upgrade.spec.ts b/generators/upgrade/upgrade.spec.ts index 8061a0ed7bc4..fd4bb2160fca 100644 --- a/generators/upgrade/upgrade.spec.ts +++ b/generators/upgrade/upgrade.spec.ts @@ -2,11 +2,11 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { mkdirSync, writeFileSync } from 'fs'; import { escapeRegExp } from 'lodash-es'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { execaCommandSync } from 'execa'; import { packageJson } from '../../lib/index.js'; import { GENERATOR_APP, GENERATOR_UPGRADE } from '../generator-list.js'; -import { basicHelpers as helpers, getGenerator, result as runResult } from '../../testing/index.js'; +import { getGenerator, basicHelpers as helpers, result as runResult } from '../../testing/index.js'; const writeJsonSync = (file, content) => writeFileSync(file, JSON.stringify(content, null, 2)); diff --git a/generators/vue/generator.js b/generators/vue/generator.js index d61b8c51bf0c..63b9b56494ad 100644 --- a/generators/vue/generator.js +++ b/generators/vue/generator.js @@ -22,20 +22,20 @@ import { isFileStateModified } from 'mem-fs-editor/state'; import { camelCase, startCase } from 'lodash-es'; import BaseApplicationGenerator from '../base-application/index.js'; -import { fieldTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.js'; -import { GENERATOR_VUE, GENERATOR_CLIENT, GENERATOR_LANGUAGES } from '../generator-list.js'; +import { clientFrameworkTypes, fieldTypes } from '../../jdl/jhipster/index.js'; +import { GENERATOR_CLIENT, GENERATOR_LANGUAGES, GENERATOR_VUE } from '../generator-list.js'; import { + generateEntityClientImports as formatEntityClientImports, generateEntityClientEnumImports as getClientEnumImportsFormat, generateEntityClientFields as getHydratedEntityClientFields, - generateEntityClientImports as formatEntityClientImports, - generateTestEntityId as getTestEntityId, getTypescriptKeyType as getTSKeyType, + generateTestEntityId as getTestEntityId, } from '../client/support/index.js'; import { createNeedleCallback } from '../base/support/index.js'; import { writeEslintClientRootConfigFile } from '../javascript/generators/eslint/support/tasks.js'; -import { writeEntityFiles, postWriteEntityFiles, cleanupEntitiesFiles } from './entity-files-vue.js'; +import { cleanupEntitiesFiles, postWriteEntityFiles, writeEntityFiles } from './entity-files-vue.js'; import cleanupOldFilesTask from './cleanup.js'; -import { writeFiles, writeEntitiesFiles } from './files-vue.js'; +import { writeEntitiesFiles, writeFiles } from './files-vue.js'; import { convertTranslationsSupport, isTranslatedVueFile, translateVueFilesTransform } from './support/index.js'; const { CommonDBTypes } = fieldTypes; diff --git a/generators/vue/generator.spec.ts b/generators/vue/generator.spec.ts index b2b035ec8c6e..2a7c6ed376c9 100644 --- a/generators/vue/generator.spec.ts +++ b/generators/vue/generator.spec.ts @@ -1,10 +1,10 @@ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { buildClientSamples, entitiesClientSamples as entities, defaultHelpers as helpers, runResult } from '../../testing/index.js'; -import { shouldSupportFeatures, testBlueprintSupport, checkEnforcements } from '../../test/support/index.js'; +import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js'; import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js'; diff --git a/generators/vue/support/translate-vue.spec.ts b/generators/vue/support/translate-vue.spec.ts index 5719ebbe05b6..3d934df1162d 100644 --- a/generators/vue/support/translate-vue.spec.ts +++ b/generators/vue/support/translate-vue.spec.ts @@ -17,8 +17,8 @@ * limitations under the License. */ import { inspect } from 'node:util'; -import { it, describe, expect } from 'esmocha'; -import { replaceTranslationTags, replaceTranslations, removeDeclarations } from './translate-vue.js'; +import { describe, expect, it } from 'esmocha'; +import { removeDeclarations, replaceTranslationTags, replaceTranslations } from './translate-vue.js'; const FULL_BODY = ` Your user account has been activated. Please diff --git a/generators/workspaces/generator.spec.js b/generators/workspaces/generator.spec.js index 09dcf8638160..abe1797b8e97 100644 --- a/generators/workspaces/generator.spec.js +++ b/generators/workspaces/generator.spec.js @@ -18,7 +18,7 @@ */ import { basename, dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; import { snakeCase } from 'lodash-es'; import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js'; diff --git a/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts index ef949a382366..b45f59f1a40c 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts +++ b/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect as jestExpect } from 'esmocha'; +import { before, describe, it, expect as jestExpect } from 'esmocha'; import chai, { expect } from 'chai'; import sinonChai from 'sinon-chai'; diff --git a/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts index 6267fdba5e26..1b8388d11c97 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts +++ b/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect as jestExpect } from 'esmocha'; +import { before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import JDLObject from '../../models/jdl-object.js'; import { JDLEntity, JDLEnum } from '../../models/index.js'; diff --git a/jdl/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts index c51e44413104..e0e1e50ba26a 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts +++ b/jdl/converters/jdl-to-json/jdl-to-json-option-converter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, after, expect as jestExpect } from 'esmocha'; +import { after, before, describe, it, expect as jestExpect } from 'esmocha'; import chai, { expect } from 'chai'; import sinon from 'sinon'; import sinonChai from 'sinon-chai'; @@ -28,7 +28,7 @@ import JDLObject from '../../models/jdl-object.js'; import { JDLEntity } from '../../models/index.js'; import JDLUnaryOption from '../../models/jdl-unary-option.js'; import JDLBinaryOption from '../../models/jdl-binary-option.js'; -import { unaryOptions, binaryOptions } from '../../jhipster/index.js'; +import { binaryOptions, unaryOptions } from '../../jhipster/index.js'; import logger from '../../utils/objects/logger.js'; import { convert } from './jdl-to-json-option-converter.js'; diff --git a/jdl/converters/jdl-to-json/jdl-to-json-option-converter.ts b/jdl/converters/jdl-to-json/jdl-to-json-option-converter.ts index 238ba0b62ac6..a5a18bbc6412 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-option-converter.ts +++ b/jdl/converters/jdl-to-json/jdl-to-json-option-converter.ts @@ -18,7 +18,7 @@ */ import logger from '../../utils/objects/logger.js'; -import { unaryOptions, binaryOptions, entityOptions, searchEngineTypes } from '../../jhipster/index.js'; +import { binaryOptions, entityOptions, searchEngineTypes, unaryOptions } from '../../jhipster/index.js'; import JDLObject from '../../models/jdl-object.js'; import JDLApplication from '../../models/jdl-application.js'; import AbstractJDLOption from '../../models/abstract-jdl-option.js'; diff --git a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts index 71f9c27e6d2c..93f0ada38092 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts +++ b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts @@ -17,10 +17,10 @@ * limitations under the License. */ -import { before, it, describe, expect as jestExpect } from 'esmocha'; +import { before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import JDLRelationship from '../../models/jdl-relationship.js'; -import { relationshipTypes, relationshipOptions } from '../../jhipster/index.js'; +import { relationshipOptions, relationshipTypes } from '../../jhipster/index.js'; import { convert } from './jdl-to-json-relationship-converter.js'; const { ONE_TO_ONE, MANY_TO_MANY, MANY_TO_ONE, ONE_TO_MANY } = relationshipTypes; diff --git a/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts index 575c28255958..4b88d453ff82 100644 --- a/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts +++ b/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, after, expect as jestExpect } from 'esmocha'; +import { after, before, describe, it, expect as jestExpect } from 'esmocha'; import chai, { expect } from 'chai'; import sinon from 'sinon'; import sinonChai from 'sinon-chai'; @@ -26,13 +26,13 @@ chai.use(sinonChai); import { applicationTypes, + binaryOptions, databaseTypes, fieldTypes, - validations, - unaryOptions, - binaryOptions, - relationshipTypes, relationshipOptions, + relationshipTypes, + unaryOptions, + validations, } from '../../jhipster/index.js'; import createJDLApplication from '../../models/jdl-application-factory.js'; import JDLObject from '../../models/jdl-object.js'; diff --git a/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts index cffb33f041e9..ee6ddfd1edb6 100644 --- a/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts +++ b/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, after, expect as jestExpect } from 'esmocha'; +import { after, before, describe, it, expect as jestExpect } from 'esmocha'; import chai, { expect } from 'chai'; import sinon from 'sinon'; import sinonChai from 'sinon-chai'; @@ -26,13 +26,13 @@ chai.use(sinonChai); import { applicationTypes, + binaryOptions, databaseTypes, fieldTypes, - validations, - unaryOptions, - binaryOptions, - relationshipTypes, relationshipOptions, + relationshipTypes, + unaryOptions, + validations, } from '../../jhipster/index.js'; import JDLObject from '../../models/jdl-object.js'; diff --git a/jdl/converters/json-to-jdl-application-converter.spec.ts b/jdl/converters/json-to-jdl-application-converter.spec.ts index 0d782899a115..efc2085cedec 100644 --- a/jdl/converters/json-to-jdl-application-converter.spec.ts +++ b/jdl/converters/json-to-jdl-application-converter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import createJDLApplication from '../models/jdl-application-factory.js'; import { convertApplicationsToJDL } from '../converters/json-to-jdl-application-converter.js'; diff --git a/jdl/converters/json-to-jdl-converter.spec.ts b/jdl/converters/json-to-jdl-converter.spec.ts index a4adab6c826d..058e7e498280 100644 --- a/jdl/converters/json-to-jdl-converter.spec.ts +++ b/jdl/converters/json-to-jdl-converter.spec.ts @@ -20,9 +20,9 @@ import fs, { readFileSync } from 'fs'; import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect as jestExpect, beforeEach } from 'esmocha'; +import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; -import { convertToJDL, convertSingleContentToJDL } from '../converters/json-to-jdl-converter.js'; +import { convertSingleContentToJDL, convertToJDL } from '../converters/json-to-jdl-converter.js'; import { createJHipsterConfigFiles, basicHelpers as helpers } from '../../testing/index.js'; const __filename = fileURLToPath(import.meta.url); diff --git a/jdl/converters/json-to-jdl-converter.ts b/jdl/converters/json-to-jdl-converter.ts index 05fc8fe6b3ed..5e8b0f928bf1 100644 --- a/jdl/converters/json-to-jdl-converter.ts +++ b/jdl/converters/json-to-jdl-converter.ts @@ -21,13 +21,13 @@ import path from 'path'; import fs from 'fs'; import JDLObject from '../models/jdl-object.js'; import mergeJDLObjects from '../models/jdl-object-merger.js'; -import { doesFileExist, doesDirectoryExist } from '../utils/file-utils.js'; +import { doesDirectoryExist, doesFileExist } from '../utils/file-utils.js'; import { readJSONFile } from '../readers/json-file-reader.js'; import exportJDLObject from '../exporters/jdl-exporter.js'; import { removeFieldsWithNullishValues } from '../../generators/base/support/config.js'; import { GENERATOR_JHIPSTER } from '../../generators/generator-constants.js'; import JDLApplication from '../models/jdl-application.js'; -import { JSONEntity, JHipsterYoRcContent, PostProcessedJSONRootObject } from './types.js'; +import { JHipsterYoRcContent, JSONEntity, PostProcessedJSONRootObject } from './types.js'; import { convertEntitiesToJDL } from './json-to-jdl-entity-converter.js'; import { convertApplicationToJDL } from './json-to-jdl-application-converter.js'; diff --git a/jdl/converters/json-to-jdl-entity-converter.spec.ts b/jdl/converters/json-to-jdl-entity-converter.spec.ts index a30223e8422e..43c33ac4ea1f 100644 --- a/jdl/converters/json-to-jdl-entity-converter.spec.ts +++ b/jdl/converters/json-to-jdl-entity-converter.spec.ts @@ -20,10 +20,10 @@ import fs from 'fs'; import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { convertEntitiesToJDL } from '../converters/json-to-jdl-entity-converter.js'; -import { unaryOptions, relationshipOptions, binaryOptions } from '../jhipster/index.js'; +import { binaryOptions, relationshipOptions, unaryOptions } from '../jhipster/index.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/jdl/converters/json-to-jdl-entity-converter.ts b/jdl/converters/json-to-jdl-entity-converter.ts index d5ff7aff9442..df1c063f9c62 100644 --- a/jdl/converters/json-to-jdl-entity-converter.ts +++ b/jdl/converters/json-to-jdl-entity-converter.ts @@ -27,7 +27,7 @@ import JDLBinaryOption from '../models/jdl-binary-option.js'; import { lowerFirst, upperFirst } from '../utils/string-utils.js'; -import { fieldTypes, unaryOptions, binaryOptions, relationshipOptions } from '../jhipster/index.js'; +import { binaryOptions, fieldTypes, relationshipOptions, unaryOptions } from '../jhipster/index.js'; import { asJdlRelationshipType } from '../jhipster/relationship-types.js'; import { JSONEntity, JSONField, JSONRelationship } from './types.js'; diff --git a/jdl/converters/json-to-jdl-option-converter.spec.ts b/jdl/converters/json-to-jdl-option-converter.spec.ts index 59e3326d98e5..2e51983f4c06 100644 --- a/jdl/converters/json-to-jdl-option-converter.spec.ts +++ b/jdl/converters/json-to-jdl-option-converter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { convertServerOptionsToJDL } from '../converters/json-to-jdl-option-converter.js'; import JDLObject from '../models/jdl-object.js'; diff --git a/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts b/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts index 5c0bc44477a6..fcb23086e4f8 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts +++ b/jdl/converters/parsed-jdl-to-jdl-object/application-converter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { applicationTypes } from '../../jhipster/index.js'; import createJDLApplication from '../../models/jdl-application-factory.js'; diff --git a/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts b/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts index dfe247a1b595..ad77b8b01fdd 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts +++ b/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { convertDeployments } from './deployment-converter.js'; describe('jdl - DeploymentConverter', () => { diff --git a/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts b/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts index 9e2b8235f485..df18aecd353f 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts +++ b/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { convertEntities } from './entity-converter.js'; describe('jdl - EntityConverter', () => { diff --git a/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts b/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts index 501b6a05f493..a4eb0b74bf79 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts +++ b/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { convertEnums } from './enum-converter.js'; describe('jdl - EnumConverter', () => { diff --git a/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts b/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts index 42ab515e9a89..a192a0b67397 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts +++ b/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import JDLField from '../../models/jdl-field.js'; import { convertField } from './field-converter.js'; diff --git a/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts b/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts index d99c26864122..f877ee1b6d6d 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts +++ b/jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts @@ -17,8 +17,8 @@ * limitations under the License. */ -import { before, it, describe, expect } from 'esmocha'; -import { unaryOptions, binaryOptions, entityOptions, searchEngineTypes } from '../../jhipster/index.js'; +import { before, describe, expect, it } from 'esmocha'; +import { binaryOptions, entityOptions, searchEngineTypes, unaryOptions } from '../../jhipster/index.js'; import { convertOptions } from './option-converter.js'; const { MapperTypes, PaginationTypes } = entityOptions; diff --git a/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts b/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts index 9cca1ca19131..ed9cf7f71d35 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts +++ b/jdl/converters/parsed-jdl-to-jdl-object/option-converter.ts @@ -19,7 +19,7 @@ import JDLUnaryOption from '../../models/jdl-unary-option.js'; import JDLBinaryOption from '../../models/jdl-binary-option.js'; -import { unaryOptions, binaryOptions } from '../../jhipster/index.js'; +import { binaryOptions, unaryOptions } from '../../jhipster/index.js'; import AbstractJDLOption from '../../models/abstract-jdl-option.js'; import { ParsedJDLOption, ParsedJDLUseOption } from './types.js'; diff --git a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts index f2512a8324f2..a84dbf29a9c0 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts +++ b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.spec.ts @@ -19,7 +19,7 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, expect as jestExpect } from 'esmocha'; +import { before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import matchEntity from '../../matchers/entity-matcher.js'; import * as JDLReader from '../../readers/jdl-reader.js'; @@ -29,13 +29,13 @@ import JDLValidation from '../../models/jdl-validation.js'; import JDLUnaryOption from '../../models/jdl-unary-option.js'; import JDLBinaryOption from '../../models/jdl-binary-option.js'; import { + applicationOptions, applicationTypes, + binaryOptions, + entityOptions, fieldTypes, - validations, unaryOptions, - applicationOptions, - entityOptions, - binaryOptions, + validations, } from '../../jhipster/index.js'; import ParsedJDLToJDLObjectConverter from './parsed-jdl-to-jdl-object-converter.js'; diff --git a/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts b/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts index 32506ff1d373..4b3048cf5dcc 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts +++ b/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { convertRelationships } from './relationship-converter.js'; describe('jdl - RelationshipConverter', () => { diff --git a/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts b/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts index a1c7390768e8..7bc08530eba0 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts +++ b/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { convertValidations } from './validation-converter.js'; describe('jdl - ValidationConverter', () => { diff --git a/jdl/converters/types.d.ts b/jdl/converters/types.d.ts index 6267a612a92a..71abbbd603b4 100644 --- a/jdl/converters/types.d.ts +++ b/jdl/converters/types.d.ts @@ -1,4 +1,4 @@ -import { RelationshipType, RelationshipSide } from '../basic-types/relationships.js'; +import { RelationshipSide, RelationshipType } from '../basic-types/relationships.js'; import { GENERATOR_JHIPSTER } from '../../generators/index.js'; export type JSONField = { diff --git a/jdl/exporters/export-utils.spec.ts b/jdl/exporters/export-utils.spec.ts index 4d1f1e6679f1..0390c7947aff 100644 --- a/jdl/exporters/export-utils.spec.ts +++ b/jdl/exporters/export-utils.spec.ts @@ -20,7 +20,7 @@ import { readFileSync, writeFileSync } from 'fs'; import { dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, expect, beforeEach } from 'esmocha'; +import { beforeEach, describe, expect, it } from 'esmocha'; import { writeConfigFile } from '../exporters/export-utils.js'; import { basicHelpers as helpers } from '../../testing/index.js'; diff --git a/jdl/exporters/jdl-exporter.spec.ts b/jdl/exporters/jdl-exporter.spec.ts index 2f4bb579f7b8..512ba5fa68f3 100644 --- a/jdl/exporters/jdl-exporter.spec.ts +++ b/jdl/exporters/jdl-exporter.spec.ts @@ -19,7 +19,7 @@ import fs from 'fs'; import { expect } from 'chai'; -import { it, describe, expect as jestExpect, beforeEach } from 'esmocha'; +import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import JDLObject from '../models/jdl-object.js'; import { JDLEntity } from '../models/index.js'; import exportToJDL from '../exporters/jdl-exporter.js'; diff --git a/jdl/exporters/jhipster-deployment-exporter.spec.ts b/jdl/exporters/jhipster-deployment-exporter.spec.ts index 1de9b51a3bdc..942a0ba2c7f5 100644 --- a/jdl/exporters/jhipster-deployment-exporter.spec.ts +++ b/jdl/exporters/jhipster-deployment-exporter.spec.ts @@ -19,7 +19,7 @@ import fs from 'fs'; import path from 'path'; -import { it, describe, expect as jestExpect, beforeEach } from 'esmocha'; +import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import exportDeployments from '../exporters/jhipster-deployment-exporter.js'; import JDLDeployment from '../models/jdl-deployment.js'; diff --git a/jdl/exporters/jhipster-entity-exporter.spec.ts b/jdl/exporters/jhipster-entity-exporter.spec.ts index 855c53abdeed..ed4dae6cc9c3 100644 --- a/jdl/exporters/jhipster-entity-exporter.spec.ts +++ b/jdl/exporters/jhipster-entity-exporter.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe, expect as jestExpect, beforeEach } from 'esmocha'; +import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import exportEntities from '../exporters/jhipster-entity-exporter.js'; import { applicationTypes } from '../jhipster/index.js'; diff --git a/jdl/exporters/jhipster-entity-exporter.ts b/jdl/exporters/jhipster-entity-exporter.ts index 161d3a4b65d6..98e2b5d9470c 100644 --- a/jdl/exporters/jhipster-entity-exporter.ts +++ b/jdl/exporters/jhipster-entity-exporter.ts @@ -20,7 +20,7 @@ import path from 'path'; import { applicationTypes } from '../jhipster/index.js'; -import { toFilePath, readJSONFile } from '../readers/json-file-reader.js'; +import { readJSONFile, toFilePath } from '../readers/json-file-reader.js'; import { doesFileExist } from '../utils/file-utils.js'; import { JSONEntity } from '../converters/types.js'; import { JhipsterJSONJDLExporterWrapper } from './types.js'; diff --git a/jdl/integration-test.spec.ts b/jdl/integration-test.spec.ts index 00433fe60e66..e989338600b7 100644 --- a/jdl/integration-test.spec.ts +++ b/jdl/integration-test.spec.ts @@ -20,7 +20,7 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { expect } from 'chai'; -import { it, describe, expect as jestExpect, beforeEach } from 'esmocha'; +import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { basicHelpers as helpers } from '../testing/index.js'; import { applicationTypes } from './jhipster/index.js'; import { parseFromContent, parseFromFiles } from './readers/jdl-reader.js'; diff --git a/jdl/jdl-importer.spec.ts b/jdl/jdl-importer.spec.ts index ef885a6b48c7..75ff0e4abd14 100644 --- a/jdl/jdl-importer.spec.ts +++ b/jdl/jdl-importer.spec.ts @@ -20,11 +20,11 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { readFileSync, rmSync } from 'fs'; -import { before, it, describe, after, expect as jestExpect } from 'esmocha'; +import { after, before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { applicationTypes, clientFrameworkTypes, databaseTypes } from './jhipster/index.js'; -import { createImporterFromFiles, createImporterFromContent } from './jdl-importer.js'; +import { createImporterFromContent, createImporterFromFiles } from './jdl-importer.js'; const { MONOLITH } = applicationTypes; const __filename = fileURLToPath(import.meta.url); diff --git a/jdl/jhipster/binary-options.spec.ts b/jdl/jhipster/binary-options.spec.ts index 73d8fb3a717c..d42c14b4cc6e 100644 --- a/jdl/jhipster/binary-options.spec.ts +++ b/jdl/jhipster/binary-options.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect as jestExpect } from 'esmocha'; +import { before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { binaryOptions } from '../jhipster/index.js'; diff --git a/jdl/jhipster/database-types.spec.ts b/jdl/jhipster/database-types.spec.ts index abbc29e6354c..e229003b4bb7 100644 --- a/jdl/jhipster/database-types.spec.ts +++ b/jdl/jhipster/database-types.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import { databaseTypes } from '../jhipster/index.js'; diff --git a/jdl/jhipster/default-application-options.spec.ts b/jdl/jhipster/default-application-options.spec.ts index 21506a1d7f4b..395e881fd2e9 100644 --- a/jdl/jhipster/default-application-options.spec.ts +++ b/jdl/jhipster/default-application-options.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { defaultApplicationOptions } from '../jhipster/index.js'; diff --git a/jdl/jhipster/deployment-options.spec.ts b/jdl/jhipster/deployment-options.spec.ts index 8b0f9b97a512..37ea57b86032 100644 --- a/jdl/jhipster/deployment-options.spec.ts +++ b/jdl/jhipster/deployment-options.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import { deploymentOptions } from '../jhipster/index.js'; diff --git a/jdl/jhipster/entity-table-name-creator.spec.ts b/jdl/jhipster/entity-table-name-creator.spec.ts index bb7422c9ecc1..f31f0b83ba9f 100644 --- a/jdl/jhipster/entity-table-name-creator.spec.ts +++ b/jdl/jhipster/entity-table-name-creator.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import { entityTableNameCreator, getTableNameFromEntityNameFallback } from '../jhipster/index.js'; diff --git a/jdl/jhipster/field-types.spec.ts b/jdl/jhipster/field-types.spec.ts index 7d155882947e..3aa1cf19680a 100644 --- a/jdl/jhipster/field-types.spec.ts +++ b/jdl/jhipster/field-types.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import { databaseTypes, fieldTypes, validations } from '../jhipster/index.js'; diff --git a/jdl/jhipster/json-entity.spec.ts b/jdl/jhipster/json-entity.spec.ts index 3fe7d2a069e1..fc6d59aa53e0 100644 --- a/jdl/jhipster/json-entity.spec.ts +++ b/jdl/jhipster/json-entity.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect as jestExpect } from 'esmocha'; +import { before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { jsonEntity as JSONEntity } from '../jhipster/index.js'; diff --git a/jdl/jhipster/relationship-options.spec.ts b/jdl/jhipster/relationship-options.spec.ts index a8a924129ab5..28118a0bc455 100644 --- a/jdl/jhipster/relationship-options.spec.ts +++ b/jdl/jhipster/relationship-options.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import { relationshipOptions } from '../jhipster/index.js'; diff --git a/jdl/jhipster/relationship-types.spec.ts b/jdl/jhipster/relationship-types.spec.ts index dd8681e5f54e..73f7395536a3 100644 --- a/jdl/jhipster/relationship-types.spec.ts +++ b/jdl/jhipster/relationship-types.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import { relationshipTypes } from '../jhipster/index.js'; import { relationshipTypeExists } from './relationship-types.js'; diff --git a/jdl/jhipster/reserved-keywords.spec.ts b/jdl/jhipster/reserved-keywords.spec.ts index efa8a1918981..67d97bfbe43a 100644 --- a/jdl/jhipster/reserved-keywords.spec.ts +++ b/jdl/jhipster/reserved-keywords.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import { reservedKeywords } from '../jhipster/index.js'; diff --git a/jdl/jhipster/unary-options.spec.ts b/jdl/jhipster/unary-options.spec.ts index 71a688e7d069..e151363cfd88 100644 --- a/jdl/jhipster/unary-options.spec.ts +++ b/jdl/jhipster/unary-options.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect as jestExpect } from 'esmocha'; +import { before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { unaryOptions } from '../jhipster/index.js'; diff --git a/jdl/jhipster/validations.spec.ts b/jdl/jhipster/validations.spec.ts index cfa6ddb84a4f..f11f784e5ce7 100644 --- a/jdl/jhipster/validations.spec.ts +++ b/jdl/jhipster/validations.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import { validations } from '../jhipster/index.js'; diff --git a/jdl/linters/issues/entity-issue.spec.ts b/jdl/linters/issues/entity-issue.spec.ts index ad4a2bb44d7b..69f16b3ca81a 100644 --- a/jdl/linters/issues/entity-issue.spec.ts +++ b/jdl/linters/issues/entity-issue.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import EntityIssue from './entity-issue.js'; diff --git a/jdl/linters/issues/enum-issue.spec.ts b/jdl/linters/issues/enum-issue.spec.ts index 63e3caf2a628..69ec7b0ccb55 100644 --- a/jdl/linters/issues/enum-issue.spec.ts +++ b/jdl/linters/issues/enum-issue.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import EnumIssue from './enum-issue.js'; diff --git a/jdl/linters/issues/field-issue.spec.ts b/jdl/linters/issues/field-issue.spec.ts index 621458d2684e..da13ab9d96ca 100644 --- a/jdl/linters/issues/field-issue.spec.ts +++ b/jdl/linters/issues/field-issue.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import FieldIssue from './field-issue.js'; diff --git a/jdl/linters/issues/issues.spec.ts b/jdl/linters/issues/issues.spec.ts index ed1d07baac15..03f5ee400669 100644 --- a/jdl/linters/issues/issues.spec.ts +++ b/jdl/linters/issues/issues.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe, beforeEach } from 'esmocha'; +import { beforeEach, describe, it } from 'esmocha'; import { expect } from 'chai'; import { rulesNames } from '../rules.js'; import { relationshipTypes } from '../../jhipster/index.js'; diff --git a/jdl/linters/issues/relationship-issue.spec.ts b/jdl/linters/issues/relationship-issue.spec.ts index 07d035a9b93a..6889c30751c6 100644 --- a/jdl/linters/issues/relationship-issue.spec.ts +++ b/jdl/linters/issues/relationship-issue.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import RelationshipIssue from './relationship-issue.js'; diff --git a/jdl/linters/jdl-linter.spec.ts b/jdl/linters/jdl-linter.spec.ts index 2ab68707104b..09dd60772ac0 100644 --- a/jdl/linters/jdl-linter.spec.ts +++ b/jdl/linters/jdl-linter.spec.ts @@ -21,9 +21,9 @@ import { writeFileSync } from 'fs'; import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { expect } from 'chai'; -import { it, describe, expect as jestExpect, beforeEach } from 'esmocha'; +import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { basicHelpers as helpers } from '../../testing/index.js'; -import { createJDLLinterFromFile, createJDLLinterFromContent, JDLLinter } from './jdl-linter.js'; +import { JDLLinter, createJDLLinterFromContent, createJDLLinterFromFile } from './jdl-linter.js'; import Issues from './issues/issues.js'; import EnumIssue from './issues/enum-issue.js'; import relationshipIssue from './issues/relationship-issue.js'; diff --git a/jdl/linters/jdl-linter.ts b/jdl/linters/jdl-linter.ts index 843999a93004..3e3c13b8e565 100644 --- a/jdl/linters/jdl-linter.ts +++ b/jdl/linters/jdl-linter.ts @@ -20,7 +20,7 @@ import { readFile } from '../readers/file-reader.js'; import * as JDLReader from '../readers/jdl-reader.js'; import Issues from './issues/issues.js'; -import { checkEntities, EntityDeclaration } from './entity-linter.js'; +import { EntityDeclaration, checkEntities } from './entity-linter.js'; import { checkFields } from './field-linter.js'; import { checkEnums } from './enum-linter.js'; import { checkRelationships } from './relationship-linter.js'; diff --git a/jdl/linters/rule.spec.ts b/jdl/linters/rule.spec.ts index 1e396899f281..5198128bad47 100644 --- a/jdl/linters/rule.spec.ts +++ b/jdl/linters/rule.spec.ts @@ -17,10 +17,10 @@ * limitations under the License. */ -import { before, it, describe, beforeEach } from 'esmocha'; +import { before, beforeEach, describe, it } from 'esmocha'; import { expect } from 'chai'; import Rule from './rule.js'; -import { INFO, ERROR } from './rule-levels.js'; +import { ERROR, INFO } from './rule-levels.js'; describe('jdl - Rule', () => { describe('new', () => { diff --git a/jdl/linters/rule.ts b/jdl/linters/rule.ts index 57fdc821a80c..19177b6401e2 100644 --- a/jdl/linters/rule.ts +++ b/jdl/linters/rule.ts @@ -18,7 +18,7 @@ */ import { merge } from '../utils/object-utils.js'; -import { RuleLevel, INFO } from './rule-levels.js'; +import { INFO, RuleLevel } from './rule-levels.js'; /** * Represents a rule for the linters. diff --git a/jdl/linters/rules.spec.ts b/jdl/linters/rules.spec.ts index a0f4b458e41e..dc8c3e2ac342 100644 --- a/jdl/linters/rules.spec.ts +++ b/jdl/linters/rules.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import { getRule, rules, rulesNames } from './rules.js'; diff --git a/jdl/linters/rules.ts b/jdl/linters/rules.ts index 0cb0b72d892f..9d37fbe1a5b8 100644 --- a/jdl/linters/rules.ts +++ b/jdl/linters/rules.ts @@ -18,7 +18,7 @@ */ import Rule from './rule.js'; -import { INFO, WARNING, ERROR } from './rule-levels.js'; +import { ERROR, INFO, WARNING } from './rule-levels.js'; export const rulesNames = { ENT_SHORTER_DECL: 'ENT_SHORTER_DECL', diff --git a/jdl/models/abstract-jdl-option.spec.ts b/jdl/models/abstract-jdl-option.spec.ts index 20d926d35517..b0b3238916ed 100644 --- a/jdl/models/abstract-jdl-option.spec.ts +++ b/jdl/models/abstract-jdl-option.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import JDLBinaryOption from '../models/jdl-binary-option.js'; import { binaryOptions } from '../jhipster/index.js'; diff --git a/jdl/models/jdl-application-configuration-factory.spec.ts b/jdl/models/jdl-application-configuration-factory.spec.ts index dab08659f103..fa0b755fe366 100644 --- a/jdl/models/jdl-application-configuration-factory.spec.ts +++ b/jdl/models/jdl-application-configuration-factory.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import createApplicationConfigurationFromObject from '../models/jdl-application-configuration-factory.js'; import { applicationOptions } from '../jhipster/index.js'; diff --git a/jdl/models/jdl-application-configuration.spec.ts b/jdl/models/jdl-application-configuration.spec.ts index b548e96aa0dc..692aebe8abf3 100644 --- a/jdl/models/jdl-application-configuration.spec.ts +++ b/jdl/models/jdl-application-configuration.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import JDLApplicationConfiguration from '../models/jdl-application-configuration.js'; import StringJDLApplicationConfigurationOption from '../models/string-jdl-application-configuration-option.js'; diff --git a/jdl/models/jdl-application-definition.spec.ts b/jdl/models/jdl-application-definition.spec.ts index fde297440ef3..c2926a7f36d4 100644 --- a/jdl/models/jdl-application-definition.spec.ts +++ b/jdl/models/jdl-application-definition.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import { applicationOptions } from '../jhipster/index.js'; import JDLApplicationDefinition from './jdl-application-definition.js'; diff --git a/jdl/models/jdl-application-entities.spec.ts b/jdl/models/jdl-application-entities.spec.ts index 3bb6ce1797c5..905a6d3d0838 100644 --- a/jdl/models/jdl-application-entities.spec.ts +++ b/jdl/models/jdl-application-entities.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import JDLApplicationEntities from '../models/jdl-application-entities.js'; diff --git a/jdl/models/jdl-application-factory.spec.ts b/jdl/models/jdl-application-factory.spec.ts index 1bf4d470b4f8..05356ac4b0c5 100644 --- a/jdl/models/jdl-application-factory.spec.ts +++ b/jdl/models/jdl-application-factory.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import createJDLApplication from '../models/jdl-application-factory.js'; import { applicationTypes } from '../jhipster/index.js'; diff --git a/jdl/models/jdl-application.spec.ts b/jdl/models/jdl-application.spec.ts index 5bfcda786592..0d58400fd8a3 100644 --- a/jdl/models/jdl-application.spec.ts +++ b/jdl/models/jdl-application.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect as jestExpect } from 'esmocha'; +import { before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { applicationOptions, binaryOptions } from '../jhipster/index.js'; import StringJDLApplicationConfigurationOption from '../models/string-jdl-application-configuration-option.js'; diff --git a/jdl/models/jdl-binary-option.spec.ts b/jdl/models/jdl-binary-option.spec.ts index 15258a02e1ed..017e0535639b 100644 --- a/jdl/models/jdl-binary-option.spec.ts +++ b/jdl/models/jdl-binary-option.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import JDLBinaryOption from '../models/jdl-binary-option.js'; import { binaryOptions } from '../jhipster/index.js'; diff --git a/jdl/models/jdl-deployment.spec.ts b/jdl/models/jdl-deployment.spec.ts index 70c8620c0a08..6401719809e4 100644 --- a/jdl/models/jdl-deployment.spec.ts +++ b/jdl/models/jdl-deployment.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import JDLDeployment from '../models/jdl-deployment.js'; describe('jdl - JDLDeployment', () => { diff --git a/jdl/models/jdl-deployment.ts b/jdl/models/jdl-deployment.ts index ed6502aa244f..f8e112ccfb23 100644 --- a/jdl/models/jdl-deployment.ts +++ b/jdl/models/jdl-deployment.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { isEqual } from 'lodash-es'; -import { deploymentOptions, applicationOptions, serviceDiscoveryTypes } from '../jhipster/index.js'; +import { applicationOptions, deploymentOptions, serviceDiscoveryTypes } from '../jhipster/index.js'; import { merge } from '../utils/object-utils.js'; import { join } from '../utils/set-utils.js'; import { ParsedJDLDeployment } from '../converters/parsed-jdl-to-jdl-object/types.js'; diff --git a/jdl/models/jdl-entity.spec.ts b/jdl/models/jdl-entity.spec.ts index f9c4db5cf69b..8c6341c6aad7 100644 --- a/jdl/models/jdl-entity.spec.ts +++ b/jdl/models/jdl-entity.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { JDLEntity } from '../models/index.js'; import JDLField from '../models/jdl-field.js'; diff --git a/jdl/models/jdl-enum-value.spec.ts b/jdl/models/jdl-enum-value.spec.ts index 1f849980dbf6..9c0b4671b6e8 100644 --- a/jdl/models/jdl-enum-value.spec.ts +++ b/jdl/models/jdl-enum-value.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import JDLEnumValue from '../models/jdl-enum-value.js'; diff --git a/jdl/models/jdl-enum.spec.ts b/jdl/models/jdl-enum.spec.ts index bca9a09989da..1d9af730af71 100644 --- a/jdl/models/jdl-enum.spec.ts +++ b/jdl/models/jdl-enum.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect as jestExpect } from 'esmocha'; +import { before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { JDLEnum } from '../models/index.js'; diff --git a/jdl/models/jdl-enums.spec.ts b/jdl/models/jdl-enums.spec.ts index 5f68c3ab89c4..7d416b45a355 100644 --- a/jdl/models/jdl-enums.spec.ts +++ b/jdl/models/jdl-enums.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, after, expect as jestExpect } from 'esmocha'; +import { after, before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import JDLEnums from '../models/jdl-enums.js'; import { JDLEnum } from '../models/index.js'; diff --git a/jdl/models/jdl-field.spec.ts b/jdl/models/jdl-field.spec.ts index fd41b0bf8404..364badaa6edf 100644 --- a/jdl/models/jdl-field.spec.ts +++ b/jdl/models/jdl-field.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import matchField from '../matchers/field-matcher.js'; diff --git a/jdl/models/jdl-object-merger.spec.ts b/jdl/models/jdl-object-merger.spec.ts index 2397b5f63a34..82e77ac5618c 100644 --- a/jdl/models/jdl-object-merger.spec.ts +++ b/jdl/models/jdl-object-merger.spec.ts @@ -17,9 +17,9 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import { applicationTypes, fieldTypes, unaryOptions, relationshipTypes } from '../jhipster/index.js'; +import { applicationTypes, fieldTypes, relationshipTypes, unaryOptions } from '../jhipster/index.js'; import JDLObject from '../models/jdl-object.js'; import createJDLApplication from '../models/jdl-application-factory.js'; import { JDLEntity, JDLEnum } from '../models/index.js'; diff --git a/jdl/models/jdl-object.spec.ts b/jdl/models/jdl-object.spec.ts index 580dcbe2f0fa..f0d3f9dbf0f4 100644 --- a/jdl/models/jdl-object.spec.ts +++ b/jdl/models/jdl-object.spec.ts @@ -17,9 +17,9 @@ * limitations under the License. */ -import { before, it, describe, expect as jestExpect, afterEach } from 'esmocha'; +import { afterEach, before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; -import { applicationTypes, binaryOptions, unaryOptions, relationshipTypes } from '../jhipster/index.js'; +import { applicationTypes, binaryOptions, relationshipTypes, unaryOptions } from '../jhipster/index.js'; import JDLObject from '../models/jdl-object.js'; import createJDLApplication from '../models/jdl-application-factory.js'; diff --git a/jdl/models/jdl-options.spec.ts b/jdl/models/jdl-options.spec.ts index 28aca2f61b50..9bf2e7a729b1 100644 --- a/jdl/models/jdl-options.spec.ts +++ b/jdl/models/jdl-options.spec.ts @@ -17,9 +17,9 @@ * limitations under the License. */ -import { before, it, describe, expect as jestExpect, afterEach } from 'esmocha'; +import { afterEach, before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; -import { unaryOptions, binaryOptions } from '../jhipster/index.js'; +import { binaryOptions, unaryOptions } from '../jhipster/index.js'; import JDLOptions from '../models/jdl-options.js'; import JDLUnaryOption from '../models/jdl-unary-option.js'; import JDLBinaryOption from '../models/jdl-binary-option.js'; diff --git a/jdl/models/jdl-relationship.spec.ts b/jdl/models/jdl-relationship.spec.ts index 44c5c019cfdb..4b9d61604486 100644 --- a/jdl/models/jdl-relationship.spec.ts +++ b/jdl/models/jdl-relationship.spec.ts @@ -17,11 +17,11 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import JDLRelationship from '../models/jdl-relationship.js'; -import { relationshipTypes, relationshipOptions } from '../jhipster/index.js'; +import { relationshipOptions, relationshipTypes } from '../jhipster/index.js'; const { BUILT_IN_ENTITY } = relationshipOptions; diff --git a/jdl/models/jdl-relationship.ts b/jdl/models/jdl-relationship.ts index 5b830499d177..3975543b59da 100644 --- a/jdl/models/jdl-relationship.ts +++ b/jdl/models/jdl-relationship.ts @@ -17,7 +17,7 @@ * limitations under the License. */ import { upperFirst } from 'lodash-es'; -import { RelationshipSide, JDLRelationshipType } from '../basic-types/relationships.js'; +import { JDLRelationshipType, RelationshipSide } from '../basic-types/relationships.js'; import { Validations } from '../jhipster/index.js'; import { relationshipTypeExists } from '../jhipster/relationship-types.js'; diff --git a/jdl/models/jdl-relationships.spec.ts b/jdl/models/jdl-relationships.spec.ts index 3671c3d59bdd..6c441ac4f5bb 100644 --- a/jdl/models/jdl-relationships.spec.ts +++ b/jdl/models/jdl-relationships.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect as jestExpect } from 'esmocha'; +import { before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import JDLRelationship from '../models/jdl-relationship.js'; diff --git a/jdl/models/jdl-unary-option.spec.ts b/jdl/models/jdl-unary-option.spec.ts index 965fec355645..7812c47efcb8 100644 --- a/jdl/models/jdl-unary-option.spec.ts +++ b/jdl/models/jdl-unary-option.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import JDLUnaryOption from '../models/jdl-unary-option.js'; diff --git a/jdl/models/jdl-validation.spec.ts b/jdl/models/jdl-validation.spec.ts index f6618bb4c7d6..65004e04a572 100644 --- a/jdl/models/jdl-validation.spec.ts +++ b/jdl/models/jdl-validation.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import JDLValidation from '../models/jdl-validation.js'; import { validations } from '../jhipster/index.js'; diff --git a/jdl/parsing/dsl-api.spec.ts b/jdl/parsing/dsl-api.spec.ts index 9cd57c97d8cf..c2f9e4a1a86e 100644 --- a/jdl/parsing/dsl-api.spec.ts +++ b/jdl/parsing/dsl-api.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { tokens } from './lexer/lexer.js'; diff --git a/jdl/parsing/exports.ts b/jdl/parsing/exports.ts index ecf81bc54b1f..89b0c32c8552 100644 --- a/jdl/parsing/exports.ts +++ b/jdl/parsing/exports.ts @@ -21,8 +21,8 @@ * This file defines the exported JDL DSL related APIs * This file will be used as webpack entry point to produce a UMD bundle. */ -import { tokens, JDLLexer } from './lexer/lexer.js'; -import { parse, getSyntacticAutoCompleteSuggestions } from './api.js'; +import { JDLLexer, tokens } from './lexer/lexer.js'; +import { getSyntacticAutoCompleteSuggestions, parse } from './api.js'; import JDLParser from './jdl-parser.js'; export { tokens, JDLLexer, JDLParser, parse, getSyntacticAutoCompleteSuggestions }; diff --git a/jdl/parsing/grammar.spec.ts b/jdl/parsing/grammar.spec.ts index 9f781d2e0947..cce22d578300 100644 --- a/jdl/parsing/grammar.spec.ts +++ b/jdl/parsing/grammar.spec.ts @@ -17,10 +17,10 @@ * limitations under the License. */ -import { before, it, describe, expect as jestExpect } from 'esmocha'; +import { before, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { parseFromContent } from '../readers/jdl-reader.js'; -import { relationshipTypes, validations, unaryOptions, binaryOptions } from '../jhipster/index.js'; +import { binaryOptions, relationshipTypes, unaryOptions, validations } from '../jhipster/index.js'; const { ONE_TO_MANY, MANY_TO_ONE, MANY_TO_MANY, ONE_TO_ONE } = relationshipTypes; const { diff --git a/jdl/parsing/jdl-ast-builder-visitor.ts b/jdl/parsing/jdl-ast-builder-visitor.ts index eef11b8dedfa..770b1923fa10 100644 --- a/jdl/parsing/jdl-ast-builder-visitor.ts +++ b/jdl/parsing/jdl-ast-builder-visitor.ts @@ -18,7 +18,7 @@ */ import deduplicate from '../utils/array-utils.js'; -import { applicationOptions, entityOptions, validations, relationshipOptions } from '../jhipster/index.js'; +import { applicationOptions, entityOptions, relationshipOptions, validations } from '../jhipster/index.js'; import JDLParser from './jdl-parser.js'; const { BUILT_IN_ENTITY } = relationshipOptions; diff --git a/jdl/parsing/lexer/application-tokens.ts b/jdl/parsing/lexer/application-tokens.ts index 8c9e48e19eee..b41708d51250 100644 --- a/jdl/parsing/lexer/application-tokens.ts +++ b/jdl/parsing/lexer/application-tokens.ts @@ -21,7 +21,7 @@ import { ITokenConfig, Lexer } from 'chevrotain'; import { applicationOptions } from '../../jhipster/index.js'; import jhipsterDefinition from '../../../generators/app/jdl/index.js'; import createTokenFromConfig from './token-creator.js'; -import { UNARY_OPTION, KEYWORD } from './shared-tokens.js'; +import { KEYWORD, UNARY_OPTION } from './shared-tokens.js'; const { OptionNames } = applicationOptions; diff --git a/jdl/parsing/lexer/lexer.spec.ts b/jdl/parsing/lexer/lexer.spec.ts index 3a858d04fc26..fafd77efcea2 100644 --- a/jdl/parsing/lexer/lexer.spec.ts +++ b/jdl/parsing/lexer/lexer.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { JDLLexer } from './lexer.js'; diff --git a/jdl/parsing/lexer/lexer.ts b/jdl/parsing/lexer/lexer.ts index eb5851d944eb..50bd4f995381 100644 --- a/jdl/parsing/lexer/lexer.ts +++ b/jdl/parsing/lexer/lexer.ts @@ -20,7 +20,7 @@ import { Lexer, TokenType } from 'chevrotain'; import { relationshipOptions } from '../../jhipster/index.js'; -import { NAME, UNARY_OPTION, BINARY_OPTION } from './shared-tokens.js'; +import { BINARY_OPTION, NAME, UNARY_OPTION } from './shared-tokens.js'; import ValidationTokens from './validation-tokens.js'; import ApplicationTokens from './application-tokens.js'; diff --git a/jdl/parsing/lexer/option-tokens.ts b/jdl/parsing/lexer/option-tokens.ts index 9a81a5751930..6e4dfa159e97 100644 --- a/jdl/parsing/lexer/option-tokens.ts +++ b/jdl/parsing/lexer/option-tokens.ts @@ -18,7 +18,7 @@ */ import createTokenFromConfig from './token-creator.js'; -import { KEYWORD, UNARY_OPTION, BINARY_OPTION } from './shared-tokens.js'; +import { BINARY_OPTION, KEYWORD, UNARY_OPTION } from './shared-tokens.js'; const tokens = [ { name: 'WITH', pattern: 'with' }, diff --git a/jdl/parsing/lexer/token-creator.spec.ts b/jdl/parsing/lexer/token-creator.spec.ts index f431463b9347..39f1ec63edeb 100644 --- a/jdl/parsing/lexer/token-creator.spec.ts +++ b/jdl/parsing/lexer/token-creator.spec.ts @@ -17,9 +17,9 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import { NAME, KEYWORD } from '../../parsing/lexer/shared-tokens.js'; +import { KEYWORD, NAME } from '../../parsing/lexer/shared-tokens.js'; import createTokenFromConfig from '../../parsing/lexer/token-creator.js'; describe('jdl - TokenCreator', () => { diff --git a/jdl/parsing/lexer/token-creator.ts b/jdl/parsing/lexer/token-creator.ts index 44911f8dfb14..e4391d2ec11e 100644 --- a/jdl/parsing/lexer/token-creator.ts +++ b/jdl/parsing/lexer/token-creator.ts @@ -18,9 +18,9 @@ */ import { isString } from 'lodash-es'; -import { createToken, ITokenConfig } from 'chevrotain'; +import { ITokenConfig, createToken } from 'chevrotain'; -import { NAME, KEYWORD, namePattern } from './shared-tokens.js'; +import { KEYWORD, NAME, namePattern } from './shared-tokens.js'; export default function createTokenFromConfig(config: ITokenConfig) { if (!config) { diff --git a/jdl/parsing/validator.spec.ts b/jdl/parsing/validator.spec.ts index 104bf1eee843..66b390eee8dd 100644 --- a/jdl/parsing/validator.spec.ts +++ b/jdl/parsing/validator.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import { parse } from './api.js'; diff --git a/jdl/readers/file-reader.spec.ts b/jdl/readers/file-reader.spec.ts index e1db1da82e5f..b2452809c131 100644 --- a/jdl/readers/file-reader.spec.ts +++ b/jdl/readers/file-reader.spec.ts @@ -18,7 +18,7 @@ */ import fs from 'fs'; -import { it, describe, expect as jestExpect, beforeEach } from 'esmocha'; +import { beforeEach, describe, it, expect as jestExpect } from 'esmocha'; import { expect } from 'chai'; import { readFile, readFiles } from '../readers/file-reader.js'; import { basicHelpers as helpers } from '../../testing/index.js'; diff --git a/jdl/readers/jdl-reader.spec.ts b/jdl/readers/jdl-reader.spec.ts index b4efdb5e14c6..6f2dfa53a4b3 100644 --- a/jdl/readers/jdl-reader.spec.ts +++ b/jdl/readers/jdl-reader.spec.ts @@ -21,7 +21,7 @@ import fs from 'fs'; import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; -import { it, describe, after, beforeEach } from 'esmocha'; +import { after, beforeEach, describe, it } from 'esmocha'; import { expect } from 'chai'; import * as JDLReader from '../readers/jdl-reader.js'; import { basicHelpers as helpers } from '../../testing/index.js'; diff --git a/jdl/readers/json-file-reader.spec.ts b/jdl/readers/json-file-reader.spec.ts index b8299cb02263..31d15b2a1cf7 100644 --- a/jdl/readers/json-file-reader.spec.ts +++ b/jdl/readers/json-file-reader.spec.ts @@ -18,7 +18,7 @@ */ import path from 'path'; -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import * as JSONFileReader from '../readers/json-file-reader.js'; diff --git a/jdl/readers/json-reader.spec.ts b/jdl/readers/json-reader.spec.ts index 9f4a6c00625a..633f28ac81b9 100644 --- a/jdl/readers/json-reader.spec.ts +++ b/jdl/readers/json-reader.spec.ts @@ -18,9 +18,9 @@ */ import { renameSync } from 'fs'; -import { join, dirname } from 'path'; +import { dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, after } from 'esmocha'; +import { after, before, describe, it } from 'esmocha'; import { expect } from 'chai'; import parseFromDir from '../readers/json-reader.js'; diff --git a/jdl/utils/array-utils.spec.ts b/jdl/utils/array-utils.spec.ts index 046a1d0d337b..630435ab5799 100644 --- a/jdl/utils/array-utils.spec.ts +++ b/jdl/utils/array-utils.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import deduplicate from '../utils/array-utils.js'; diff --git a/jdl/utils/files-utils.spec.ts b/jdl/utils/files-utils.spec.ts index 13665cd6565a..daded5d5079e 100644 --- a/jdl/utils/files-utils.spec.ts +++ b/jdl/utils/files-utils.spec.ts @@ -20,9 +20,9 @@ import fs from 'fs'; import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe, after } from 'esmocha'; +import { after, before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import { createFolderIfItDoesNotExist, doesFileExist, doesDirectoryExist } from '../utils/file-utils.js'; +import { createFolderIfItDoesNotExist, doesDirectoryExist, doesFileExist } from '../utils/file-utils.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/jdl/utils/format-utils.spec.ts b/jdl/utils/format-utils.spec.ts index 46ad90b3ef22..f413edea9935 100644 --- a/jdl/utils/format-utils.spec.ts +++ b/jdl/utils/format-utils.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; import { formatComment } from '../utils/format-utils.js'; diff --git a/jdl/utils/object-utils.spec.ts b/jdl/utils/object-utils.spec.ts index 5799c87049ad..a9b1e6dbdd0f 100644 --- a/jdl/utils/object-utils.spec.ts +++ b/jdl/utils/object-utils.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, after } from 'esmocha'; +import { after, before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { areEntitiesEqual, merge } from '../utils/object-utils.js'; diff --git a/jdl/utils/objects/logger.ts b/jdl/utils/objects/logger.ts index 2945ec19e7e2..ffead6fba929 100644 --- a/jdl/utils/objects/logger.ts +++ b/jdl/utils/objects/logger.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { transports, format, createLogger } from 'winston'; +import { createLogger, format, transports } from 'winston'; const { Console } = transports; const { printf, combine } = format; diff --git a/jdl/utils/set-utils.spec.ts b/jdl/utils/set-utils.spec.ts index 8acaf6825e64..60ef60cdbdd7 100644 --- a/jdl/utils/set-utils.spec.ts +++ b/jdl/utils/set-utils.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import { addAll, join } from '../utils/set-utils.js'; describe('jdl - SetUtils', () => { diff --git a/jdl/utils/string_utils.spec.ts b/jdl/utils/string_utils.spec.ts index 432593e81a6f..e786ad925460 100644 --- a/jdl/utils/string_utils.spec.ts +++ b/jdl/utils/string_utils.spec.ts @@ -19,10 +19,10 @@ /* define global expect */ -import { it, describe } from 'esmocha'; +import { describe, it } from 'esmocha'; import { expect } from 'chai'; -import { lowerFirst, camelCase, upperFirst } from '../utils/string-utils.js'; +import { camelCase, lowerFirst, upperFirst } from '../utils/string-utils.js'; describe('jdl - StringUtils', () => { describe('camelCase', () => { diff --git a/jdl/validators/binary-option-validator.spec.ts b/jdl/validators/binary-option-validator.spec.ts index b97f0518ab8a..f3dbd18c9c20 100644 --- a/jdl/validators/binary-option-validator.spec.ts +++ b/jdl/validators/binary-option-validator.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import JDLBinaryOption from '../models/jdl-binary-option.js'; import BinaryOptionValidator from '../validators/binary-option-validator.js'; diff --git a/jdl/validators/deployment-validator.spec.ts b/jdl/validators/deployment-validator.spec.ts index c579ddcbe2dc..058216811a2c 100644 --- a/jdl/validators/deployment-validator.spec.ts +++ b/jdl/validators/deployment-validator.spec.ts @@ -17,9 +17,9 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; -import { deploymentOptions, applicationTypes, databaseTypes, searchEngineTypes } from '../jhipster/index.js'; +import { applicationTypes, databaseTypes, deploymentOptions, searchEngineTypes } from '../jhipster/index.js'; import DeploymentValidator from '../validators/deployment-validator.js'; diff --git a/jdl/validators/deployment-validator.ts b/jdl/validators/deployment-validator.ts index e760ff38c2a3..4757a3aee4d2 100644 --- a/jdl/validators/deployment-validator.ts +++ b/jdl/validators/deployment-validator.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { applicationTypes, databaseTypes, searchEngineTypes, deploymentOptions, applicationOptions } from '../jhipster/index.js'; +import { applicationOptions, applicationTypes, databaseTypes, deploymentOptions, searchEngineTypes } from '../jhipster/index.js'; import JDLDeployment from '../models/jdl-deployment.js'; import Validator from './validator.js'; diff --git a/jdl/validators/entity-validator.spec.ts b/jdl/validators/entity-validator.spec.ts index bd500fc8e3ec..92d1f44217f1 100644 --- a/jdl/validators/entity-validator.spec.ts +++ b/jdl/validators/entity-validator.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { JDLEntity } from '../models/index.js'; import EntityValidator from '../validators/entity-validator.js'; diff --git a/jdl/validators/enum-validator.spec.ts b/jdl/validators/enum-validator.spec.ts index 788c944adf9c..b3ae6cb6ee11 100644 --- a/jdl/validators/enum-validator.spec.ts +++ b/jdl/validators/enum-validator.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { JDLEnum } from '../models/index.js'; import EnumValidator from '../validators/enum-validator.js'; diff --git a/jdl/validators/field-validator.spec.ts b/jdl/validators/field-validator.spec.ts index e23f791e295b..8d73e409b33f 100644 --- a/jdl/validators/field-validator.spec.ts +++ b/jdl/validators/field-validator.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import JDLField from '../models/jdl-field.js'; import FieldValidator from '../validators/field-validator.js'; diff --git a/jdl/validators/jdl-with-application-validator.spec.ts b/jdl/validators/jdl-with-application-validator.spec.ts index 7f5114bec4c5..f835e2331695 100644 --- a/jdl/validators/jdl-with-application-validator.spec.ts +++ b/jdl/validators/jdl-with-application-validator.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import { applicationTypes, binaryOptions, databaseTypes, fieldTypes, relationshipTypes, validations } from '../jhipster/index.js'; diff --git a/jdl/validators/jdl-with-application-validator.ts b/jdl/validators/jdl-with-application-validator.ts index 1be02a45e11e..09d614fbb757 100644 --- a/jdl/validators/jdl-with-application-validator.ts +++ b/jdl/validators/jdl-with-application-validator.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { fieldTypes, applicationOptions, relationshipOptions } from '../jhipster/index.js'; +import { applicationOptions, fieldTypes, relationshipOptions } from '../jhipster/index.js'; import JDLObject from '../models/jdl-object.js'; import JDLRelationship from '../models/jdl-relationship.js'; import JDLApplication from '../models/jdl-application.js'; diff --git a/jdl/validators/jdl-without-application-validator.spec.ts b/jdl/validators/jdl-without-application-validator.spec.ts index 6b35d5c06b67..34175440e002 100644 --- a/jdl/validators/jdl-without-application-validator.spec.ts +++ b/jdl/validators/jdl-without-application-validator.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import JDLObject from '../models/jdl-object.js'; import { JDLEntity } from '../models/index.js'; @@ -25,7 +25,7 @@ import JDLField from '../models/jdl-field.js'; import JDLValidation from '../models/jdl-validation.js'; import JDLRelationship from '../models/jdl-relationship.js'; import JDLBinaryOption from '../models/jdl-binary-option.js'; -import { applicationTypes, databaseTypes, fieldTypes, validations, relationshipTypes, binaryOptions } from '../jhipster/index.js'; +import { applicationTypes, binaryOptions, databaseTypes, fieldTypes, relationshipTypes, validations } from '../jhipster/index.js'; import createValidator from '../validators/jdl-without-application-validator.js'; const { GATEWAY } = applicationTypes; diff --git a/jdl/validators/jdl-without-application-validator.ts b/jdl/validators/jdl-without-application-validator.ts index 6de9a55cf401..743d2dddf599 100644 --- a/jdl/validators/jdl-without-application-validator.ts +++ b/jdl/validators/jdl-without-application-validator.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { fieldTypes, applicationTypes, databaseTypes, binaryOptions, relationshipOptions } from '../jhipster/index.js'; +import { applicationTypes, binaryOptions, databaseTypes, fieldTypes, relationshipOptions } from '../jhipster/index.js'; import JDLObject from '../models/jdl-object.js'; import JDLRelationship from '../models/jdl-relationship.js'; import { isReservedFieldName, isReservedPaginationWords, isReservedTableName } from '../jhipster/reserved-keywords.js'; diff --git a/jdl/validators/relationship-validator.spec.ts b/jdl/validators/relationship-validator.spec.ts index fbaf6c8c936b..070b7fceead7 100644 --- a/jdl/validators/relationship-validator.spec.ts +++ b/jdl/validators/relationship-validator.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import JDLRelationship from '../models/jdl-relationship.js'; import RelationshipValidator from '../validators/relationship-validator.js'; diff --git a/jdl/validators/unary-option-validator.spec.ts b/jdl/validators/unary-option-validator.spec.ts index e191da1749b8..b37a5eb23c51 100644 --- a/jdl/validators/unary-option-validator.spec.ts +++ b/jdl/validators/unary-option-validator.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import JDLUnaryOption from '../models/jdl-unary-option.js'; import UnaryOptionValidator from '../validators/unary-option-validator.js'; diff --git a/jdl/validators/validation-validator.spec.ts b/jdl/validators/validation-validator.spec.ts index ae113e37753b..3ab1042f0408 100644 --- a/jdl/validators/validation-validator.spec.ts +++ b/jdl/validators/validation-validator.spec.ts @@ -17,7 +17,7 @@ * limitations under the License. */ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { expect } from 'chai'; import JDLValidation from '../models/jdl-validation.js'; import ValidationValidator from '../validators/validation-validator.js'; diff --git a/lib/eslint/base.js b/lib/eslint/base.js index cd7cd3daf063..07f83129e39c 100644 --- a/lib/eslint/base.js +++ b/lib/eslint/base.js @@ -17,6 +17,7 @@ const baseConfig = { 'sort-imports': ['error', { ignoreDeclarationSort: true }], // Configure unused-imports rule + 'no-unused-vars': 'off', 'import/no-duplicates': 'error', 'import/order': 'error', 'unused-imports/no-unused-imports': 'error', diff --git a/test-integration/scripts/99-write-matrix.js b/test-integration/scripts/99-write-matrix.js index d733b73617dc..d81237e80dc1 100755 --- a/test-integration/scripts/99-write-matrix.js +++ b/test-integration/scripts/99-write-matrix.js @@ -1,15 +1,15 @@ #!/usr/bin/env node import { createHash } from 'node:crypto'; -import { writeFileSync, readFileSync } from 'node:fs'; +import { readFileSync, writeFileSync } from 'node:fs'; import { join } from 'node:path'; import { - packageRoot, + BUILD_JHIPSTER_BOM, JAVA_VERSION, - NODE_VERSION, - NPM_VERSION, JHIPSTER_BOM_BRANCH, JHIPSTER_BOM_CICD_VERSION, - BUILD_JHIPSTER_BOM, + NODE_VERSION, + NPM_VERSION, + packageRoot, } from '../integration-test-constants.js'; const MATRIX_FILE = 'matrix.json'; diff --git a/test/api.spec.js b/test/api.spec.js index ad225dd6fa3a..8b0825df5389 100644 --- a/test/api.spec.js +++ b/test/api.spec.js @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { it, describe, expect } from 'esmocha'; +import { describe, expect, it } from 'esmocha'; describe('public api', () => { it('generator-jhipster/generators should match snapshot', async () => { diff --git a/test/integration-test.spec.ts b/test/integration-test.spec.ts index 1a26c85cd599..94584cd59fe5 100644 --- a/test/integration-test.spec.ts +++ b/test/integration-test.spec.ts @@ -20,7 +20,7 @@ import assert from 'assert'; import fs, { existsSync, writeFileSync } from 'fs'; import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import sortKeys from 'sort-keys'; import { applicationTypes, authenticationTypes } from '../jdl/jhipster/index.js'; diff --git a/test/needle-api/needle-base.spec.ts b/test/needle-api/needle-base.spec.ts index ba5181dd0233..d77ec239ca83 100644 --- a/test/needle-api/needle-base.spec.ts +++ b/test/needle-api/needle-base.spec.ts @@ -1,4 +1,4 @@ -import { before, it, describe, expect } from 'esmocha'; +import { before, describe, expect, it } from 'esmocha'; import NeedleApiBase from '../../generators/needle-base.js'; describe('needle-api - base', () => { diff --git a/test/needle-api/needle-client-angular-generator.spec.ts b/test/needle-api/needle-client-angular-generator.spec.ts index ff3e594949d2..b138cde11545 100644 --- a/test/needle-api/needle-client-angular-generator.spec.ts +++ b/test/needle-api/needle-client-angular-generator.spec.ts @@ -1,4 +1,4 @@ -import { before, it, describe } from 'esmocha'; +import { before, describe, it } from 'esmocha'; import { defaultHelpers as helpers, runResult } from '../../testing/index.js'; import AngularGenerator from '../../generators/angular/index.js'; diff --git a/test/needle-api/needle-client-angular.spec.ts b/test/needle-api/needle-client-angular.spec.ts index 92b925fa6cc6..3201fedf8c8b 100644 --- a/test/needle-api/needle-client-angular.spec.ts +++ b/test/needle-api/needle-client-angular.spec.ts @@ -1,5 +1,5 @@ -import { before, it, describe } from 'esmocha'; -import { basicHelpers as helpers, result as runResult, getGenerator } from '../../testing/index.js'; +import { before, describe, it } from 'esmocha'; +import { getGenerator, basicHelpers as helpers, result as runResult } from '../../testing/index.js'; import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; diff --git a/test/needle-api/needle-client-react.spec.ts b/test/needle-api/needle-client-react.spec.ts index a6e4587de3e4..0f16516a45fc 100644 --- a/test/needle-api/needle-client-react.spec.ts +++ b/test/needle-api/needle-client-react.spec.ts @@ -1,5 +1,5 @@ -import { before, it, describe } from 'esmocha'; -import { basicHelpers as helpers, result as runResult, getGenerator } from '../../testing/index.js'; +import { before, describe, it } from 'esmocha'; +import { getGenerator, basicHelpers as helpers, result as runResult } from '../../testing/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; import BaseApplicationGenerator from '../../generators/base-application/index.js'; diff --git a/test/needle-api/needle-client-vue-generator.spec.ts b/test/needle-api/needle-client-vue-generator.spec.ts index 921da24ee1a9..f54e517c4b68 100644 --- a/test/needle-api/needle-client-vue-generator.spec.ts +++ b/test/needle-api/needle-client-vue-generator.spec.ts @@ -1,5 +1,5 @@ -import { before, it, describe } from 'esmocha'; -import { basicHelpers as helpers, result as runResult, getGenerator } from '../../testing/index.js'; +import { before, describe, it } from 'esmocha'; +import { getGenerator, basicHelpers as helpers, result as runResult } from '../../testing/index.js'; import { CLIENT_MAIN_SRC_DIR } from '../../generators/generator-constants.js'; import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; diff --git a/test/needle-api/needle-client-vue.spec.ts b/test/needle-api/needle-client-vue.spec.ts index 7cc11ad5228a..8b34fa487f2b 100644 --- a/test/needle-api/needle-client-vue.spec.ts +++ b/test/needle-api/needle-client-vue.spec.ts @@ -1,5 +1,5 @@ import { before, describe } from 'esmocha'; -import { basicHelpers as helpers, getGenerator } from '../../testing/index.js'; +import { getGenerator, basicHelpers as helpers } from '../../testing/index.js'; import ClientGenerator from '../../generators/client/index.js'; import { clientFrameworkTypes } from '../../jdl/jhipster/index.js'; diff --git a/test/support/check-enforcements.ts b/test/support/check-enforcements.ts index 13e14a58dc42..d38435506a41 100644 --- a/test/support/check-enforcements.ts +++ b/test/support/check-enforcements.ts @@ -19,7 +19,7 @@ import assert from 'assert'; import { opendirSync, readFileSync, writeFileSync } from 'fs'; import path, { basename } from 'path'; -import { describe, it, before } from 'mocha'; +import { before, describe, it } from 'mocha'; import { getGeneratorFolder } from '../../testing/get-generator.js'; const fixEnforcements = process.argv.includes('--fix-enforcements'); diff --git a/test/support/tests.js b/test/support/tests.js index 3ff28ba810f7..1856ae4bbc79 100644 --- a/test/support/tests.js +++ b/test/support/tests.js @@ -1,10 +1,10 @@ import { existsSync } from 'fs'; import sinon from 'sinon'; -import { before, it, describe, after, expect } from 'esmocha'; +import { after, before, describe, expect, it } from 'esmocha'; import { buildJHipster } from '../../cli/index.mjs'; import { GENERATOR_JHIPSTER } from '../../generators/generator-constants.js'; import { getGenerator, skipPrettierHelpers as helpers } from '../../testing/index.js'; -import { PRIORITY_NAMES, ENTITY_PRIORITY_NAMES, PRIORITY_NAMES_LIST } from '../../generators/base-application/priorities.js'; +import { ENTITY_PRIORITY_NAMES, PRIORITY_NAMES, PRIORITY_NAMES_LIST } from '../../generators/base-application/priorities.js'; import { WORKSPACES_PRIORITY_NAMES } from '../../generators/base-workspaces/priorities.js'; const workspacesPriorityList = Object.values(WORKSPACES_PRIORITY_NAMES); diff --git a/testing/helpers.ts b/testing/helpers.ts index a462ce8f25fe..64d9cf1acf18 100644 --- a/testing/helpers.ts +++ b/testing/helpers.ts @@ -1,7 +1,7 @@ import { basename, dirname, join } from 'path'; import { fileURLToPath } from 'url'; import { merge, set, snakeCase } from 'lodash-es'; -import { YeomanTest, RunContext, RunContextSettings, RunResult, result } from 'yeoman-test'; +import { RunContext, RunContextSettings, RunResult, YeomanTest, result } from 'yeoman-test'; import { globSync } from 'glob'; import type { BaseEnvironmentOptions, GetGeneratorConstructor, BaseGenerator as YeomanGenerator } from '@yeoman/types'; diff --git a/testing/support/client-samples.ts b/testing/support/client-samples.ts index 270a124a15ac..e750b3f4e805 100644 --- a/testing/support/client-samples.ts +++ b/testing/support/client-samples.ts @@ -1,4 +1,4 @@ -import { MatrixMonolith, MatrixMicroserviceGateway } from './application-samples.js'; +import { MatrixMicroserviceGateway, MatrixMonolith } from './application-samples.js'; import { buildSamplesFromMatrix, extendFilteredMatrix, extendMatrix, fromMatrix } from './matrix-utils.js'; const CLIENT_ADDITIONAL_CONFIG_MATRIX = { diff --git a/testing/support/server-samples.ts b/testing/support/server-samples.ts index 6b68c4a214a9..57824ed648f2 100644 --- a/testing/support/server-samples.ts +++ b/testing/support/server-samples.ts @@ -1,5 +1,5 @@ -import { MatrixMonolith, MatrixMicroservice, MatrixGateway } from './application-samples.js'; -import { fromMatrix, extendMatrix, extendFilteredMatrix, buildSamplesFromMatrix } from './matrix-utils.js'; +import { MatrixGateway, MatrixMicroservice, MatrixMonolith } from './application-samples.js'; +import { buildSamplesFromMatrix, extendFilteredMatrix, extendMatrix, fromMatrix } from './matrix-utils.js'; export const buildServerMatrix = (matrix: Record = {}) => { let serverMatrix = { From 5d5b8e7c232319ffa178d1d6e29b84798360f445 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 9 Aug 2024 09:00:44 -0300 Subject: [PATCH 195/938] add more eslint rules to base --- lib/eslint/base.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/eslint/base.js b/lib/eslint/base.js index 07f83129e39c..900872cbbabe 100644 --- a/lib/eslint/base.js +++ b/lib/eslint/base.js @@ -14,6 +14,20 @@ const baseConfig = { import: fixupPluginRules(imports), }, rules: { + curly: 'error', + 'dot-notation': 'error', + eqeqeq: ['error', 'always', { null: 'ignore' }], + 'no-else-return': 'error', + 'no-regex-spaces': 'error', + 'no-useless-computed-key': 'error', + 'no-useless-return': 'error', + 'no-var': 'error', + 'object-shorthand': 'error', + 'prefer-const': 'error', + 'prefer-destructuring': ['error', { array: false }], + 'prefer-object-has-own': 'error', + 'prefer-object-spread': 'error', + 'prefer-template': 'error', 'sort-imports': ['error', { ignoreDeclarationSort: true }], // Configure unused-imports rule From a663a6fd0aab37a52fb564bb06d45c5297988c2d Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 9 Aug 2024 09:09:10 -0300 Subject: [PATCH 196/938] drop deprecated rules --- eslint.config.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index 71bd1f5c936a..1dc72ff21ecb 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -78,9 +78,6 @@ export default ts.config( }, { rules: { - 'eol-last': 'error', - quotes: ['error', 'single', { avoidEscape: true }], - semi: ['error', 'always'], eqeqeq: ['error', 'smart'], 'no-use-before-define': ['error', 'nofunc'], 'no-multi-str': 'error', @@ -88,7 +85,6 @@ export default ts.config( 'no-console': 'error', 'no-template-curly-in-string': 'error', 'no-nested-ternary': 'error', - 'lines-between-class-members': ['error', 'always', { exceptAfterSingleLine: true }], 'no-restricted-syntax': [ 'error', { From b1d3b9ef7fe8526acaddbff7fdac881d630d1409 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 15 Jul 2024 20:37:01 -0300 Subject: [PATCH 197/938] apply prettier --- .../admin/gateway/gateway-route.model.ts.ejs | 2 +- .../admin/gateway/gateway.component.html.ejs | 84 ++++++++++--------- .../admin/gateway/gateway.component.ts.ejs | 2 +- .../shared/language/translation.module.ts.ejs | 4 +- .../templates/webpack/webpack.custom.js.ejs | 6 +- .../webapp/app/shared/jhipster/headers.ts.ejs | 2 +- .../shared/jhipster/problem-details.ts.ejs | 2 +- .../_package_/domain/AssertUtils.java.ejs | 4 +- .../service/UserService.java.ejs | 7 +- .../web/rest/AuthenticateController.java.ejs | 9 +- .../service/UserServiceIT.java.ejs | 6 +- .../config/CacheConfiguration.java.ejs | 5 +- 12 files changed, 69 insertions(+), 64 deletions(-) diff --git a/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway-route.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway-route.model.ts.ejs index 98f5d366a8b7..1925a7622aa9 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway-route.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway-route.model.ts.ejs @@ -20,6 +20,6 @@ export class GatewayRoute { constructor( public path: string, public serviceId: string, - public serviceInstances: any[] + public serviceInstances: any[], ) {} } diff --git a/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs b/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs index 4c917369824b..b18a1e17d36a 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs @@ -20,7 +20,7 @@

__jhiTranslateTag__('gateway.title') -

@@ -37,46 +37,50 @@ - @for (route of gatewayRoutes; track route.path) { - - {{ route.path }} - {{ route.serviceId }} - - @if (route.serviceInstances.length === 0) { -
__jhiTranslateTag__('gateway.routes.error')
- } - -
- @if (route) { - - @for (instance of route.serviceInstances; track instance.uri) { - - - - - + @for (route of gatewayRoutes; track route.path) { + + + +
{{ instance.uri }} - @if (instance.instanceInfo) { -
{{ instance.instanceInfo.status }}
- } @else { -
?
- } - 		- @for (entry of (instance.metadata | keyvalue ); track entry.key) { - - - {{ entry.key }} - {{ entry.value }} - - - } -
{{ route.path }}{{ route.serviceId }} + @if (route.serviceInstances.length === 0) { +
__jhiTranslateTag__('gateway.routes.error')
} -
- } -
- - - } + +
+ @if (route) { + + @for (instance of route.serviceInstances; track instance.uri) { + + + + + + } +
+ {{ instance.uri }} + + @if (instance.instanceInfo) { +
+ {{ instance.instanceInfo.status }} +
+ } @else { +
?
+ } + 		+ @for (entry of instance.metadata | keyvalue; track entry.key) { + + + {{ entry.key }} + {{ entry.value }} + + + } +
+ } +
+ + + } diff --git a/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs index 8f7f61f28801..b2e063511412 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs @@ -52,7 +52,7 @@ export default class GatewayComponent implements OnInit { ) { serviceInstance.instanceInfo = { status: 'UP' }; } else { - serviceInstance.instanceInfo = { status: 'DOWN'} ; + serviceInstance.instanceInfo = { status: 'DOWN' }; } } return serviceInstance as object; diff --git a/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs index 31f0f57cf558..1410fab0b88c 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs @@ -33,8 +33,8 @@ function lazyTranslatePartialLoader(http: HttpClient): TranslateLoader { TranslateModule.forChild({ loader: { provide: TranslateLoader, - useFactory: (lazyTranslatePartialLoader), - deps: [HttpClient] + useFactory: lazyTranslatePartialLoader, + deps: [HttpClient], }, isolate: false, extend: true, diff --git a/generators/angular/templates/webpack/webpack.custom.js.ejs b/generators/angular/templates/webpack/webpack.custom.js.ejs index 61ba77fc332c..748604bb131d 100644 --- a/generators/angular/templates/webpack/webpack.custom.js.ejs +++ b/generators/angular/templates/webpack/webpack.custom.js.ejs @@ -78,12 +78,12 @@ module.exports = async (config, options, targetOptions) => { changeOrigin: false, //pass the Host header to the backend unchanged https://github.com/Browsersync/browser-sync/issues/430 }, proxyReq: [ - function(proxyReq) { + function (proxyReq) { // URI that will be retrieved by the ForwardedHeaderFilter on the server side proxyReq.setHeader('X-Forwarded-Host', 'localhost:9000'); proxyReq.setHeader('X-Forwarded-Proto', 'https'); - } - ] + }, + ], }, socket: { clients: { diff --git a/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/headers.ts.ejs b/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/headers.ts.ejs index 046d6ce4d691..e79957332cf7 100644 --- a/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/headers.ts.ejs +++ b/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/headers.ts.ejs @@ -36,7 +36,7 @@ const headerToString = (headerValue: any): string => { throw new Error('Header value is not a string'); } return headerValue; -} +}; const decodeHeaderValue = (headerValue: string): string => decodeURIComponent(headerValue.replace(/\+/g, ' ')); diff --git a/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/problem-details.ts.ejs b/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/problem-details.ts.ejs index 89953b4c6d1a..6341e9a2cd75 100644 --- a/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/problem-details.ts.ejs +++ b/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/problem-details.ts.ejs @@ -31,7 +31,7 @@ export type ProblemDetails = { detail: string; /** A URI reference that identifies the specific occurrence of the problem */ instance: string; -} +}; export const ProblemWithMessageType = 'https://www.jhipster.tech/problem/problem-with-message'; diff --git a/generators/java/generators/domain/templates/src/test/java/_package_/domain/AssertUtils.java.ejs b/generators/java/generators/domain/templates/src/test/java/_package_/domain/AssertUtils.java.ejs index 118d39643810..1b19c8e611c1 100644 --- a/generators/java/generators/domain/templates/src/test/java/_package_/domain/AssertUtils.java.ejs +++ b/generators/java/generators/domain/templates/src/test/java/_package_/domain/AssertUtils.java.ejs @@ -25,8 +25,8 @@ import java.util.Comparator; public class AssertUtils { - public static Comparator zonedDataTimeSameInstant = Comparator.nullsFirst( - (e1, a2) -> e1.withZoneSameInstant(ZoneOffset.UTC).compareTo(a2.withZoneSameInstant(ZoneOffset.UTC)) + public static Comparator zonedDataTimeSameInstant = Comparator.nullsFirst((e1, a2) -> + e1.withZoneSameInstant(ZoneOffset.UTC).compareTo(a2.withZoneSameInstant(ZoneOffset.UTC)) ); public static Comparator bigDecimalCompareTo = Comparator.nullsFirst((e1, a2) -> e1.compareTo(a2)); diff --git a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs index e870079e423a..6d5649ac0521 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs @@ -917,14 +917,11 @@ public class UserService { } if (idpModifiedDate.isAfter(dbModifiedDate)) { LOG.debug("Updating user '{}' in local database", user.getLogin()); - return updateUser(user.getFirstName(), user.getLastName(), user.getEmail(), - user.getLangKey(), user.getImageUrl()); + return updateUser(user.getFirstName(), user.getLastName(), user.getEmail(), user.getLangKey(), user.getImageUrl()); } - // no last updated info, blindly update } else { LOG.debug("Updating user '{}' in local database", user.getLogin()); - return updateUser(user.getFirstName(), user.getLastName(), user.getEmail(), - user.getLangKey(), user.getImageUrl()); + return updateUser(user.getFirstName(), user.getLastName(), user.getEmail(), user.getLangKey(), user.getImageUrl()); } return Mono.empty(); }) diff --git a/generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs index 73d029eb53fd..1c72f38af009 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs @@ -82,11 +82,10 @@ public class AuthenticateController { @PostMapping("/authenticate") public Mono> authorize(@Valid @RequestBody Mono loginVM) { return loginVM - .flatMap( - login -> - authenticationManager - .authenticate(new UsernamePasswordAuthenticationToken(login.getUsername(), login.getPassword())) - .flatMap(auth -> Mono.fromCallable(() -> this.createToken(auth, login.isRememberMe()))) + .flatMap(login -> + authenticationManager + .authenticate(new UsernamePasswordAuthenticationToken(login.getUsername(), login.getPassword())) + .flatMap(auth -> Mono.fromCallable(() -> this.createToken(auth, login.isRememberMe()))) ) .map(jwt -> { HttpHeaders httpHeaders = new HttpHeaders(); diff --git a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs index 9f5188226d47..a991adf903cb 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs @@ -547,7 +547,11 @@ class UserServiceIT { private OAuth2AuthenticationToken createMockOAuth2AuthenticationToken(Map userDetails) { Collection authorities = Collections.singletonList(new SimpleGrantedAuthority(AuthoritiesConstants.ANONYMOUS)); - UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken("anonymous", "anonymous", authorities); + UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken( + "anonymous", + "anonymous", + authorities + ); usernamePasswordAuthenticationToken.setDetails(userDetails); OAuth2User user = new DefaultOAuth2User(authorities, userDetails, "sub"); diff --git a/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs b/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs index 34b7a0893f77..875db25f9ad7 100644 --- a/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs +++ b/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs @@ -310,8 +310,9 @@ public class CacheConfiguration { LOG.debug("Configuring Hazelcast clustering for instanceId: {}", serviceId); // In development, everything goes through 127.0.0.1, with a different port if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) { - LOG.debug("Application is running with the \"dev\" profile, Hazelcast " + - "cluster will only work with localhost instances"); + LOG.debug( + "Application is running with the \"dev\" profile, Hazelcast " + "cluster will only work with localhost instances" + ); config.getNetworkConfig().setPort(serverProperties.getPort() + 5701); config.getNetworkConfig().getJoin().getTcpIpConfig().setEnabled(true); From 912721f52a14939076c035a97fc217bbf9b7fc2c Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 9 Aug 2024 13:17:37 -0300 Subject: [PATCH 198/938] drop non required type --- .../src/main/webapp/app/core/util/data-util.service.ts.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs index c44e12ba5594..c3afb733558d 100644 --- a/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs @@ -89,7 +89,7 @@ export class DataUtils { }; observer.error(error); } else { - const fieldContentType: string = field + 'ContentType'; + const fieldContentType = field + 'ContentType'; this.toBase64(file, (base64Data: string) => { editForm.patchValue({ [field]: base64Data, From ec1b0aea1940bf6923292ae2d0294173d359c7bf Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 9 Aug 2024 13:18:35 -0300 Subject: [PATCH 199/938] drop curly rule --- lib/eslint/base.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/eslint/base.js b/lib/eslint/base.js index 900872cbbabe..bfca23e93db0 100644 --- a/lib/eslint/base.js +++ b/lib/eslint/base.js @@ -14,7 +14,6 @@ const baseConfig = { import: fixupPluginRules(imports), }, rules: { - curly: 'error', 'dot-notation': 'error', eqeqeq: ['error', 'always', { null: 'ignore' }], 'no-else-return': 'error', From 018832c0437027da5d5cb76f0d612032f8056874 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 9 Aug 2024 17:45:31 -0300 Subject: [PATCH 200/938] adjust cypress eslint config --- generators/cypress/files.ts | 1 - generators/cypress/generator.ts | 4 +++- .../eslint.config.js.jhi.cypress.ejs | 13 ++++++------ .../javascript/cypress/.eslintrc.json.ejs | 20 ------------------- .../cypress/support/commands.ts.ejs | 3 --- .../javascript/cypress/support/entity.ts.ejs | 3 --- .../cypress/support/management.ts.ejs | 1 - .../javascript/cypress/support/navbar.ts.ejs | 1 - 8 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 generators/cypress/templates/src/test/javascript/cypress/.eslintrc.json.ejs diff --git a/generators/cypress/files.ts b/generators/cypress/files.ts index efaa182ef783..b6d1097a3a3d 100644 --- a/generators/cypress/files.ts +++ b/generators/cypress/files.ts @@ -45,7 +45,6 @@ export const cypressFiles: WriteFileSection `${ctx.cypressDir}${file}`, templates: [ - '.eslintrc.json', 'fixtures/integration-test.png', 'plugins/index.ts', 'e2e/administration/administration.cy.ts', diff --git a/generators/cypress/generator.ts b/generators/cypress/generator.ts index 6cc95cad1c6d..d5880787d0f0 100644 --- a/generators/cypress/generator.ts +++ b/generators/cypress/generator.ts @@ -110,7 +110,7 @@ export default class CypressGenerator extends BaseApplicationGenerator { get writing() { return this.asWritingTaskGroup({ - cleanup({ application: { authenticationTypeOauth2, generateUserManagement, cypressDir } }) { + async cleanup({ control, application: { authenticationTypeOauth2, generateUserManagement, cypressDir } }) { if (this.isJhipsterVersionLessThan('7.0.0-beta.1')) { this.removeFile(`${cypressDir}support/keycloak-oauth2.ts`); this.removeFile(`${cypressDir}fixtures/users/user.json`); @@ -131,6 +131,8 @@ export default class CypressGenerator extends BaseApplicationGenerator { this.removeFile(`${cypressDir}integration/account/reset-password-page.spec.ts`); } } + + await control.cleanupFiles({ '8.6.1': [`${cypressDir}.eslintrc.json`] }); }, async writeFiles({ application }) { const faker = await createFaker(); diff --git a/generators/cypress/templates/eslint.config.js.jhi.cypress.ejs b/generators/cypress/templates/eslint.config.js.jhi.cypress.ejs index f905b2dd35a8..e51bfbaed454 100644 --- a/generators/cypress/templates/eslint.config.js.jhi.cypress.ejs +++ b/generators/cypress/templates/eslint.config.js.jhi.cypress.ejs @@ -29,13 +29,12 @@ import cypress from 'eslint-plugin-cypress/flat'; }, }, rules: { - '@typescript-eslint/no-explicit-any': 'warn', - '@typescript-eslint/no-unsafe-argument': 'warn', - '@typescript-eslint/no-unsafe-assignment': 'warn', - '@typescript-eslint/no-unsafe-call': 'warn', - '@typescript-eslint/no-unsafe-member-access': 'warn', - '@typescript-eslint/no-unused-vars': 'warn', - '@typescript-eslint/unbound-method': 'warn', + '@typescript-eslint/no-explicit-any': 'off', + '@typescript-eslint/no-unsafe-argument': 'off', + '@typescript-eslint/no-unsafe-assignment': 'off', + '@typescript-eslint/no-unsafe-call': 'off', + '@typescript-eslint/no-unsafe-member-access': 'off', + '@typescript-eslint/unbound-method': 'off', }, }, <&_ } -&> diff --git a/generators/cypress/templates/src/test/javascript/cypress/.eslintrc.json.ejs b/generators/cypress/templates/src/test/javascript/cypress/.eslintrc.json.ejs deleted file mode 100644 index d779d5a2527b..000000000000 --- a/generators/cypress/templates/src/test/javascript/cypress/.eslintrc.json.ejs +++ /dev/null @@ -1,20 +0,0 @@ -{ - "root": true, - "parser": "@typescript-eslint/parser", - "plugins": [ - "cypress", - "@typescript-eslint" - ], - "env": { - "cypress/globals": true - }, - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:cypress/recommended" - ], - "rules": { - "@typescript-eslint/no-namespace": ["error", { "allowDeclarations": true }], - "@typescript-eslint/no-unused-vars": "off" - } -} diff --git a/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs b/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs index 686fe0da4ec3..b17d938fb4ac 100644 --- a/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs +++ b/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs @@ -17,9 +17,6 @@ limitations under the License. -%> /* eslint-disable @typescript-eslint/no-namespace */ -/* eslint-disable @typescript-eslint/no-use-before-define */ -// eslint-disable-next-line spaced-comment -/// // *********************************************** // This commands.ts shows you how to diff --git a/generators/cypress/templates/src/test/javascript/cypress/support/entity.ts.ejs b/generators/cypress/templates/src/test/javascript/cypress/support/entity.ts.ejs index a2406a80b65b..9c7f8b5409e6 100644 --- a/generators/cypress/templates/src/test/javascript/cypress/support/entity.ts.ejs +++ b/generators/cypress/templates/src/test/javascript/cypress/support/entity.ts.ejs @@ -17,9 +17,6 @@ limitations under the License. -%> /* eslint-disable @typescript-eslint/no-namespace */ -/* eslint-disable @typescript-eslint/no-use-before-define */ -// eslint-disable-next-line spaced-comment -/// // *********************************************** // Begin Specific Selector Attributes for Cypress diff --git a/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs b/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs index 9589aeb70f2a..93e0da07269f 100644 --- a/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs +++ b/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs @@ -17,7 +17,6 @@ limitations under the License. -%> /* eslint-disable @typescript-eslint/no-namespace */ -/* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable @typescript-eslint/no-unsafe-return */ Cypress.Commands.add('getManagementInfo', () => { diff --git a/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs b/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs index 5604fa0782c5..355ce86f64ba 100644 --- a/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs +++ b/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs @@ -17,7 +17,6 @@ limitations under the License. -%> /* eslint-disable @typescript-eslint/no-namespace */ -/* eslint-disable @typescript-eslint/no-use-before-define */ import { navbarSelector, From 6e337ce1bc51faffa7f733aa6697f966f69e60b6 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 9 Aug 2024 18:05:15 -0300 Subject: [PATCH 201/938] update snapshot --- .../__snapshots__/generator.spec.ts.snap | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/generators/cypress/__snapshots__/generator.spec.ts.snap b/generators/cypress/__snapshots__/generator.spec.ts.snap index f19b4e1082c0..7a834104a09d 100644 --- a/generators/cypress/__snapshots__/generator.spec.ts.snap +++ b/generators/cypress/__snapshots__/generator.spec.ts.snap @@ -14,9 +14,6 @@ exports[`generator - cypress jwt-cypressAudit(false)-angular-withAdminUi(false)- "clientRoot/package.json": { "stateCleared": "modified", }, - "clientRoot/src/test/javascript/cypress/.eslintrc.json": { - "stateCleared": "modified", - }, "clientRoot/src/test/javascript/cypress/e2e/account/login-page.cy.ts": { "stateCleared": "modified", }, @@ -88,9 +85,6 @@ exports[`generator - cypress jwt-cypressAudit(true)-vue-withAdminUi(true)-cypres "clientRoot/package.json": { "stateCleared": "modified", }, - "clientRoot/src/test/javascript/cypress/.eslintrc.json": { - "stateCleared": "modified", - }, "clientRoot/src/test/javascript/cypress/e2e/account/login-page.cy.ts": { "stateCleared": "modified", }, @@ -162,9 +156,6 @@ exports[`generator - cypress oauth2-cypressAudit(false)-angular-withAdminUi(fals "package.json": { "stateCleared": "modified", }, - "src/test/javascript/cypress/.eslintrc.json": { - "stateCleared": "modified", - }, "src/test/javascript/cypress/e2e/administration/administration.cy.ts": { "stateCleared": "modified", }, @@ -218,9 +209,6 @@ exports[`generator - cypress oauth2-cypressAudit(true)-vue-withAdminUi(true)-cyp "package.json": { "stateCleared": "modified", }, - "src/test/javascript/cypress/.eslintrc.json": { - "stateCleared": "modified", - }, "src/test/javascript/cypress/e2e/administration/administration.cy.ts": { "stateCleared": "modified", }, @@ -348,9 +336,6 @@ exports[`generator - cypress session-cypressAudit(false)-angular-withAdminUi(fal "package.json": { "stateCleared": "modified", }, - "src/test/javascript/cypress/.eslintrc.json": { - "stateCleared": "modified", - }, "src/test/javascript/cypress/e2e/account/login-page.cy.ts": { "stateCleared": "modified", }, @@ -422,9 +407,6 @@ exports[`generator - cypress session-cypressAudit(true)-vue-withAdminUi(true)-cy "package.json": { "stateCleared": "modified", }, - "src/test/javascript/cypress/.eslintrc.json": { - "stateCleared": "modified", - }, "src/test/javascript/cypress/e2e/account/login-page.cy.ts": { "stateCleared": "modified", }, From f190ce588810435f81ec5f6f62e1e377b73c5c45 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 9 Aug 2024 19:53:46 -0300 Subject: [PATCH 202/938] fix cypress --- .../src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs b/generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs index c1e7babd9760..94960c44f33e 100644 --- a/generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs +++ b/generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs @@ -52,7 +52,9 @@ describe('<%= entityClass %> e2e test', () => { const <%= entityInstance %>PageUrlPattern = new RegExp('/<%= entityPage %>(\\?.*)?$'); const username = Cypress.env('E2E_USERNAME') ?? '<%- adminEntity ? 'admin' : 'user' %>'; const password = Cypress.env('E2E_PASSWORD') ?? '<%- adminEntity ? 'admin' : 'user' %>'; +<%_ if (!readOnly) { _%> <% if (skipCreateTest) { %>// <% } %>const <%= entityInstance %>Sample = <%- JSON.stringify(this.generateTestEntity(sampleFields.map(field => field.reference))) %>; +<%_ } _%> let <%= entityInstance %>; <%_ for (otherEntity of requiredOtherEntities) { _%> @@ -179,7 +181,7 @@ describe('<%= entityClass %> e2e test', () => { <%_ } _%> describe('with existing value', () => { -<% if (!readOnly) { %> +<%_ if (!readOnly) { _%> <%_ if (skipCreateTest) { _%> /* Disabled due to incompatibility <%_ } _%> From dbf97094c3009ccbc62a71836385269ab0a22f32 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 9 Aug 2024 19:54:01 -0300 Subject: [PATCH 203/938] execute frontend test on cypress changes --- test-integration/scripts/99-build-changes.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test-integration/scripts/99-build-changes.sh b/test-integration/scripts/99-build-changes.sh index 92343b061c06..0b355d6ee726 100755 --- a/test-integration/scripts/99-build-changes.sh +++ b/test-integration/scripts/99-build-changes.sh @@ -74,6 +74,7 @@ echo "::group::Check Client Common" git -c color.ui=always diff --exit-code @~1 -- \ 'generators/bootstrap-application-client' \ 'generators/client/**' \ + 'generators/cypress/**' \ 'generators/javascript/**' \ || CLIENT_COMMON=true echo "::endgroup::" From 62ef9bf7946ad174fc4f54c7d4dedd998f82769c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 23:57:05 +0000 Subject: [PATCH 204/938] Bump the eslint group with 2 updates Bumps the eslint group with 2 updates: [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) and [eslint](https://github.com/eslint/eslint). Updates `@eslint/js` from 9.8.0 to 9.9.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/commits/v9.9.0/packages/js) Updates `eslint` from 9.8.0 to 9.9.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.8.0...v9.9.0) --- updated-dependencies: - dependency-name: "@eslint/js" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: eslint - dependency-name: eslint dependency-type: direct:production update-type: version-update:semver-minor dependency-group: eslint ... Signed-off-by: dependabot[bot] --- package-lock.json | 27 +++++++++++++++++---------- package.json | 4 ++-- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 12108a26b73f..1a4116561728 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@eslint/compat": "1.1.1", - "@eslint/js": "9.8.0", + "@eslint/js": "9.9.0", "@faker-js/faker": "8.4.1", "@iarna/toml": "3.0.0", "@types/ejs": "3.1.5", @@ -30,7 +30,7 @@ "dockerfile-ast": "0.6.1", "dot-properties": "1.0.1", "ejs": "3.1.10", - "eslint": "9.8.0", + "eslint": "9.9.0", "eslint-plugin-import": "2.29.1", "eslint-plugin-unused-imports": "4.1.2", "execa": "9.3.0", @@ -1280,10 +1280,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.8.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.8.0.tgz", - "integrity": "sha512-MfluB7EUfxXtv3i/++oh89uzAr4PDI4nn201hsp+qaXqsjAWzinlZEHEfPgAX4doIlKvPG/i0A9dpKxOLII8yA==", - "license": "MIT", + "version": "9.9.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.0.tgz", + "integrity": "sha512-hhetes6ZHP3BlXLxmd8K2SNgkhNSi+UcecbnwWKwpP7kyi/uC75DJ1lOOBO3xrC4jyojtGE3YxKZPHfk4yrgug==", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } @@ -5690,15 +5689,15 @@ } }, "node_modules/eslint": { - "version": "9.8.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.8.0.tgz", - "integrity": "sha512-K8qnZ/QJzT2dLKdZJVX6W4XOwBzutMYmt0lqUS+JdXgd+HTYFlonFgkJ8s44d/zMPPCnOOk0kMWCApCPhiOy9A==", + "version": "9.9.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.0.tgz", + "integrity": "sha512-JfiKJrbx0506OEerjK2Y1QlldtBxkAlLxT5OEcRF8uaQ86noDe2k31Vw9rnSWv+MXZHj7OOUV/dA0AhdLFcyvA==", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.11.0", "@eslint/config-array": "^0.17.1", "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "9.8.0", + "@eslint/js": "9.9.0", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.3.0", "@nodelib/fs.walk": "^1.2.8", @@ -5737,6 +5736,14 @@ }, "funding": { "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } } }, "node_modules/eslint-config-prettier": { diff --git a/package.json b/package.json index 2a061cb5d8ac..9c6d6e8511fd 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ }, "dependencies": { "@eslint/compat": "1.1.1", - "@eslint/js": "9.8.0", + "@eslint/js": "9.9.0", "@faker-js/faker": "8.4.1", "@iarna/toml": "3.0.0", "@types/ejs": "3.1.5", @@ -138,7 +138,7 @@ "dockerfile-ast": "0.6.1", "dot-properties": "1.0.1", "ejs": "3.1.10", - "eslint": "9.8.0", + "eslint": "9.9.0", "eslint-plugin-import": "2.29.1", "eslint-plugin-unused-imports": "4.1.2", "execa": "9.3.0", From 56d38fdf48c3cc04ac894a6815727660f410bc70 Mon Sep 17 00:00:00 2001 From: JHipster Bot Date: Sat, 10 Aug 2024 00:20:35 +0000 Subject: [PATCH 205/938] Bump transitional dependencies --- package-lock.json | 457 +++++++++++++++++++--------------------------- 1 file changed, 188 insertions(+), 269 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1a4116561728..46eed8b53c2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1156,6 +1156,18 @@ "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, + "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/@eslint-community/regexpp": { "version": "4.11.0", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", @@ -1169,6 +1181,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.1.1.tgz", "integrity": "sha512-lpHyRyplhGPL5mGEh6M9O5nnKk0Gz4bFI+Zu6tKlPpDUN7XshWvH9C/px4UVm87IAANE0W81CEsNGbS1KlzXpA==", + "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } @@ -1177,6 +1190,7 @@ "version": "0.17.1", "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz", "integrity": "sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA==", + "license": "Apache-2.0", "dependencies": { "@eslint/object-schema": "^2.1.4", "debug": "^4.3.1", @@ -1190,6 +1204,7 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1199,6 +1214,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -1210,6 +1226,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz", "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==", + "license": "MIT", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -1232,6 +1249,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1247,6 +1265,7 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1256,6 +1275,7 @@ "version": "14.0.0", "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "license": "MIT", "engines": { "node": ">=18" }, @@ -1266,12 +1286,14 @@ "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "license": "MIT" }, "node_modules/@eslint/eslintrc/node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -1283,6 +1305,7 @@ "version": "9.9.0", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.0.tgz", "integrity": "sha512-hhetes6ZHP3BlXLxmd8K2SNgkhNSi+UcecbnwWKwpP7kyi/uC75DJ1lOOBO3xrC4jyojtGE3YxKZPHfk4yrgug==", + "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } @@ -1291,6 +1314,7 @@ "version": "2.1.4", "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", + "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } @@ -1338,6 +1362,7 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", + "license": "Apache-2.0", "engines": { "node": ">=18.18" }, @@ -2741,9 +2766,9 @@ "license": "ISC" }, "node_modules/@pnpm/npm-conf": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.2.2.tgz", - "integrity": "sha512-UA91GwWPhFExt3IizW6bOeY/pQ0BkuNwKjk9iQW9KqxluGCrg4VenZ0/L+2Y0+ZOtme72EVvg6v0zo3AMQRCeA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.3.1.tgz", + "integrity": "sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==", "license": "MIT", "dependencies": { "@pnpm/config.env-replace": "^1.1.0", @@ -3182,9 +3207,9 @@ } }, "node_modules/@types/yargs": { - "version": "17.0.32", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", - "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==", + "version": "17.0.33", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", + "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", "dev": true, "license": "MIT", "dependencies": { @@ -3202,6 +3227,7 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.0.1.tgz", "integrity": "sha512-5g3Y7GDFsJAnY4Yhvk8sZtFfV6YNF2caLzjrRPUBzewjPCaj0yokePB4LJSobyCzGMzjZZYFbwuzbfDHlimXbQ==", + "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.0.1", @@ -3234,6 +3260,7 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.0.1.tgz", "integrity": "sha512-5IgYJ9EO/12pOUwiBKFkpU7rS3IU21mtXzB81TNwq2xEybcmAZrE9qwDtsb5uQd9aVO9o0fdabFyAmKveXyujg==", + "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/scope-manager": "8.0.1", "@typescript-eslint/types": "8.0.1", @@ -3261,6 +3288,7 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.0.1.tgz", "integrity": "sha512-NpixInP5dm7uukMiRyiHjRKkom5RIFA4dfiHvalanD2cF0CLUuQqxfg8PtEUo9yqJI2bBhF+pcSafqnG3UBnRQ==", + "license": "MIT", "dependencies": { "@typescript-eslint/types": "8.0.1", "@typescript-eslint/visitor-keys": "8.0.1" @@ -3277,6 +3305,7 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.0.1.tgz", "integrity": "sha512-+/UT25MWvXeDX9YaHv1IS6KI1fiuTto43WprE7pgSMswHbn1Jm9GEM4Txp+X74ifOWV8emu2AWcbLhpJAvD5Ng==", + "license": "MIT", "dependencies": { "@typescript-eslint/typescript-estree": "8.0.1", "@typescript-eslint/utils": "8.0.1", @@ -3300,6 +3329,7 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.0.1.tgz", "integrity": "sha512-PpqTVT3yCA/bIgJ12czBuE3iBlM3g4inRSC5J0QOdQFAn07TYrYEQBBKgXH1lQpglup+Zy6c1fxuwTk4MTNKIw==", + "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -3312,6 +3342,7 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.0.1.tgz", "integrity": "sha512-8V9hriRvZQXPWU3bbiUV4Epo7EvgM6RTs+sUmxp5G//dBGy402S7Fx0W0QkB2fb4obCF8SInoUzvTYtc3bkb5w==", + "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/types": "8.0.1", "@typescript-eslint/visitor-keys": "8.0.1", @@ -3335,10 +3366,49 @@ } } }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/@typescript-eslint/utils": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.0.1.tgz", "integrity": "sha512-CBFR0G0sCt0+fzfnKaciu9IBsKvEKYwN9UZ+eeogK1fYHg4Qxk1yf/wLQkLXlq8wbU2dFlgAesxt8Gi76E8RTA==", + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@typescript-eslint/scope-manager": "8.0.1", @@ -3360,6 +3430,7 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.0.1.tgz", "integrity": "sha512-W5E+o0UfUcK5EgchLZsyVWqARmsM7v54/qEq6PY3YI5arkgmCzHiuk0zKSJJbm71V0xdRna4BGomkCTXz2/LkQ==", + "license": "MIT", "dependencies": { "@typescript-eslint/types": "8.0.1", "eslint-visitor-keys": "^3.4.3" @@ -3372,6 +3443,18 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/@yeoman/adapter": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@yeoman/adapter/-/adapter-1.4.0.tgz", @@ -3421,9 +3504,9 @@ } }, "node_modules/@yeoman/conflicter/node_modules/@types/node": { - "version": "16.18.104", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.104.tgz", - "integrity": "sha512-OF3keVCbfPlkzxnnDBUZJn1RiCJzKeadjiW0xTEb0G1SUJ5gDVb3qnzZr2T4uIFvsbKJbXy1v2DN7e2zaEY7jQ==", + "version": "16.18.105", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.105.tgz", + "integrity": "sha512-w2d0Z9yMk07uH3+Cx0N8lqFyi3yjXZxlbYappPj+AsOlT02OyxyiuNoNHdGt6EuiSm8Wtgp2YV7vWg+GMFrvFA==", "license": "MIT" }, "node_modules/@yeoman/namespace": { @@ -3450,9 +3533,9 @@ } }, "node_modules/@yeoman/transform/node_modules/@types/node": { - "version": "16.18.104", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.104.tgz", - "integrity": "sha512-OF3keVCbfPlkzxnnDBUZJn1RiCJzKeadjiW0xTEb0G1SUJ5gDVb3qnzZr2T4uIFvsbKJbXy1v2DN7e2zaEY7jQ==", + "version": "16.18.105", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.105.tgz", + "integrity": "sha512-w2d0Z9yMk07uH3+Cx0N8lqFyi3yjXZxlbYappPj+AsOlT02OyxyiuNoNHdGt6EuiSm8Wtgp2YV7vWg+GMFrvFA==", "license": "MIT" }, "node_modules/@yeoman/types": { @@ -3488,9 +3571,9 @@ } }, "node_modules/@yeoman/types/node_modules/@types/node": { - "version": "16.18.104", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.104.tgz", - "integrity": "sha512-OF3keVCbfPlkzxnnDBUZJn1RiCJzKeadjiW0xTEb0G1SUJ5gDVb3qnzZr2T4uIFvsbKJbXy1v2DN7e2zaEY7jQ==", + "version": "16.18.105", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.105.tgz", + "integrity": "sha512-w2d0Z9yMk07uH3+Cx0N8lqFyi3yjXZxlbYappPj+AsOlT02OyxyiuNoNHdGt6EuiSm8Wtgp2YV7vWg+GMFrvFA==", "license": "MIT" }, "node_modules/abbrev": { @@ -3518,6 +3601,7 @@ "version": "8.12.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -3529,6 +3613,7 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -3755,11 +3840,15 @@ } }, "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz", + "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==", + "license": "MIT", "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/array.prototype.findlastindex": { @@ -4297,6 +4386,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "license": "MIT", "engines": { "node": ">=6" } @@ -4312,9 +4402,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001646", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001646.tgz", - "integrity": "sha512-dRg00gudiBDDTmUhClSdv3hqRfpbOnU28IpI1T6PBTLWa+kOj0681C8uML3PifYfREuBrVjDGhL3adYpBT6spw==", + "version": "1.0.30001651", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz", + "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==", "dev": true, "funding": [ { @@ -4829,39 +4919,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/cpy/node_modules/globby": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz", - "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==", - "dev": true, - "license": "MIT", - "dependencies": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.3.0", - "ignore": "^5.2.4", - "merge2": "^1.4.1", - "slash": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cpy/node_modules/slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -5271,6 +5328,18 @@ "node": "*" } }, + "node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/dot-prop": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-9.0.0.tgz", @@ -5365,43 +5434,10 @@ "node": ">=0.10.0" } }, - "node_modules/ejs-lint/node_modules/globby": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz", - "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==", - "dev": true, - "license": "MIT", - "dependencies": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.3.0", - "ignore": "^5.2.4", - "merge2": "^1.4.1", - "slash": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ejs-lint/node_modules/globby/node_modules/slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/electron-to-chromium": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz", - "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==", + "version": "1.5.6", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.6.tgz", + "integrity": "sha512-jwXWsM5RPf6j9dPYzaorcBSUg6AiqocPEyMpkchkvntaH9HGfOOMZwxMJjDY/XEs3T5dM7uyH1VhRMkqUU9qVw==", "dev": true, "license": "ISC" }, @@ -5445,6 +5481,7 @@ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -5692,6 +5729,7 @@ "version": "9.9.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.0.tgz", "integrity": "sha512-JfiKJrbx0506OEerjK2Y1QlldtBxkAlLxT5OEcRF8uaQ86noDe2k31Vw9rnSWv+MXZHj7OOUV/dA0AhdLFcyvA==", + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.11.0", @@ -5784,6 +5822,7 @@ "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz", "integrity": "sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==", "dev": true, + "license": "ISC", "dependencies": { "debug": "^4.3.4", "enhanced-resolve": "^5.12.0", @@ -5893,18 +5932,6 @@ "ms": "^2.1.1" } }, - "node_modules/eslint-plugin-import/node_modules/doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "license": "Apache-2.0", - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/eslint-plugin-import/node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -5961,6 +5988,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.2.tgz", "integrity": "sha512-A/Ypb0DQlDEzIbcoAv87NpLLcG3iwlE0gBEpS9Ud/62v2v3CoO15lZ/WfGyo2Wq7YraWJ2aE0TeHgJcpor6KQQ==", + "license": "MIT", "peerDependencies": { "@typescript-eslint/eslint-plugin": "^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0", "eslint": "^9.0.0 || ^8.0.0" @@ -5975,6 +6003,7 @@ "version": "8.0.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz", "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==", + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -5987,12 +6016,12 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", + "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", "license": "Apache-2.0", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -6073,17 +6102,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "license": "MIT" }, - "node_modules/eslint/node_modules/eslint-visitor-keys": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", - "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/eslint/node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -6333,6 +6351,7 @@ "version": "10.1.0", "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", + "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.12.0", "acorn-jsx": "^5.3.2", @@ -6345,17 +6364,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", - "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", @@ -6386,6 +6394,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -6629,6 +6638,7 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", + "license": "MIT", "dependencies": { "flat-cache": "^4.0.0" }, @@ -6742,6 +6752,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", + "license": "MIT", "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.4" @@ -6753,7 +6764,8 @@ "node_modules/flatted": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==" + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "license": "ISC" }, "node_modules/fly-import": { "version": "0.4.0", @@ -6805,9 +6817,9 @@ } }, "node_modules/foreground-child": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", - "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", + "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", "license": "ISC", "dependencies": { "cross-spawn": "^7.0.0", @@ -7093,6 +7105,7 @@ "version": "15.9.0", "resolved": "https://registry.npmjs.org/globals/-/globals-15.9.0.tgz", "integrity": "sha512-SmSKyLLKFbSr6rptvP8izbyxJL4ILwqO9Jg23UA0sDlGlu58V59D1//I3vlc0KJphVdUR7vMjHIplYnzBxorQA==", + "license": "MIT", "engines": { "node": ">=18" }, @@ -7117,30 +7130,34 @@ } }, "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz", + "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==", + "license": "MIT", "dependencies": { - "array-union": "^2.1.0", "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", + "fast-glob": "^3.3.0", + "ignore": "^5.2.4", "merge2": "^1.4.1", - "slash": "^3.0.0" + "slash": "^4.0.0" }, "engines": { - "node": ">=10" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/globby/node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", + "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", + "license": "MIT", "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/gopd": { @@ -7201,7 +7218,8 @@ "node_modules/graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "license": "MIT" }, "node_modules/grouped-queue": { "version": "2.0.0", @@ -7448,6 +7466,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -9450,45 +9469,14 @@ } }, "node_modules/mem-fs-editor/node_modules/@types/node": { - "version": "18.19.43", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.43.tgz", - "integrity": "sha512-Mw/YlgXnyJdEwLoFv2dpuJaDFriX+Pc+0qOBJ57jC1H6cDxIj2xc5yUrdtArDVG0m+KV6622a4p2tenEqB3C/g==", + "version": "18.19.44", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.44.tgz", + "integrity": "sha512-ZsbGerYg72WMXUIE9fYxtvfzLEuq6q8mKERdWFnqTmOvudMxnz+CBNRoOwJ2kNpFOncrKjT1hZwxjlFgQ9qvQA==", "license": "MIT", "dependencies": { "undici-types": "~5.26.4" } }, - "node_modules/mem-fs-editor/node_modules/globby": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz", - "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==", - "license": "MIT", - "dependencies": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.3.0", - "ignore": "^5.2.4", - "merge2": "^1.4.1", - "slash": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/mem-fs-editor/node_modules/slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/meow": { "version": "12.1.1", "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz", @@ -9780,9 +9768,9 @@ } }, "node_modules/mocha": { - "version": "10.7.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.0.tgz", - "integrity": "sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==", + "version": "10.7.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz", + "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==", "dev": true, "license": "MIT", "peer": true, @@ -10218,18 +10206,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/multimatch/node_modules/array-union": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz", - "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/multimatch/node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -11081,9 +11057,9 @@ } }, "node_modules/p-transform/node_modules/@types/node": { - "version": "16.18.104", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.104.tgz", - "integrity": "sha512-OF3keVCbfPlkzxnnDBUZJn1RiCJzKeadjiW0xTEb0G1SUJ5gDVb3qnzZr2T4uIFvsbKJbXy1v2DN7e2zaEY7jQ==", + "version": "16.18.105", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.105.tgz", + "integrity": "sha512-w2d0Z9yMk07uH3+Cx0N8lqFyi3yjXZxlbYappPj+AsOlT02OyxyiuNoNHdGt6EuiSm8Wtgp2YV7vWg+GMFrvFA==", "license": "MIT" }, "node_modules/p-try": { @@ -11155,6 +11131,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -11308,9 +11285,9 @@ } }, "node_modules/peek-readable": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.1.3.tgz", - "integrity": "sha512-kCsc9HwH5RgVA3H3VqkWFyGQwsxUxLdiSX1d5nqAm7hnMFjNFX1VhBLmJoUY0hZNc8gmDNgBkLjfhiWPsziXWA==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.1.4.tgz", + "integrity": "sha512-E7mY2VmKqw9jYuXrSWGHFuPCW2SLQenzXLF3amGaY6lXXg4/b3gj5HVM7h8ZjCO/nZS9ICs0Cz285+32FvNd/A==", "dev": true, "license": "MIT", "engines": { @@ -12107,6 +12084,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "license": "MIT", "engines": { "node": ">=4" } @@ -12615,37 +12593,6 @@ "sort-package-json": "cli.js" } }, - "node_modules/sort-package-json/node_modules/globby": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz", - "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==", - "license": "MIT", - "dependencies": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.3.0", - "ignore": "^5.2.4", - "merge2": "^1.4.1", - "slash": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/sort-package-json/node_modules/slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/spdx-correct": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", @@ -13021,6 +12968,7 @@ "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -13326,6 +13274,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==", + "license": "MIT", "engines": { "node": ">=16" }, @@ -13413,6 +13362,7 @@ "version": "4.24.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.24.0.tgz", "integrity": "sha512-spAaHzc6qre0TlZQQ2aA/nGMe+2Z/wyGk5Z+Ru2VUfdNwT6kWO6TjevOlpebsATEG1EIQ2sOiDszud3lO5mt/Q==", + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=16" }, @@ -13510,6 +13460,7 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.0.1.tgz", "integrity": "sha512-V3Y+MdfhawxEjE16dWpb7/IOgeXnLwAEEkS7v8oDqNcR1oYlqWhGH/iHqHdKVdpWme1VPZ0SoywXAkCqawj2eQ==", + "license": "MIT", "dependencies": { "@typescript-eslint/eslint-plugin": "8.0.1", "@typescript-eslint/parser": "8.0.1", @@ -13990,6 +13941,7 @@ "version": "3.14.1", "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.1.tgz", "integrity": "sha512-CJi4Il/msz8HkdDfXOMu+r5Au/oyEjFiOZzbX2d23hRLY0narGjqfE5lFlrT5hfYJhPtM8b85/GNFsxIML/RVA==", + "license": "MIT", "dependencies": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", @@ -14557,9 +14509,9 @@ } }, "node_modules/yeoman-generator/node_modules/@types/node": { - "version": "18.19.43", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.43.tgz", - "integrity": "sha512-Mw/YlgXnyJdEwLoFv2dpuJaDFriX+Pc+0qOBJ57jC1H6cDxIj2xc5yUrdtArDVG0m+KV6622a4p2tenEqB3C/g==", + "version": "18.19.44", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.44.tgz", + "integrity": "sha512-ZsbGerYg72WMXUIE9fYxtvfzLEuq6q8mKERdWFnqTmOvudMxnz+CBNRoOwJ2kNpFOncrKjT1hZwxjlFgQ9qvQA==", "license": "MIT", "dependencies": { "undici-types": "~5.26.4" @@ -14741,26 +14693,6 @@ "@sinonjs/commons": "^3.0.0" } }, - "node_modules/yeoman-test/node_modules/globby": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz", - "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==", - "dev": true, - "license": "MIT", - "dependencies": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.3.0", - "ignore": "^5.2.4", - "merge2": "^1.4.1", - "slash": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/yeoman-test/node_modules/mem-fs-editor": { "version": "10.0.3", "resolved": "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-10.0.3.tgz", @@ -14832,19 +14764,6 @@ "url": "https://opencollective.com/sinon" } }, - "node_modules/yeoman-test/node_modules/slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/yeoman-test/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", From d4cefb498e92f064cbbd0a8b2e2eba6d9d977431 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sat, 10 Aug 2024 07:07:06 -0300 Subject: [PATCH 206/938] Update oauth2.ts.ejs --- .../src/test/javascript/cypress/support/oauth2.ts.ejs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs b/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs index 19b00403f219..af1591fb00cd 100644 --- a/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs +++ b/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs @@ -17,8 +17,6 @@ limitations under the License. -%> /* eslint-disable @typescript-eslint/no-namespace */ -// eslint-disable-next-line spaced-comment -/// Cypress.Commands.add('getOauth2Data', () => { cy.request({ @@ -158,6 +156,7 @@ Cypress.Commands.add('oauthLogout', () => { declare global { namespace Cypress { + // eslint-disable-next-line @typescript-eslint/no-unused-vars interface Chainable { getOauth2Data(): Cypress.Chainable; oauthLogin(oauth2Data, username: string, password: string): Cypress.Chainable; From 65d6ce928ec4d26a9e9dfe112948e1c6d93383f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 00:49:20 +0000 Subject: [PATCH 207/938] Bump docker/build-push-action from 6.6.0 to 6.6.1 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.6.0 to 6.6.1. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.6.0...v6.6.1) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-image-publish-github-registry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-publish-github-registry.yml b/.github/workflows/docker-image-publish-github-registry.yml index d70754e923fb..0ceba3af3568 100644 --- a/.github/workflows/docker-image-publish-github-registry.yml +++ b/.github/workflows/docker-image-publish-github-registry.yml @@ -72,7 +72,7 @@ jobs: images: ghcr.io/${{ github.repository }}${{ (steps.login-hub.outcome == 'success' && ',jhipster/jhipster') || ''}} - name: Build and push Docker image - uses: docker/build-push-action@v6.6.0 + uses: docker/build-push-action@v6.6.1 with: context: . platforms: linux/amd64,linux/arm64 From 3c7eee8a52d6886c76745619062e19f2f754e7f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 00:57:03 +0000 Subject: [PATCH 208/938] Bump prom/prometheus in /generators/server/resources Bumps prom/prometheus from v2.53.1 to v2.54.0. --- updated-dependencies: - dependency-name: prom/prometheus dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- generators/server/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile index 8d3fb9f259d5..cf1677a64f72 100644 --- a/generators/server/resources/Dockerfile +++ b/generators/server/resources/Dockerfile @@ -55,7 +55,7 @@ LABEL ALIAS=sonar FROM docker.io/bitnami/consul:1.19.1 LABEL ALIAS=consul -FROM prom/prometheus:v2.53.1 +FROM prom/prometheus:v2.54.0 LABEL ALIAS=prometheus FROM prom/alertmanager:v0.27.0 From be84d49e3c942cd22aee2b0fd4f6c21c3652e71b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 01:19:26 +0000 Subject: [PATCH 209/938] Bump the eslint group in /generators/react/resources with 2 updates Bumps the eslint group in /generators/react/resources with 2 updates: [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) and [eslint](https://github.com/eslint/eslint). Updates `@eslint/js` from 9.8.0 to 9.9.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/commits/v9.9.0/packages/js) Updates `eslint` from 9.8.0 to 9.9.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.8.0...v9.9.0) --- updated-dependencies: - dependency-name: "@eslint/js" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index 70ea032813fe..2f82a5ad6158 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -29,7 +29,7 @@ "webstomp-client": "1.2.6" }, "devDependencies": { - "@eslint/js": "9.8.0", + "@eslint/js": "9.9.0", "@module-federation/utilities": "3.0.3-0", "@testing-library/react": "16.0.0", "@types/jest": "29.5.12", @@ -48,7 +48,7 @@ "cross-env": "7.0.3", "css-loader": "7.1.2", "css-minimizer-webpack-plugin": "7.0.0", - "eslint": "9.8.0", + "eslint": "9.9.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", "eslint-plugin-react": "7.35.0", From ed64cbe2aacd36618d13c9bfd369619ceecb6d5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 02:45:16 +0000 Subject: [PATCH 210/938] Bump the eslint group in /generators/vue/resources with 2 updates Bumps the eslint group in /generators/vue/resources with 2 updates: [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) and [eslint](https://github.com/eslint/eslint). Updates `@eslint/js` from 9.8.0 to 9.9.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/commits/v9.9.0/packages/js) Updates `eslint` from 9.8.0 to 9.9.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.8.0...v9.9.0) --- updated-dependencies: - dependency-name: "@eslint/js" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 44eb50f65b4b..da9feb96fa6d 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -21,7 +21,7 @@ "vue-router": "4.4.3" }, "devDependencies": { - "@eslint/js": "9.8.0", + "@eslint/js": "9.9.0", "@module-federation/utilities": "3.0.3-0", "@pinia/testing": "0.1.5", "@tsconfig/node18": "18.2.4", @@ -36,7 +36,7 @@ "copy-webpack-plugin": "12.0.2", "css-loader": "7.1.2", "css-minimizer-webpack-plugin": "7.0.0", - "eslint": "9.8.0", + "eslint": "9.9.0", "eslint-plugin-prettier": "5.2.1", "eslint-plugin-vue": "9.27.0", "flush-promises": "1.0.2", From 9a21ef984a47f93e24098ff55f76385e1c945e88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 03:23:06 +0000 Subject: [PATCH 211/938] Bump eslint in /generators/angular/resources in the eslint group Bumps the eslint group in /generators/angular/resources with 1 update: [eslint](https://github.com/eslint/eslint). Updates `eslint` from 9.8.0 to 9.9.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.8.0...v9.9.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index b5f576808991..936dd72e0e24 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -32,7 +32,7 @@ "browser-sync-webpack-plugin": "2.3.0", "buffer": "6.0.3", "copy-webpack-plugin": "12.0.2", - "eslint": "9.8.0", + "eslint": "9.9.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", "eslint-webpack-plugin": "4.2.0", From a35eaf829bee702f870d582f82846d5e257ee3a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 12:50:21 +0000 Subject: [PATCH 212/938] Bump eslint in /generators/generate-blueprint/resources Bumps [eslint](https://github.com/eslint/eslint) from 9.8.0 to 9.9.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.8.0...v9.9.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/generate-blueprint/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generate-blueprint/resources/package.json b/generators/generate-blueprint/resources/package.json index df2a78524cc0..effe73133929 100644 --- a/generators/generate-blueprint/resources/package.json +++ b/generators/generate-blueprint/resources/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "eslint": "9.8.0", + "eslint": "9.9.0", "globals": "15.9.0", "vitest": "2.0.5" } From 144c12a1bc23b44fd449c01080b0919a96822f98 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 9 Aug 2024 14:30:31 -0300 Subject: [PATCH 213/938] apply prettier/eslint to templates --- generators/angular/generator.ts | 2 +- generators/angular/templates/jest.conf.js.ejs | 6 +- .../password-reset-finish.component.ts.ejs | 4 +- .../register/register.component.html.ejs | 30 ++--- .../list/user-management.component.ts.ejs | 2 +- .../auth/user-route-access.service.ts.ejs | 2 +- .../auth-expired.interceptor.ts.ejs | 2 +- .../error-handler.interceptor.ts.ejs | 2 +- .../notification.interceptor.ts.ejs | 2 +- .../app/core/util/alert.service.spec.ts.ejs | 6 +- .../layouts/main/main.component.spec.ts.ejs | 5 +- .../templates/webpack/webpack.custom.js.ejs | 2 +- .../templates/src/main/webapp/index.html.ejs | 15 ++- generators/react/templates/jest.conf.js.ejs | 65 +++++----- .../webapp/app/_bootstrap-variables.scss.ejs | 22 ++-- .../init/password-reset-init.tsx.ejs | 68 ++++++----- .../modules/account/register/register.tsx.ejs | 2 +- .../account/settings/settings.reducer.ts.ejs | 4 +- .../administration.reducer.spec.ts.ejs | 12 +- .../administration.reducer.ts.ejs | 12 +- .../user-management/user-management.tsx.ejs | 7 +- .../layout/header/header-components.tsx.ejs | 4 +- .../shared/layout/header/header.spec.tsx.ejs | 8 +- .../reducers/authentication.spec.ts.ejs | 19 ++- .../app/shared/reducers/authentication.ts.ejs | 2 +- .../app/shared/util/entity-utils.ts.ejs | 2 +- .../src/main/webapp/app/typings.d.ts.ejs | 4 +- .../templates/webpack/environment.js.ejs | 2 +- .../aop/logging/LoggingAspect.java.ejs | 6 +- .../SecurityConfiguration_reactive.java.ejs | 20 ++-- .../config/SecurityJwtConfiguration.java.ejs | 2 +- .../_package_/config/WebConfigurer.java.ejs | 2 +- .../management/SecurityMetersService.java.ejs | 3 +- ...PersistentTokenRememberMeServices.java.ejs | 5 +- .../oauth2/AudienceValidator.java.ejs | 2 +- .../_package_/service/MailService.java.ejs | 10 +- .../web/rest/AccountResource.java.ejs | 6 +- .../rest/errors/ExceptionTranslator.java.ejs | 12 +- .../web/rest/_entityClass_ResourceIT.java.ejs | 2 +- .../SecurityUtilsUnitTest_imperative.java.ejs | 8 +- .../SecurityUtilsUnitTest_reactive.java.ejs | 18 +-- .../web/rest/AccountResourceIT.java.ejs | 17 ++- .../rest/WithUnauthenticatedMockUser.java.ejs | 4 +- .../ExceptionTranslatorIT_reactive.java.ejs | 45 ++++--- ...ersSpringContextCustomizerFactory.java.ejs | 3 +- .../webapp/app/account/account.service.ts.ejs | 2 +- .../login-form.component.spec.ts.ejs | 12 +- .../app/account/login-form/login-form.vue.ejs | 8 +- .../register/register.component.spec.ts.ejs | 2 +- .../app/account/settings/settings.vue.ejs | 113 +++++++++++++----- .../configuration.service.ts.ejs | 14 +-- .../user-management/user-management.vue.ejs | 5 +- .../jhi-navbar.component.spec.ts.ejs | 2 +- .../app/core/jhi-navbar/jhi-navbar.vue.ejs | 24 ++-- .../templates/src/main/webapp/app/main.ts.ejs | 2 +- .../app/shared/alert/alert.service.ts.ejs | 2 +- .../data/data-utils.service.spec.ts.ejs | 2 +- .../main/webapp/content/scss/global.scss.ejs | 74 ++++++------ generators/vue/templates/vite.config.mts.ejs | 2 +- 59 files changed, 421 insertions(+), 321 deletions(-) diff --git a/generators/angular/generator.ts b/generators/angular/generator.ts index 3452b19b38ee..dc77d87f723b 100644 --- a/generators/angular/generator.ts +++ b/generators/angular/generator.ts @@ -142,7 +142,7 @@ export default class AngularGenerator extends BaseApplicationGenerator { { ignoreNonExisting }, createNeedleCallback({ needle: 'jhipster-needle-add-webpack-config', - contentToAdd: `,${args.config}`, + contentToAdd: `${args.config},`, }), ); }; diff --git a/generators/angular/templates/jest.conf.js.ejs b/generators/angular/templates/jest.conf.js.ejs index dbf7131d4797..4b876b35e520 100644 --- a/generators/angular/templates/jest.conf.js.ejs +++ b/generators/angular/templates/jest.conf.js.ejs @@ -16,9 +16,11 @@ See the License for the specific language governing permissions and limitations under the License. -%> -const { pathsToModuleNameMapper } = require('ts-jest') +const { pathsToModuleNameMapper } = require('ts-jest'); -const { compilerOptions: { paths = {}, baseUrl = './' } } = require('./tsconfig.json'); +const { + compilerOptions: { paths = {}, baseUrl = './' }, +} = require('./tsconfig.json'); const environment = require('./webpack/environment'); module.exports = { diff --git a/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs index 43c7976e31dd..06beb24aa995 100644 --- a/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs @@ -55,8 +55,8 @@ export default class PasswordResetFinishComponent implements OnInit, AfterViewIn ngOnInit(): void { this.route.queryParams.subscribe(params => { - if (params['key']) { - this.key.set(params['key']); + if (params.key) { + this.key.set(params.key); } this.initialized.set(true); }); diff --git a/generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs b/generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs index baa6309464b8..35ca0ef0812e 100644 --- a/generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs @@ -21,25 +21,25 @@

__jhiTranslateTag__('register.title')

- @if (success()) { -
__jhiTranslateTag__('register.messages.success')
- } + @if (success()) { +
__jhiTranslateTag__('register.messages.success')
+ } - @if (error()) { -
__jhiTranslateTag__('register.messages.error.fail')
- } + @if (error()) { +
__jhiTranslateTag__('register.messages.error.fail')
+ } - @if (errorUserExists()) { -
__jhiTranslateTag__('register.messages.error.userexists')
- } + @if (errorUserExists()) { +
__jhiTranslateTag__('register.messages.error.userexists')
+ } - @if (errorEmailExists()) { -
__jhiTranslateTag__('register.messages.error.emailexists')
- } + @if (errorEmailExists()) { +
__jhiTranslateTag__('register.messages.error.emailexists')
+ } - @if (doNotMatch()) { -
__jhiTranslateTag__('global.messages.error.dontmatch')
- } + @if (doNotMatch()) { +
__jhiTranslateTag__('global.messages.error.dontmatch')
+ }
diff --git a/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs index 1dda325bcbc2..731016a92c58 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs @@ -130,7 +130,7 @@ export default class UserManagementComponent implements OnInit { combineLatest([this.activatedRoute.data, this.activatedRoute.queryParamMap]).subscribe(([data, params]) => { const page = params.get('page'); this.page = +(page ?? 1); - this.sortState.set(this.sortService.parseSortParam(params.get(SORT) ?? data['defaultSort'])); + this.sortState.set(this.sortService.parseSortParam(params.get(SORT) ?? data.defaultSort)); this.loadAll(); }); } diff --git a/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs index d487ee8d7471..afc0f1d03545 100644 --- a/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs @@ -36,7 +36,7 @@ export const UserRouteAccessService: CanActivateFn = (next: ActivatedRouteSnapsh return accountService.identity().pipe( map(account => { if (account) { - const authorities = next.data['authorities']; + const authorities = next.data.authorities; if (!authorities || authorities.length === 0 || accountService.hasAnyAuthority(authorities)) { return true; diff --git a/generators/angular/templates/src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts.ejs index 61d70040ac5f..7de3add2f2d9 100644 --- a/generators/angular/templates/src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts.ejs @@ -51,7 +51,7 @@ export class AuthExpiredInterceptor implements HttpInterceptor { <%_ } _%> } }, - }) + }), ); } } diff --git a/generators/angular/templates/src/main/webapp/app/core/interceptor/error-handler.interceptor.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/interceptor/error-handler.interceptor.ts.ejs index 6e1a22a90cf7..447b5b1d0068 100644 --- a/generators/angular/templates/src/main/webapp/app/core/interceptor/error-handler.interceptor.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/interceptor/error-handler.interceptor.ts.ejs @@ -35,7 +35,7 @@ export class ErrorHandlerInterceptor implements HttpInterceptor { this.eventManager.broadcast(new EventWithContent('<%= frontendAppName %>.httpError', err)); } }, - }) + }), ); } } diff --git a/generators/angular/templates/src/main/webapp/app/core/interceptor/notification.interceptor.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/interceptor/notification.interceptor.ts.ejs index 538c17e17e0e..1aeb681dded8 100644 --- a/generators/angular/templates/src/main/webapp/app/core/interceptor/notification.interceptor.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/interceptor/notification.interceptor.ts.ejs @@ -58,7 +58,7 @@ export class NotificationInterceptor implements HttpInterceptor { }); } } - }) + }), ); } } diff --git a/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs index dc41f189c243..6ba7d9c75d2a 100644 --- a/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs @@ -236,7 +236,7 @@ describe('Alert service test', () => { type: 'success', message: 'Hello Jhipster', position: 'bottom left', - } as Alert) + } as Alert), ); })); @@ -245,7 +245,7 @@ describe('Alert service test', () => { expect.objectContaining({ type: 'danger', message: 'Hello Jhipster', - } as Alert) + } as Alert), ); })); @@ -254,7 +254,7 @@ describe('Alert service test', () => { expect.objectContaining({ type: 'warning', message: 'Hello Jhipster', - } as Alert) + } as Alert), ); })); diff --git a/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs index 320ef3b7a8a7..9e917249d9b3 100644 --- a/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs @@ -295,6 +295,5 @@ describe('MainComponent', () => { <%_ } _%> }); -@Component({template: ''}) -export class BlankComponent { -} +@Component({ template: '' }) +export class BlankComponent {} diff --git a/generators/angular/templates/webpack/webpack.custom.js.ejs b/generators/angular/templates/webpack/webpack.custom.js.ejs index 748604bb131d..e6e5c187e1a7 100644 --- a/generators/angular/templates/webpack/webpack.custom.js.ejs +++ b/generators/angular/templates/webpack/webpack.custom.js.ejs @@ -179,7 +179,7 @@ module.exports = async (config, options, targetOptions) => { ); config = merge( - config + config, // jhipster-needle-add-webpack-config - JHipster will add custom config ); diff --git a/generators/client/templates/src/main/webapp/index.html.ejs b/generators/client/templates/src/main/webapp/index.html.ejs index 3cff205f77a9..6ef673175357 100644 --- a/generators/client/templates/src/main/webapp/index.html.ejs +++ b/generators/client/templates/src/main/webapp/index.html.ejs @@ -39,7 +39,8 @@ <%_ if (clientFrameworkAngular) { _%> @@ -49,8 +50,16 @@ <%_ } _%>
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/generators/react/templates/jest.conf.js.ejs b/generators/react/templates/jest.conf.js.ejs index 7f88be20c161..3f3411f67aff 100644 --- a/generators/react/templates/jest.conf.js.ejs +++ b/generators/react/templates/jest.conf.js.ejs @@ -3,11 +3,14 @@ const tsconfig = require('./tsconfig.test.json'); module.exports = { testEnvironment: 'jsdom', transform: { - '^.+\\.tsx?$': ['ts-jest', { - tsconfig: './tsconfig.test.json', - compiler: 'typescript', - diagnostics: false, - }], + '^.+\\.tsx?$': [ + 'ts-jest', + { + tsconfig: './tsconfig.test.json', + compiler: 'typescript', + diagnostics: false, + }, + ], }, testEnvironmentOptions: { url: 'http://localhost/', @@ -38,34 +41,34 @@ module.exports = { <%_ } _%> ...require('./webpack/environment'), DEVELOPMENT: false, - } + }, }; function mapTypescriptAliasToJestAlias(alias = {}) { - const jestAliases = { ...alias }; - if (!tsconfig.compilerOptions.paths) { - return jestAliases; - } - Object.entries(tsconfig.compilerOptions.paths) - .filter(([_key, value]) => { - // use Typescript alias in Jest only if this has value - if (value.length) { - return true; - } - return false; - }) - .map(([key, value]) => { - // if Typescript alias ends with /* then in Jest: - // - alias key must end with /(.*) - // - alias value must end with /$1 - const regexToReplace = /(.*)\/\*$/; - const aliasKey = key.replace(regexToReplace, '$1/(.*)'); - const aliasValue = value[0].replace(regexToReplace, '$1/$$1'); - return [aliasKey, `/${aliasValue}`]; - }) - .reduce((aliases, [key, value]) => { - aliases[key] = value; - return aliases; - }, jestAliases); + const jestAliases = { ...alias }; + if (!tsconfig.compilerOptions.paths) { return jestAliases; } + Object.entries(tsconfig.compilerOptions.paths) + .filter(([_key, value]) => { + // use Typescript alias in Jest only if this has value + if (value.length) { + return true; + } + return false; + }) + .map(([key, value]) => { + // if Typescript alias ends with /* then in Jest: + // - alias key must end with /(.*) + // - alias value must end with /$1 + const regexToReplace = /(.*)\/\*$/; + const aliasKey = key.replace(regexToReplace, '$1/(.*)'); + const aliasValue = value[0].replace(regexToReplace, '$1/$$1'); + return [aliasKey, `/${aliasValue}`]; + }) + .reduce((aliases, [key, value]) => { + aliases[key] = value; + return aliases; + }, jestAliases); + return jestAliases; +} diff --git a/generators/react/templates/src/main/webapp/app/_bootstrap-variables.scss.ejs b/generators/react/templates/src/main/webapp/app/_bootstrap-variables.scss.ejs index b062a6c35638..8046d74d04f5 100644 --- a/generators/react/templates/src/main/webapp/app/_bootstrap-variables.scss.ejs +++ b/generators/react/templates/src/main/webapp/app/_bootstrap-variables.scss.ejs @@ -26,23 +26,23 @@ <%_ if (clientThemeNone) { _%> // Options: // Quickly modify global styling by enabling or disabling optional features. -$enable-rounded: true; -$enable-shadows: false; -$enable-gradients: false; -$enable-transitions: true; -$enable-hover-media-query: false; -$enable-grid-classes: true; -$enable-print-styles: true; +$enable-rounded: true; +$enable-shadows: false; +$enable-gradients: false; +$enable-transitions: true; +$enable-hover-media-query: false; +$enable-grid-classes: true; +$enable-print-styles: true; // Components: // Define common padding and border radius sizes and more. -$border-radius: .15rem; -$border-radius-lg: .125rem; -$border-radius-sm: .1rem; +$border-radius: 0.15rem; +$border-radius-lg: 0.125rem; +$border-radius-sm: 0.1rem; // Body: // Settings for the `` element. -$body-bg: #ffffff; +$body-bg: #ffffff; <%_ } _%> diff --git a/generators/react/templates/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs b/generators/react/templates/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs index 0c74d56a9505..7855031595b6 100644 --- a/generators/react/templates/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs +++ b/generators/react/templates/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs @@ -50,38 +50,40 @@ export const PasswordResetInit = () => { } }, [successMessage]); - return ( -
- - -

Reset your password

- -

Enter the email address you used to register

- - - isEmail(v) || translate('global.messages.validate.email.invalid'), - }} - data-cy="emailResetPassword" - /> - - - - -
- ); -} + return ( +
+ + +

+ Reset your password +

+ +

+ Enter the email address you used to register +

+ + + isEmail(v) || translate('global.messages.validate.email.invalid'), + }} + data-cy="emailResetPassword" + /> + + + + +
+ ); +}; export default PasswordResetInit; diff --git a/generators/react/templates/src/main/webapp/app/modules/account/register/register.tsx.ejs b/generators/react/templates/src/main/webapp/app/modules/account/register/register.tsx.ejs index 3e889a1c1e9f..9014914613a4 100644 --- a/generators/react/templates/src/main/webapp/app/modules/account/register/register.tsx.ejs +++ b/generators/react/templates/src/main/webapp/app/modules/account/register/register.tsx.ejs @@ -37,7 +37,7 @@ export const RegisterPage = () => { () => () => { dispatch(reset()); }, - [] + [], ); <%_ if (enableTranslation) { _%> diff --git a/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.reducer.ts.ejs b/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.reducer.ts.ejs index 222c1e2d78eb..981a665a251b 100644 --- a/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.reducer.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.reducer.ts.ejs @@ -29,10 +29,10 @@ const initialState = { errorMessage: null, successMessage: null, updateSuccess: false, - updateFailure: false + updateFailure: false, }; -export type SettingsState = Readonly; +export type SettingsState = Readonly; // Actions const apiUrl = 'api/account'; diff --git a/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.spec.ts.ejs b/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.spec.ts.ejs index 13a6852f7d8f..f1dc78324305 100644 --- a/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.spec.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.spec.ts.ejs @@ -98,9 +98,9 @@ describe('Administration reducer tests', () => { state => { expect(state).toMatchObject({ errorMessage: null, - loading: true + loading: true, }); - } + }, ); }); }); @@ -130,7 +130,7 @@ describe('Administration reducer tests', () => { }, { message: 'error', - } + }, ); }); }); @@ -161,7 +161,7 @@ describe('Administration reducer tests', () => { expect(toTest).toMatchObject({ loading: false, - logs: payload.data + logs: payload.data, }); }); @@ -216,8 +216,8 @@ describe('Administration reducer tests', () => { loading: false, configuration: { configProps: {}, - env: payload.data - } + env: payload.data, + }, }); }); <%_ } _%> diff --git a/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs b/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs index d37dafdfd962..fab56b92049e 100644 --- a/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs @@ -85,7 +85,7 @@ export const setLoggers = createAsyncThunk( async ({ name, configuredLevel }: any) => axios.post(`management/loggers/${name}`, { configuredLevel }), { serializeError: serializeAxiosError, - } + }, ); export const changeLogLevel: (name, configuredLevel) => AppThunk = (name, configuredLevel) => async dispatch => { @@ -93,9 +93,13 @@ export const changeLogLevel: (name, configuredLevel) => AppThunk = (name, config dispatch(getLoggers()); }; -export const getConfigurations = createAsyncThunk('administration/fetch_configurations', async () => axios.get('management/configprops'), { - serializeError: serializeAxiosError, -}); +export const getConfigurations = createAsyncThunk( + 'administration/fetch_configurations', + async () => axios.get('management/configprops'), + { + serializeError: serializeAxiosError, + }, +); export const getEnv = createAsyncThunk('administration/fetch_env', async () => axios.get('management/env'), { serializeError: serializeAxiosError, diff --git a/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs b/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs index 014d9a738df2..c100d20c39f7 100644 --- a/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +++ b/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs @@ -156,8 +156,7 @@ export const UserManagement = () => { - { - users.map((user, i) => ( + {users.map((user, i) => ( ) : ( - )} diff --git a/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs b/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs index 9af383c92d4d..01d1c87e0b82 100644 --- a/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs +++ b/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs @@ -44,7 +44,9 @@ export const Home = () => ( - Home + + Home + ); diff --git a/generators/react/templates/src/main/webapp/app/shared/layout/header/header.spec.tsx.ejs b/generators/react/templates/src/main/webapp/app/shared/layout/header/header.spec.tsx.ejs index 3c6c9a919198..b06bc72cfee5 100644 --- a/generators/react/templates/src/main/webapp/app/shared/layout/header/header.spec.tsx.ejs +++ b/generators/react/templates/src/main/webapp/app/shared/layout/header/header.spec.tsx.ejs @@ -34,22 +34,22 @@ describe('Header', () => { <%_ } _%> ribbonEnv: 'dev', isInProduction: false, - isOpenAPIEnabled: true + isOpenAPIEnabled: true, }; const prodProps = { ...devProps, ribbonEnv: 'prod', isInProduction: true, - isOpenAPIEnabled: false + isOpenAPIEnabled: false, }; const userProps = { ...prodProps, - isAdmin: false + isAdmin: false, }; const guestProps = { ...prodProps, isAdmin: false, - isAuthenticated: false + isAuthenticated: false, }; const wrapper = (props = devProps) => { diff --git a/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs b/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs index 40815753eab6..19a7b6da0e35 100644 --- a/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs @@ -70,10 +70,10 @@ describe('Authentication reducer tests', () => { describe('Requests', () => { it('should detect a request', () => { expect(authentication(undefined, { type: authenticate.pending.type })).toMatchObject({ - loading: true + loading: true, }); expect(authentication(undefined, { type: getAccount.pending.type })).toMatchObject({ - loading: true + loading: true, }); }); }); @@ -87,7 +87,7 @@ describe('Authentication reducer tests', () => { loading: false, loginError: false, loginSuccess: true, - showModalLogin: false + showModalLogin: false, }); }); <%_ } _%> @@ -122,7 +122,7 @@ describe('Authentication reducer tests', () => { expect(toTest).toMatchObject({ errorMessage: error.message, showModalLogin: true, - loginError: true + loginError: true, }); expect(isAccountEmpty(toTest)); }); @@ -257,15 +257,12 @@ describe('Authentication reducer tests', () => { <%_ if (authenticationTypeJwt) { _%> describe('clearAuthToken', () => { let store; - const reducer = createReducer( - { authentication: { account: { langKey: 'en' } } }, - (builder) => { - builder.addDefaultCase(() => {}) - } - ); + const reducer = createReducer({ authentication: { account: { langKey: 'en' } } }, builder => { + builder.addDefaultCase(() => {}); + }); beforeEach(() => { store = configureStore({ - reducer + reducer, }); }); it('clears the session token on clearAuthToken', async () => { diff --git a/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.ts.ejs b/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.ts.ejs index ae2984ae7dc7..c103524e8780 100644 --- a/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.ts.ejs @@ -45,7 +45,7 @@ export const initialState = { logoutUrl: null as unknown as string, }; -export type AuthenticationState = Readonly; +export type AuthenticationState = Readonly; // Actions diff --git a/generators/react/templates/src/main/webapp/app/shared/util/entity-utils.ts.ejs b/generators/react/templates/src/main/webapp/app/shared/util/entity-utils.ts.ejs index 68f50c57f507..7dce0ba7bbc9 100644 --- a/generators/react/templates/src/main/webapp/app/shared/util/entity-utils.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/shared/util/entity-utils.ts.ejs @@ -27,7 +27,7 @@ import { IPaginationBaseState, ISortBaseState } from 'react-jhipster'; * @param entity Object to clean. */ export const cleanEntity = entity => { - const keysToKeep = Object.keys(entity).filter(k => !(entity[k] instanceof Object) || (entity[k]['id'] !== '' && entity[k]['id'] !== -1)); + const keysToKeep = Object.keys(entity).filter(k => !(entity[k] instanceof Object) || (entity[k].id !== '' && entity[k].id !== -1)); return pick(entity, keysToKeep); }; diff --git a/generators/react/templates/src/main/webapp/app/typings.d.ts.ejs b/generators/react/templates/src/main/webapp/app/typings.d.ts.ejs index 14a3b3d0c064..7a1dd34e661a 100644 --- a/generators/react/templates/src/main/webapp/app/typings.d.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/typings.d.ts.ejs @@ -24,8 +24,8 @@ declare const I18N_HASH: string; <%_ } _%> declare module '*.json' { - const value: any; - export default value; + const value: any; + export default value; } <%_ if (applicationTypeGateway && microfrontend) { _%> diff --git a/generators/react/templates/webpack/environment.js.ejs b/generators/react/templates/webpack/environment.js.ejs index 6573e4518af3..87789bc80f94 100644 --- a/generators/react/templates/webpack/environment.js.ejs +++ b/generators/react/templates/webpack/environment.js.ejs @@ -31,5 +31,5 @@ module.exports = { // If this URL is left empty (""), then it will be relative to the current context. // If you use an API server, in `prod` mode, you will need to enable CORS // (see the `jhipster.cors` common JHipster property in the `application-*.yml` configurations) - SERVER_API_URL: '' + SERVER_API_URL: '', }; diff --git a/generators/spring-boot/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs index b6192ecbd250..b1c14094f21c 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs @@ -50,9 +50,11 @@ public class LoggingAspect { /** * Pointcut that matches all repositories, services and Web REST endpoints. */ - @Pointcut("within(@org.springframework.stereotype.Repository *)" + + @Pointcut( + "within(@org.springframework.stereotype.Repository *)" + " || within(@org.springframework.stereotype.Service *)" + - " || within(@org.springframework.web.bind.annotation.RestController *)") + " || within(@org.springframework.web.bind.annotation.RestController *)" + ) public void springBeanPointcut() { // Method is empty as this is just a Pointcut, the implementations are in the advices. } diff --git a/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs index 62fb00751d52..8c0732901b13 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs @@ -186,7 +186,9 @@ public class SecurityConfiguration { @Bean public ReactiveAuthenticationManager reactiveAuthenticationManager(ReactiveUserDetailsService userDetailsService) { - UserDetailsRepositoryReactiveAuthenticationManager authenticationManager = new UserDetailsRepositoryReactiveAuthenticationManager(userDetailsService); + UserDetailsRepositoryReactiveAuthenticationManager authenticationManager = new UserDetailsRepositoryReactiveAuthenticationManager( + userDetailsService + ); authenticationManager.setPasswordEncoder(passwordEncoder()); return authenticationManager; } @@ -195,8 +197,7 @@ public class SecurityConfiguration { @Bean public MapReactiveUserDetailsService userDetailsService(SecurityProperties properties) { SecurityProperties.User user = properties.getUser(); - UserDetails userDetails = User - .withUsername(user.getName()) + UserDetails userDetails = User.withUsername(user.getName()) .password("{noop}" + user.getPassword()) .roles(StringUtils.toStringArray(user.getRoles())) .build(); @@ -419,8 +420,7 @@ public class SecurityConfiguration { return new ReactiveJwtDecoder() { @Override public Mono decode(String token) throws JwtException { - return jwtDecoder.decode(token) - .flatMap(jwt -> enrich(token, jwt)); + return jwtDecoder.decode(token).flatMap(jwt -> enrich(token, jwt)); } private Mono enrich(String token, Jwt jwt) { @@ -429,17 +429,15 @@ public class SecurityConfiguration { return Mono.just(jwt); } // Get user info from `users` cache if present - return Optional.ofNullable(users.getIfPresent(jwt.getSubject())) - // Retrieve user info from OAuth provider if not already loaded - .orElseGet(() -> WebClient.create() + return Optional.ofNullable(users.getIfPresent(jwt.getSubject())).orElseGet(() -> // Retrieve user info from OAuth provider if not already loaded + WebClient.create() .get() .uri(userInfoUri) .headers(headers -> headers.setBearerAuth(token)) .retrieve() .bodyToMono(new ParameterizedTypeReference>() {}) .map(userInfo -> - Jwt - .withTokenValue(jwt.getTokenValue()) + Jwt.withTokenValue(jwt.getTokenValue()) .subject(jwt.getSubject()) .audience(jwt.getAudience()) .headers(headers -> headers.putAll(jwt.getHeaders())) @@ -464,7 +462,7 @@ public class SecurityConfiguration { ) // Put user info into the `users` cache .doOnNext(newJwt -> users.put(jwt.getSubject(), Mono.just(newJwt))) - ); + ); } }; } diff --git a/generators/spring-boot/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs index 0b7693d2d46b..97713022d533 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs @@ -60,7 +60,7 @@ public class SecurityJwtConfiguration { if (e.getMessage().contains("Jwt expired at")) { metersService.trackTokenExpired(); } else if (e.getMessage().contains("Failed to validate the token")) { - metersService.trackTokenInvalidSignature(); + metersService.trackTokenInvalidSignature(); } else if ( e.getMessage().contains("Invalid JWT serialization:") || e.getMessage().contains("Invalid unsecured/JWS/JWE header:") diff --git a/generators/spring-boot/templates/src/main/java/_package_/config/WebConfigurer.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/WebConfigurer.java.ejs index b5d3f5d40373..9517d2f62537 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/config/WebConfigurer.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/config/WebConfigurer.java.ejs @@ -178,7 +178,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia public <% if (reactive) { %>CorsConfigurationSource corsConfigurationSource()<% } else { %>CorsFilter corsFilter()<% } %> { UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); CorsConfiguration config = jHipsterProperties.getCors(); - if (!CollectionUtils.isEmpty(config.getAllowedOrigins()) || ! CollectionUtils.isEmpty(config.getAllowedOriginPatterns())) { + if (!CollectionUtils.isEmpty(config.getAllowedOrigins()) || !CollectionUtils.isEmpty(config.getAllowedOriginPatterns())) { LOG.debug("Registering CORS filter"); source.registerCorsConfiguration("/api/**", config); source.registerCorsConfiguration("/management/**", config); diff --git a/generators/spring-boot/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs index 4d06fb7aac7b..b022316a8a2f 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs @@ -27,7 +27,8 @@ import io.micrometer.core.instrument.MeterRegistry; public class SecurityMetersService { public static final String INVALID_TOKENS_METER_NAME = "security.authentication.invalid-tokens"; - public static final String INVALID_TOKENS_METER_DESCRIPTION = "Indicates validation error count of the tokens presented by the clients."; + public static final String INVALID_TOKENS_METER_DESCRIPTION = + "Indicates validation error count of the tokens presented by the clients."; public static final String INVALID_TOKENS_METER_BASE_UNIT = "errors"; public static final String INVALID_TOKENS_METER_CAUSE_DIMENSION = "cause"; diff --git a/generators/spring-boot/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs index cd593704c402..14851ba0e9e3 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs @@ -225,8 +225,9 @@ public class PersistentTokenRememberMeServices extends AbstractRememberMeService */ private PersistentToken getPersistentToken(String[] cookieTokens) { if (cookieTokens.length != 2) { - throw new InvalidCookieException("Cookie token did not contain " + 2 + - " tokens, but contained '" + Arrays.asList(cookieTokens) + "'"); + throw new InvalidCookieException( + "Cookie token did not contain " + 2 + " tokens, but contained '" + Arrays.asList(cookieTokens) + "'" + ); } String presentedSeries = cookieTokens[0]; String presentedToken = cookieTokens[1]; diff --git a/generators/spring-boot/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs index 6f1f3b774ccb..7bbcafcc58e6 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs @@ -27,8 +27,8 @@ import org.springframework.security.oauth2.jwt.Jwt; import org.springframework.util.Assert; import java.util.List; - public class AudienceValidator implements OAuth2TokenValidator { + private static final Logger LOG = LoggerFactory.getLogger(AudienceValidator.class); private final OAuth2Error error = new OAuth2Error("invalid_token", "The required audience is missing", null); diff --git a/generators/spring-boot/templates/src/main/java/_package_/service/MailService.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/MailService.java.ejs index 21879b927f14..60a017b6a538 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/service/MailService.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/service/MailService.java.ejs @@ -97,8 +97,14 @@ public class MailService { } private void sendEmailSync(String to, String subject, String content, boolean isMultipart, boolean isHtml) { - LOG.debug("Send email[multipart '{}' and html '{}'] to '{}' with subject '{}' and content={}", - isMultipart, isHtml, to, subject, content); + LOG.debug( + "Send email[multipart '{}' and html '{}'] to '{}' with subject '{}' and content={}", + isMultipart, + isHtml, + to, + subject, + content + ); // Prepare message using a Spring helper MimeMessage mimeMessage = javaMailSender.createMimeMessage(); diff --git a/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs index 3f4c271fb47c..5bfc4c1e6bd5 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs @@ -342,8 +342,10 @@ public class AccountResource { } private static boolean isPasswordLengthInvalid(String password) { - return StringUtils.isEmpty(password) || + return ( + StringUtils.isEmpty(password) || password.length() < ManagedUserVM.PASSWORD_MIN_LENGTH || - password.length() > ManagedUserVM.PASSWORD_MAX_LENGTH; + password.length() > ManagedUserVM.PASSWORD_MAX_LENGTH + ); } } diff --git a/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs index a44f55f7e1c0..2f8eef5a6a51 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs @@ -240,17 +240,13 @@ _%> // Let the ErrorResponse take this responsibility if (throwable instanceof ErrorResponse err) return HttpStatus.valueOf(err.getBody().getStatus()); - return Optional - .ofNullable(getMappedStatus(throwable)) - .orElse(Optional - .ofNullable(resolveResponseStatus(throwable)) - .map(ResponseStatus::value) - .orElse(HttpStatus.INTERNAL_SERVER_ERROR)); + return Optional.ofNullable(getMappedStatus(throwable)).orElse( + Optional.ofNullable(resolveResponseStatus(throwable)).map(ResponseStatus::value).orElse(HttpStatus.INTERNAL_SERVER_ERROR) + ); } private ResponseStatus extractResponseStatus(final Throwable throwable) { - return Optional.ofNullable(resolveResponseStatus(throwable)) - .orElse(null); + return Optional.ofNullable(resolveResponseStatus(throwable)).orElse(null); } private ResponseStatus resolveResponseStatus(final Throwable type) { diff --git a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs index c9e272fafaa3..7ddc72f7a510 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs @@ -1889,7 +1889,7 @@ _%> } protected void assertSameRepositoryCount(long countBefore) { - assertThat(countBefore).isEqualTo(getRepositoryCount()); + assertThat(countBefore).isEqualTo(getRepositoryCount()); } protected <%- persistClass %> getPersisted<%- persistClass %>(<%- persistClass %> <%- entityInstance %>) { diff --git a/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs index a385cd5ba420..8f353b543acf 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs @@ -91,12 +91,14 @@ class SecurityUtilsUnitTest { Map claims = new HashMap<>(); claims.put("groups", Arrays.asList(AuthoritiesConstants.ADMIN, AuthoritiesConstants.USER)); - List expectedAuthorities = Arrays.asList(new SimpleGrantedAuthority(AuthoritiesConstants.ADMIN), new SimpleGrantedAuthority(AuthoritiesConstants.USER)); + List expectedAuthorities = Arrays.asList( + new SimpleGrantedAuthority(AuthoritiesConstants.ADMIN), + new SimpleGrantedAuthority(AuthoritiesConstants.USER) + ); List authorities = SecurityUtils.extractAuthorityFromClaims(claims); - assertThat(authorities).isNotNull().isNotEmpty().hasSize(2) - .containsAll(expectedAuthorities); + assertThat(authorities).isNotNull().isNotEmpty().hasSize(2).containsAll(expectedAuthorities); } @Test diff --git a/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs index 30daf3c349e8..7f6f34fd0f96 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs @@ -48,11 +48,7 @@ class SecurityUtilsUnitTest { @Test void testgetCurrentUserLogin() { String login = SecurityUtils.getCurrentUserLogin() - .contextWrite( - ReactiveSecurityContextHolder.withAuthentication( - new UsernamePasswordAuthenticationToken("admin", "admin") - ) - ) + .contextWrite(ReactiveSecurityContextHolder.withAuthentication(new UsernamePasswordAuthenticationToken("admin", "admin"))) .block(); assertThat(login).isEqualTo("admin"); } @@ -61,11 +57,7 @@ class SecurityUtilsUnitTest { @Test void testgetCurrentUserJWT() { String jwt = SecurityUtils.getCurrentUserJWT() - .contextWrite( - ReactiveSecurityContextHolder.withAuthentication( - new UsernamePasswordAuthenticationToken("admin", "token") - ) - ) + .contextWrite(ReactiveSecurityContextHolder.withAuthentication(new UsernamePasswordAuthenticationToken("admin", "token"))) .block(); assertThat(jwt).isEqualTo("token"); } @@ -74,11 +66,7 @@ class SecurityUtilsUnitTest { @Test void testIsAuthenticated() { Boolean isAuthenticated = SecurityUtils.isAuthenticated() - .contextWrite( - ReactiveSecurityContextHolder.withAuthentication( - new UsernamePasswordAuthenticationToken("admin", "admin") - ) - ) + .contextWrite(ReactiveSecurityContextHolder.withAuthentication(new UsernamePasswordAuthenticationToken("admin", "admin"))) .block(); assertThat(isAuthenticated).isTrue(); } diff --git a/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs index 7733528d5fb3..1a8f96f1f0bf 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs @@ -324,7 +324,7 @@ class AccountResourceIT { <%_ } _%> void testRegisterInvalidLogin() throws Exception { ManagedUserVM invalidUser = new ManagedUserVM(); - invalidUser.setLogin("funky-log(n");// <-- invalid + invalidUser.setLogin("funky-log(n"); // <-- invalid invalidUser.setPassword("password"); invalidUser.setFirstName("Funky"); invalidUser.setLastName("One"); @@ -360,9 +360,9 @@ class AccountResourceIT { static Stream invalidUsers() { return Stream.of( - createInvalidUser("bob", "password", "Bob", "Green", "invalid", true),// <-- invalid - createInvalidUser("bob", "123", "Bob", "Green", "bob@example.com", true),// password with only 3 digits - createInvalidUser("bob", null, "Bob", "Green", "bob@example.com", true)// invalid null password + createInvalidUser("bob", "password", "Bob", "Green", "invalid", true), // <-- invalid + createInvalidUser("bob", "123", "Bob", "Green", "bob@example.com", true), // password with only 3 digits + createInvalidUser("bob", null, "Bob", "Green", "bob@example.com", true) // invalid null password ); } @@ -391,7 +391,14 @@ class AccountResourceIT { assertThat(user).isEmpty(); } - private static ManagedUserVM createInvalidUser(String login, String password, String firstName, String lastName, String email, boolean activated) { + private static ManagedUserVM createInvalidUser( + String login, + String password, + String firstName, + String lastName, + String email, + boolean activated + ) { ManagedUserVM invalidUser = new ManagedUserVM(); invalidUser.setLogin(login); invalidUser.setPassword(password); diff --git a/generators/spring-boot/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs index e463ec569bf2..0d5abfb494b8 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs @@ -28,12 +28,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -@Target({ElementType.METHOD, ElementType.TYPE}) +@Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) @WithSecurityContext(factory = WithUnauthenticatedMockUser.Factory.class) public @interface WithUnauthenticatedMockUser { - class Factory implements WithSecurityContextFactory { + @Override public SecurityContext createSecurityContext(WithUnauthenticatedMockUser annotation) { return SecurityContextHolder.createEmptyContext(); diff --git a/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs index 9bde4032e725..20c4f5bbe7c4 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs @@ -128,34 +128,51 @@ class ExceptionTranslatorIT { @Test void testMethodNotSupported() { - webTestClient.post().uri("/api/exception-translator-test/access-denied") + webTestClient + .post() + .uri("/api/exception-translator-test/access-denied") .exchange() - .expectStatus().isEqualTo(HttpStatus.METHOD_NOT_ALLOWED) - .expectHeader().contentType(MediaType.APPLICATION_PROBLEM_JSON) + .expectStatus() + .isEqualTo(HttpStatus.METHOD_NOT_ALLOWED) + .expectHeader() + .contentType(MediaType.APPLICATION_PROBLEM_JSON) .expectBody() - .jsonPath("$.message").isEqualTo("error.http.405") - .jsonPath("$.detail").isEqualTo("405 METHOD_NOT_ALLOWED \"Request method 'POST' is not supported.\""); + .jsonPath("$.message") + .isEqualTo("error.http.405") + .jsonPath("$.detail") + .isEqualTo("405 METHOD_NOT_ALLOWED \"Request method 'POST' is not supported.\""); } @Test void testExceptionWithResponseStatus() { - webTestClient.get().uri("/api/exception-translator-test/response-status") + webTestClient + .get() + .uri("/api/exception-translator-test/response-status") .exchange() - .expectStatus().isBadRequest() - .expectHeader().contentType(MediaType.APPLICATION_PROBLEM_JSON) + .expectStatus() + .isBadRequest() + .expectHeader() + .contentType(MediaType.APPLICATION_PROBLEM_JSON) .expectBody() - .jsonPath("$.message").isEqualTo("error.http.400") - .jsonPath("$.title").isEqualTo("test response status"); + .jsonPath("$.message") + .isEqualTo("error.http.400") + .jsonPath("$.title") + .isEqualTo("test response status"); } @Test void testInternalServerError() { - webTestClient.get().uri("/api/exception-translator-test/internal-server-error") + webTestClient + .get() + .uri("/api/exception-translator-test/internal-server-error") .exchange() - .expectHeader().contentType(MediaType.APPLICATION_PROBLEM_JSON) + .expectHeader() + .contentType(MediaType.APPLICATION_PROBLEM_JSON) .expectBody() - .jsonPath("$.message").isEqualTo("error.http.500") - .jsonPath("$.title").isEqualTo("Internal Server Error"); + .jsonPath("$.message") + .isEqualTo("error.http.500") + .jsonPath("$.title") + .isEqualTo("Internal Server Error"); } } diff --git a/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs b/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs index a1bfbe4a864d..e57a066a89bc 100644 --- a/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs +++ b/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs @@ -49,8 +49,7 @@ public class SqlTestContainersSpringContextCustomizerFactory implements ContextC public ContextCustomizer createContextCustomizer(Class testClass, List configAttributes) { return new ContextCustomizer() { @Override - public void customizeContext(ConfigurableApplicationContext context, - MergedContextConfiguration mergedConfig) { + public void customizeContext(ConfigurableApplicationContext context, MergedContextConfiguration mergedConfig) { ConfigurableListableBeanFactory beanFactory = context.getBeanFactory(); TestPropertyValues testValues = TestPropertyValues.empty(); EmbeddedSQL sqlAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedSQL.class); diff --git a/generators/vue/templates/src/main/webapp/app/account/account.service.ts.ejs b/generators/vue/templates/src/main/webapp/app/account/account.service.ts.ejs index 237229c3c47d..8f03c33666a2 100644 --- a/generators/vue/templates/src/main/webapp/app/account/account.service.ts.ejs +++ b/generators/vue/templates/src/main/webapp/app/account/account.service.ts.ejs @@ -18,7 +18,7 @@ export default class AccountService { const res = await axios.get('management/info'); if (res.data && res.data.activeProfiles) { this.store.setRibbonOnProfiles(res.data['display-ribbon-on-profiles']); - this.store.setActiveProfiles(res.data['activeProfiles']); + this.store.setActiveProfiles(res.data.activeProfiles); } return true; } catch (error) { diff --git a/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.component.spec.ts.ejs b/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.component.spec.ts.ejs index 104ae682ec5b..92f274a0aaac 100644 --- a/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.component.spec.ts.ejs +++ b/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.component.spec.ts.ejs @@ -97,11 +97,13 @@ describe('LoginForm Component', () => { await loginForm.$nextTick(); // THEN - expect(axiosStub.post.calledWith('api/authenticate', { - username: 'login', - password: 'pwd', - rememberMe: true - })).toBeTruthy(); + expect( + axiosStub.post.calledWith('api/authenticate', { + username: 'login', + password: 'pwd', + rememberMe: true, + }), + ).toBeTruthy(); expect(loginForm.authenticationError).toBeFalsy(); expect(localStorage.getItem('<%=jhiPrefixDashed %>-authenticationToken')).toEqual(jwtSecret); diff --git a/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.vue.ejs b/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.vue.ejs index db7b673d2bdf..f9a82cecd175 100644 --- a/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.vue.ejs +++ b/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.vue.ejs @@ -42,8 +42,12 @@ <%_ if (generateUserManagement) { _%>
- Did you forget your password?Did you forget your password?
diff --git a/generators/vue/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs b/generators/vue/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs index 65f809aeeedc..145372a363cd 100644 --- a/generators/vue/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs +++ b/generators/vue/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs @@ -72,7 +72,7 @@ describe('Register Component', () => { langKey: '<%= nativeLanguage %>', login: 'jhi', password: 'jhipster', - }) + }), ).toBeTruthy(); expect(register.success).toBe(true); expect(register.error).toBe(null); diff --git a/generators/vue/templates/src/main/webapp/app/account/settings/settings.vue.ejs b/generators/vue/templates/src/main/webapp/app/account/settings/settings.vue.ejs index 43e766ad6ad2..ae8ff86702dc 100644 --- a/generators/vue/templates/src/main/webapp/app/account/settings/settings.vue.ejs +++ b/generators/vue/templates/src/main/webapp/app/account/settings/settings.vue.ejs @@ -16,75 +16,132 @@ Settings saved!
- diff --git a/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs index c85e5b206975..8863770d6d44 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs @@ -76,8 +76,8 @@ describe('User Management Component', () => { new HttpResponse({ body: [new User(<%- tsKeyId %>)], headers, - }) - ) + }), + ), ); // WHEN diff --git a/generators/angular/templates/src/main/webapp/app/config/translation.config.ts.ejs b/generators/angular/templates/src/main/webapp/app/config/translation.config.ts.ejs index 5213fcfda27e..7f763c383a22 100644 --- a/generators/angular/templates/src/main/webapp/app/config/translation.config.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/config/translation.config.ts.ejs @@ -24,7 +24,7 @@ export const translationNotFoundMessage = 'translation-not-found'; export class MissingTranslationHandlerImpl implements MissingTranslationHandler { handle(params: MissingTranslationHandlerParams): string { - const key = params.key; + const { key } = params; return `${translationNotFoundMessage}[${key}]`; } } diff --git a/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs index afc0f1d03545..41c659a96da5 100644 --- a/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs @@ -36,7 +36,7 @@ export const UserRouteAccessService: CanActivateFn = (next: ActivatedRouteSnapsh return accountService.identity().pipe( map(account => { if (account) { - const authorities = next.data.authorities; + const { authorities } = next.data; if (!authorities || authorities.length === 0 || accountService.hasAnyAuthority(authorities)) { return true; @@ -56,6 +56,6 @@ export const UserRouteAccessService: CanActivateFn = (next: ActivatedRouteSnapsh loginService.login(); <%_ } _%> return false; - }) + }), ); }; diff --git a/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs index 6ba7d9c75d2a..974453e12a09 100644 --- a/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs @@ -263,7 +263,7 @@ describe('Alert service test', () => { expect.objectContaining({ type: 'info', message: 'Hello Jhipster', - } as Alert) + } as Alert), ); })); diff --git a/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs index c3afb733558d..a901917c92bf 100644 --- a/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs @@ -89,7 +89,7 @@ export class DataUtils { }; observer.error(error); } else { - const fieldContentType = field + 'ContentType'; + const fieldContentType = `${field}ContentType`; this.toBase64(file, (base64Data: string) => { editForm.patchValue({ [field]: base64Data, @@ -143,6 +143,6 @@ export class DataUtils { } private formatAsBytes(size: number): string { - return size.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ' ') + ' bytes'; // NOSONAR + return `${size.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ' ')} bytes`; // NOSONAR } } diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.routes.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.routes.ts.ejs index 237a135ca29b..ffbce36583f1 100644 --- a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.routes.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.routes.ts.ejs @@ -39,7 +39,7 @@ const <%= entityInstance %>Route: Routes = [ authorities: [<%- entityAngularReadAuthorities %>], <%_ } _%> }, - canActivate: [UserRouteAccessService] + canActivate: [UserRouteAccessService], }, { path: ':<%= primaryKey.name %>/view', diff --git a/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs index 9e917249d9b3..a11d9ac0a17f 100644 --- a/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs @@ -179,7 +179,7 @@ describe('MainComponent', () => { translateService.onLangChange.emit(langChangeEvent); // THEN - expect(document.title).toBe(defaultPageTitle + ' translated'); + expect(document.title).toBe(`${defaultPageTitle} translated`); }); it('should set page title to root route pageTitle if there is no child routes', fakeAsync(() => { @@ -192,7 +192,7 @@ describe('MainComponent', () => { tick(); // THEN - expect(document.title).toBe(parentRoutePageTitle + ' translated'); + expect(document.title).toBe(`${parentRoutePageTitle} translated`); // GIVEN document.title = 'other title'; @@ -201,7 +201,7 @@ describe('MainComponent', () => { translateService.onLangChange.emit(langChangeEvent); // THEN - expect(document.title).toBe(parentRoutePageTitle + ' translated'); + expect(document.title).toBe(`${parentRoutePageTitle} translated`); })); it('should set page title to child route pageTitle if child routes exist and pageTitle is set for child route', fakeAsync(() => { @@ -219,7 +219,7 @@ describe('MainComponent', () => { tick(); // THEN - expect(document.title).toBe(childRoutePageTitle + ' translated'); + expect(document.title).toBe(`${childRoutePageTitle} translated`); // GIVEN document.title = 'other title'; @@ -228,7 +228,7 @@ describe('MainComponent', () => { translateService.onLangChange.emit(langChangeEvent); // THEN - expect(document.title).toBe(childRoutePageTitle + ' translated'); + expect(document.title).toBe(`${childRoutePageTitle} translated`); })); it('should set page title to parent route pageTitle if child routes exists but pageTitle is not set for child route data', fakeAsync(() => { @@ -246,7 +246,7 @@ describe('MainComponent', () => { tick(); // THEN - expect(document.title).toBe(parentRoutePageTitle + ' translated'); + expect(document.title).toBe(`${parentRoutePageTitle} translated`); // GIVEN document.title = 'other title'; @@ -255,7 +255,7 @@ describe('MainComponent', () => { translateService.onLangChange.emit(langChangeEvent); // THEN - expect(document.title).toBe(parentRoutePageTitle + ' translated'); + expect(document.title).toBe(`${parentRoutePageTitle} translated`); })); }); <%_ } _%> diff --git a/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs b/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs index 9e7885ee4aa9..95594c59332d 100644 --- a/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs @@ -62,7 +62,9 @@ <%_ if (generateUserManagement) { _%>
- __jhiTranslateTag__('login.password.forgot') + __jhiTranslateTag__('login.password.forgot')
diff --git a/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs index c1cc87e9f88a..771beebc045f 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs @@ -138,7 +138,7 @@ export class AlertErrorComponent implements OnDestroy { } private handleFieldsError(httpErrorResponse: HttpErrorResponse): void { - const fieldErrors = httpErrorResponse.error.fieldErrors; + const { fieldErrors } = httpErrorResponse.error; for (const fieldError of fieldErrors) { if (['Min', 'Max', 'DecimalMin', 'DecimalMax'].includes(fieldError.message)) { fieldError.message = 'Size'; diff --git a/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs index fad713d02817..91477220cbcb 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs @@ -26,7 +26,7 @@ export class FilterOption implements IFilterOption { } nameAsQueryParam(): string { - return 'filter[' + this.name + ']'; + return `filter[${this.name}]`; } isSet(): boolean { diff --git a/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs index 1410fab0b88c..66d86f716c4d 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs @@ -47,7 +47,7 @@ export class LazyTranslationModule { private stateStorageService = inject(StateStorageService); constructor() { - const currentLang = this.translateService.store.currentLang; + const { currentLang } = this.translateService.store; this.translateLoader.getTranslation(currentLang).subscribe(translation => { this.translateService.setTranslation(currentLang, translation); }); diff --git a/generators/angular/templates/webpack/webpack.custom.js.ejs b/generators/angular/templates/webpack/webpack.custom.js.ejs index e6e5c187e1a7..a6f471ac8449 100644 --- a/generators/angular/templates/webpack/webpack.custom.js.ejs +++ b/generators/angular/templates/webpack/webpack.custom.js.ejs @@ -27,7 +27,7 @@ const postcssRTLCSS = require('postcss-rtlcss'); <%_ } _%> <%_ } _%> const BrowserSyncPlugin = require('browser-sync-webpack-plugin'); -const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; +const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer'); const WebpackNotifierPlugin = require('webpack-notifier'); const CopyWebpackPlugin = require('copy-webpack-plugin'); const ESLintPlugin = require('eslint-webpack-plugin'); @@ -54,7 +54,7 @@ module.exports = async (config, options, targetOptions) => { new WebpackNotifierPlugin({ title: '<%= humanizedBaseName %>', contentImage: path.join(__dirname, 'logo-jhipster.png'), - }) + }), ); } diff --git a/generators/client/templates/src/main/webapp/index.html.ejs b/generators/client/templates/src/main/webapp/index.html.ejs index 6ef673175357..9aa99012747f 100644 --- a/generators/client/templates/src/main/webapp/index.html.ejs +++ b/generators/client/templates/src/main/webapp/index.html.ejs @@ -85,15 +85,22 @@

If you have a question on how to use JHipster

- Go to Stack Overflow with the "jhipster" tag. + Go to Stack Overflow with the + "jhipster" tag.

If you have a bug or a feature request

- First read our contributing guidelines. + First read our + contributing guidelines.

- Then, fill a ticket on our bug tracker, we'll be happy to resolve your issue! + Then, fill a ticket on our + bug tracker, we'll be happy to resolve your issue!

If you want to chat with contributors and other users

diff --git a/generators/client/templates/src/main/webapp/swagger-ui/index.html.ejs b/generators/client/templates/src/main/webapp/swagger-ui/index.html.ejs index 50ba45a35514..b6e6fcaad7bc 100644 --- a/generators/client/templates/src/main/webapp/swagger-ui/index.html.ejs +++ b/generators/client/templates/src/main/webapp/swagger-ui/index.html.ejs @@ -173,10 +173,7 @@ req.headers['Authorization'] = getBearerToken(); <%_ } _%> // Remove the sample Swagger UI request body if present - if ( - req.method === 'GET' && - req.body === '{"additionalProp1":"string","additionalProp2":"string","additionalProp3":"string"}' - ) { + if (req.method === 'GET' && req.body === '{"additionalProp1":"string","additionalProp2":"string","additionalProp3":"string"}') { req.body = undefined; } return req; From 616351a020f74e060a8ba811f2ec1c00064f3443 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 12 Aug 2024 11:11:00 -0300 Subject: [PATCH 217/938] apply eslint/prettier to react templates --- generators/react/templates/jest.conf.js.ejs | 10 ++----- .../templates/src/main/webapp/app/app.tsx.ejs | 2 +- .../webapp/app/config/error-middleware.ts.ejs | 2 +- .../app/config/notification-middleware.ts.ejs | 4 +-- .../password-reset.reducer.ts.ejs | 2 +- .../register/register.reducer.spec.ts.ejs | 2 +- .../administration.reducer.spec.ts.ejs | 13 ++++---- .../administration.reducer.ts.ejs | 4 +-- .../user-management-detail.tsx.ejs | 14 ++++----- .../user-management.reducer.spec.ts.ejs | 3 +- .../user-management/user-management.tsx.ejs | 30 ++++++++++++------- .../src/main/webapp/app/routes.tsx.ejs | 2 +- .../webapp/app/shared/DurationFormat.tsx.ejs | 9 +++++- .../layout/header/header-components.tsx.ejs | 5 +--- .../reducers/authentication.spec.ts.ejs | 4 +-- .../app/shared/reducers/reducer.utils.ts.ejs | 15 +++++----- .../reducers/user-management.spec.ts.ejs | 2 +- 17 files changed, 65 insertions(+), 58 deletions(-) diff --git a/generators/react/templates/jest.conf.js.ejs b/generators/react/templates/jest.conf.js.ejs index 3f3411f67aff..d05d739aad6a 100644 --- a/generators/react/templates/jest.conf.js.ejs +++ b/generators/react/templates/jest.conf.js.ejs @@ -19,21 +19,17 @@ module.exports = { coverageDirectory: '/<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/', testMatch: ['/<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/**/@(*.)@(spec.ts?(x))'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'], - coveragePathIgnorePatterns: [ - '/<%= this.relativeDir(clientRootDir, clientTestDir) %>', - ], + coveragePathIgnorePatterns: ['/<%= this.relativeDir(clientRootDir, clientTestDir) %>'], moduleNameMapper: mapTypescriptAliasToJestAlias({ '\\.(css|scss)$': 'identity-obj-proxy', - 'sinon': require.resolve('sinon/pkg/sinon.js') + sinon: require.resolve('sinon/pkg/sinon.js'), }), reporters: [ 'default', ['jest-junit', { outputDirectory: './<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/', outputName: 'TESTS-results-jest.xml' }], ['jest-sonar', { outputDirectory: './<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/jest', outputName: 'TESTS-results-sonar.xml' }], ], - testPathIgnorePatterns: [ - '/node_modules/' - ], + testPathIgnorePatterns: ['/node_modules/'], setupFiles: ['/<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/setup-tests.ts'], globals: { <%_ if (enableTranslation) { _%> diff --git a/generators/react/templates/src/main/webapp/app/app.tsx.ejs b/generators/react/templates/src/main/webapp/app/app.tsx.ejs index 3b8a855f76a8..d9d1f1e524b3 100644 --- a/generators/react/templates/src/main/webapp/app/app.tsx.ejs +++ b/generators/react/templates/src/main/webapp/app/app.tsx.ejs @@ -67,7 +67,7 @@ export const App = () => { return (
- +
const getErrorMessage = errorData => { - let message = errorData.message; + let { message } = errorData; if (errorData.fieldErrors) { errorData.fieldErrors.forEach(fErr => { message += `\nfield: ${fErr.field}, Object: ${fErr.objectName}, message: ${fErr.message}\n`; diff --git a/generators/react/templates/src/main/webapp/app/config/notification-middleware.ts.ejs b/generators/react/templates/src/main/webapp/app/config/notification-middleware.ts.ejs index 10560acdaa44..92683b9a58bb 100644 --- a/generators/react/templates/src/main/webapp/app/config/notification-middleware.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/config/notification-middleware.ts.ejs @@ -78,7 +78,7 @@ export default () => next => action => { if (isRejectedAction(action) && isAxiosError(error)) { if (error.response) { - const response = error.response; + const { response } = error; if (response.status === 401) { // Ignore, page will be redirected to login. } else if (error.config?.url?.endsWith('api/account') || error.config?.url?.endsWith('api/authenticate')) { @@ -99,7 +99,7 @@ export default () => next => action => { <%_ } _%> }); } else { - const data = response.data; + const { data } = response; const problem = isProblemWithMessage(data) ? data : null; if (problem?.fieldErrors) { getFieldErrorsTosts(problem.fieldErrors).forEach(message => addErrorAlert(message)); diff --git a/generators/react/templates/src/main/webapp/app/modules/account/password-reset/password-reset.reducer.ts.ejs b/generators/react/templates/src/main/webapp/app/modules/account/password-reset/password-reset.reducer.ts.ejs index aec9e4dc9036..d9c3800719a0 100644 --- a/generators/react/templates/src/main/webapp/app/modules/account/password-reset/password-reset.reducer.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/modules/account/password-reset/password-reset.reducer.ts.ejs @@ -36,7 +36,7 @@ const apiUrl = 'api/account/reset-password'; export const handlePasswordResetInit = createAsyncThunk( 'passwordReset/reset_password_init', // If the content-type isn't set that way, axios will try to encode the body and thus modify the data sent to the server. - async (mail: string) => axios.post(`${apiUrl}/init`, mail, { headers: { ['Content-Type']: 'text/plain' } }), + async (mail: string) => axios.post(`${apiUrl}/init`, mail, { headers: { 'Content-Type': 'text/plain' } }), { serializeError: serializeAxiosError }, ); diff --git a/generators/react/templates/src/main/webapp/app/modules/account/register/register.reducer.spec.ts.ejs b/generators/react/templates/src/main/webapp/app/modules/account/register/register.reducer.spec.ts.ejs index b0d50ac8125f..10bd904fefd6 100644 --- a/generators/react/templates/src/main/webapp/app/modules/account/register/register.reducer.spec.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/modules/account/register/register.reducer.spec.ts.ejs @@ -67,7 +67,7 @@ describe('Creating account tests', () => { register(undefined, { type: handleRegister.fulfilled.type, payload: 'fake payload', - }) + }), ).toEqual({ ...initialState, registrationSuccess: true, diff --git a/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.spec.ts.ejs b/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.spec.ts.ejs index f1dc78324305..acc026cb36d2 100644 --- a/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.spec.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.spec.ts.ejs @@ -52,7 +52,7 @@ describe('Administration reducer tests', () => { expect(state).toMatchObject({ loading: false, errorMessage: null, - totalItems: 0 + totalItems: 0, }); <%_ if (applicationTypeGateway && gatewayServicesApiAvailable) { _%> expect(isEmpty(state.gateway.routes)); @@ -149,13 +149,14 @@ describe('Administration reducer tests', () => { <%_ } _%> <%_ if (withAdminUi) { _%> it('should update state according to a successful fetch logs request', () => { - const payload = { data: { + const payload = { + data: { loggers: { main: { - effectiveLevel: 'WARN' - } - } - } + effectiveLevel: 'WARN', + }, + }, + }, }; const toTest = administration(undefined, { type: getLoggers.fulfilled.type, payload }); diff --git a/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs b/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs index fab56b92049e..71ef4adb1669 100644 --- a/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs @@ -32,7 +32,7 @@ const initialState = { <%_ } _%> <%_ if (withAdminUi) { _%> logs: { - loggers: [] as any[] + loggers: [] as any[], }, health: {} as any, metrics: {} as any, @@ -201,7 +201,7 @@ export const AdministrationSlice = createSlice({ (state, action) => { state.errorMessage = action.error.message; state.loading = false; - } + }, ); <%_ } _%> }, diff --git a/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs b/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs index fd00656458e1..f0c77ca629ed 100644 --- a/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs +++ b/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs @@ -83,17 +83,17 @@ export const UserManagementDetail = () => {
  • {authority}
    • - ))) : null - } + )) + : null} -
    ); diff --git a/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.reducer.spec.ts.ejs b/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.reducer.spec.ts.ejs index 8158d84cc46b..4b15639bc013 100644 --- a/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.reducer.spec.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.reducer.spec.ts.ejs @@ -39,9 +39,8 @@ describe('User management reducer tests', () => { function isEmpty(element): boolean { if (element instanceof Array) { return element.length === 0; - } else { - return Object.keys(element).length === 0; } + return Object.keys(element).length === 0; } function testInitialState(state) { diff --git a/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs b/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs index c100d20c39f7..d2458b3a3f7f 100644 --- a/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +++ b/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs @@ -180,14 +180,13 @@ export const UserManagement = () => { {user.langKey} <%_ } _%> - { - user.authorities ? ( - user.authorities.map((authority, j) => ( -
    - {authority} -
    - ))) : null - } + {user.authorities + ? user.authorities.map((authority, j) => ( +
    + {authority} +
    + )) + : null} <%_ if (!databaseTypeCassandra) { _%> @@ -203,13 +202,22 @@ export const UserManagement = () => {
    diff --git a/generators/react/templates/src/main/webapp/app/routes.tsx.ejs b/generators/react/templates/src/main/webapp/app/routes.tsx.ejs index e436689ddaba..d1e36a71769e 100644 --- a/generators/react/templates/src/main/webapp/app/routes.tsx.ejs +++ b/generators/react/templates/src/main/webapp/app/routes.tsx.ejs @@ -49,7 +49,7 @@ import { sendActivity } from 'app/config/websocket-middleware'; const loading =
    loading ...
    ; <%_ if (generateUserManagement) { _%> - const Account = Loadable({ +const Account = Loadable({ loader: () => import(/* webpackChunkName: "account" */ 'app/modules/account'), loading: () => loading, }); diff --git a/generators/react/templates/src/main/webapp/app/shared/DurationFormat.tsx.ejs b/generators/react/templates/src/main/webapp/app/shared/DurationFormat.tsx.ejs index d33faf51ee71..1cfe18cd98be 100644 --- a/generators/react/templates/src/main/webapp/app/shared/DurationFormat.tsx.ejs +++ b/generators/react/templates/src/main/webapp/app/shared/DurationFormat.tsx.ejs @@ -17,5 +17,12 @@ export const DurationFormat = ({ value, blankOnInvalid, locale }: IDurationForma locale = TranslatorContext.context.locale; } - return {dayjs.duration(value).locale(locale || '<% if (enableTranslation) { %><%= nativeLanguage %><% } else { %>en<% } %>').humanize()}; + return ( + + {dayjs + .duration(value) + .locale(locale || '<% if (enableTranslation) { %><%= nativeLanguage %><% } else { %>en<% } %>') + .humanize()} + + ); }; diff --git a/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs b/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs index 01d1c87e0b82..b63239babe17 100644 --- a/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs +++ b/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs @@ -25,10 +25,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; export const BrandIcon = props => (
    - Logo + Logo
    ); diff --git a/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs b/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs index 19a7b6da0e35..96be2b6a75dc 100644 --- a/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs @@ -165,7 +165,7 @@ describe('Authentication reducer tests', () => { showModalLogin: true, <%_ } _%> errorMessage: null, - redirectMessage: null + redirectMessage: null, }); expect(isAccountEmpty(toTest)); }); @@ -182,7 +182,7 @@ describe('Authentication reducer tests', () => { showModalLogin: true, <%_ } _%> errorMessage: null, - redirectMessage: message + redirectMessage: message, }); expect(isAccountEmpty(toTest)); }); diff --git a/generators/react/templates/src/main/webapp/app/shared/reducers/reducer.utils.ts.ejs b/generators/react/templates/src/main/webapp/app/shared/reducers/reducer.utils.ts.ejs index e48c919fc3c4..39fde2bf4bd8 100644 --- a/generators/react/templates/src/main/webapp/app/shared/reducers/reducer.utils.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/shared/reducers/reducer.utils.ts.ejs @@ -71,16 +71,15 @@ export const serializeAxiosError = (value: any): AxiosError | SerializedError => if (typeof value === 'object' && value !== null) { if (isAxiosError(value)) { return value; - } else { - const simpleError: SerializedError = {}; - for (const property of commonErrorProperties) { - if (typeof value[property] === 'string') { - simpleError[property] = value[property]; - } + } + const simpleError: SerializedError = {}; + for (const property of commonErrorProperties) { + if (typeof value[property] === 'string') { + simpleError[property] = value[property]; } - - return simpleError; } + + return simpleError; } return { message: String(value) }; }; diff --git a/generators/react/templates/src/main/webapp/app/shared/reducers/user-management.spec.ts.ejs b/generators/react/templates/src/main/webapp/app/shared/reducers/user-management.spec.ts.ejs index 19c06bdb8a28..ad1ee06b4c01 100644 --- a/generators/react/templates/src/main/webapp/app/shared/reducers/user-management.spec.ts.ejs +++ b/generators/react/templates/src/main/webapp/app/shared/reducers/user-management.spec.ts.ejs @@ -29,7 +29,7 @@ import userManagement, { describe('User management reducer tests', () => { const initialState = { users: [], - errorMessage: null + errorMessage: null, }; describe('Common', () => { From 1af18378b2aaaf7c269f81652567fc77af61fdec Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 12 Aug 2024 19:36:24 -0300 Subject: [PATCH 218/938] react eslint adjusts --- generators/react/templates/eslint.config.js.jhi.react.ejs | 2 +- .../app/entities/_entityFolder_/_entityFile_-update.tsx.ejs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/generators/react/templates/eslint.config.js.jhi.react.ejs b/generators/react/templates/eslint.config.js.jhi.react.ejs index 92fd6a9831d6..812e9d074e49 100644 --- a/generators/react/templates/eslint.config.js.jhi.react.ejs +++ b/generators/react/templates/eslint.config.js.jhi.react.ejs @@ -86,7 +86,7 @@ import react from 'eslint-plugin-react/configs/recommended.js'; 'prefer-const': 'error', 'object-shorthand': ['error', 'always', { avoidExplicitReturnArrows: true }], 'default-case': 'error', - complexity: ['error', 40], + complexity: ['warn', 40], 'no-invalid-this': 'off', 'react/prop-types': 'off', 'react/display-name': 'off', diff --git a/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.tsx.ejs b/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.tsx.ejs index 5d18d66200fc..2bf755bf5f3d 100644 --- a/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.tsx.ejs +++ b/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.tsx.ejs @@ -126,7 +126,6 @@ export const <%= entityReactName %>Update = () => { } }, [updateSuccess]); - // eslint-disable-next-line complexity const saveEntity = values => { <%_ for (field of fields) { const fieldName = field.fieldName; From b9be554cbe9dfeed2403b14c9d54f37497b99b15 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 12 Aug 2024 19:14:34 -0300 Subject: [PATCH 219/938] apply prettier to java templates --- .../config/LiquibaseConfiguration.java.ejs | 2 +- .../repository/UserRepository.java.ejs | 10 +- .../service/UserService.java.ejs | 12 ++- .../web/rest/UserResource.java.ejs | 13 ++- .../java/_package_/config/Constants.java.ejs | 3 +- .../SecurityConfiguration_reactive.java.ejs | 21 ++-- .../DomainUserDetailsService.java.ejs | 4 +- ...PersistentTokenRememberMeServices.java.ejs | 4 +- .../_package_/security/SecurityUtils.java.ejs | 25 +++-- .../service/mapper/UserMapper.java.ejs | 13 ++- .../web/rest/AccountResource.java.ejs | 3 +- .../web/rest/errors/ErrorConstants.java.ejs | 3 +- .../rest/errors/ExceptionTranslator.java.ejs | 22 +++-- .../web/rest/UserResourceIT.java.ejs | 6 +- .../SecurityMetersServiceTests.java.ejs | 4 +- .../SecurityUtilsUnitTest_imperative.java.ejs | 5 +- .../service/mapper/UserMapperTest.java.ejs | 16 +-- .../web/rest/AccountResourceIT.java.ejs | 12 +-- .../ExceptionTranslatorIT_reactive.java.ejs | 98 +++++++++++++------ 19 files changed, 161 insertions(+), 115 deletions(-) diff --git a/generators/liquibase/templates/src/main/java/_package_/config/LiquibaseConfiguration.java.ejs b/generators/liquibase/templates/src/main/java/_package_/config/LiquibaseConfiguration.java.ejs index 4e46ee8ff107..fe226ea18d42 100644 --- a/generators/liquibase/templates/src/main/java/_package_/config/LiquibaseConfiguration.java.ejs +++ b/generators/liquibase/templates/src/main/java/_package_/config/LiquibaseConfiguration.java.ejs @@ -63,7 +63,7 @@ public class LiquibaseConfiguration { } <%_ if (databaseTypeSql && !reactive) { _%> - @Value( "${application.liquibase.async-start:true}" ) + @Value("${application.liquibase.async-start:true}") private Boolean asyncStart; <%_ } _%> diff --git a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/repository/UserRepository.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/repository/UserRepository.java.ejs index 49e92841c785..e73bccc4ebcb 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/repository/UserRepository.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/repository/UserRepository.java.ejs @@ -368,7 +368,9 @@ class UserRepositoryInternalImpl implements UserRepositoryInternal { @Override public Flux<<%= user.persistClass %>> findAllWithAuthorities(Pageable pageable) { String property = pageable.getSort().stream().map(Sort.Order::getProperty).findFirst().orElse("id"); - String direction = String.valueOf(pageable.getSort().stream().map(Sort.Order::getDirection).findFirst().orElse(Sort.DEFAULT_DIRECTION)); + String direction = String.valueOf( + pageable.getSort().stream().map(Sort.Order::getDirection).findFirst().orElse(Sort.DEFAULT_DIRECTION) + ); long page = pageable.getPageNumber(); long size = pageable.getPageSize(); @@ -381,7 +383,11 @@ class UserRepositoryInternalImpl implements UserRepositoryInternal { .all() .groupBy(t -> t.getT1().getLogin()) .flatMap(l -> l.collectList().map(t -> updateUserWithAuthorities(t.get(0).getT1(), t))) - .sort(Sort.Direction.fromString(direction) == Sort.DEFAULT_DIRECTION ? new BeanComparator<>(property) : new BeanComparator<>(property).reversed()) + .sort( + Sort.Direction.fromString(direction) == Sort.DEFAULT_DIRECTION + ? new BeanComparator<>(property) + : new BeanComparator<>(property).reversed() + ) .skip(page * size) .take(size); } diff --git a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs index 6d5649ac0521..13ad90292eef 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs @@ -199,7 +199,8 @@ public class UserService { <%_ } _%> public <% if (reactive) { %>Mono<% } else { %>Optional<% } %><<%= user.persistClass %>> completePasswordReset(String newPassword, String key) { LOG.debug("Reset user password for reset key {}", key); - return userRepository.findOneByResetKey(key) + return userRepository + .findOneByResetKey(key) .filter(user -> user.getResetDate().isAfter(Instant.now().minus(1, ChronoUnit.DAYS))) <%_ if (reactive) { _%> .publishOn(Schedulers.boundedElastic()) @@ -387,7 +388,7 @@ public class UserService { <%_ if (!reactive) { _%> private boolean removeNonActivatedUser(<%= user.persistClass %> existingUser) { if (existingUser.isActivated()) { - return false; + return false; } userRepository.delete(existingUser); <%_ if (databaseTypeSql) { _%> @@ -457,7 +458,9 @@ public class UserService { user.setActivated(true); <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%> if (userDTO.getAuthorities() != null) { - Set authorities = userDTO.getAuthorities().stream() + Set authorities = userDTO + .getAuthorities() + .stream() .map(authorityRepository::findById) .filter(Optional::isPresent) .map(Optional::get) @@ -575,7 +578,8 @@ public class UserService { @Transactional <%_ } _%> public Mono deleteUser(String login) { - return userRepository.findOneByLogin(login) + return userRepository + .findOneByLogin(login) .flatMap(user -> userRepository.delete(user).thenReturn(user)) <%_ if (searchEngineElasticsearch) { _%> .flatMap(user -> userSearchRepository.delete(user).thenReturn(user)) diff --git a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/UserResource.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/UserResource.java.ejs index c4db9621ac62..5c59ff31644f 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/UserResource.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/UserResource.java.ejs @@ -170,7 +170,8 @@ public class UserResource { // Lowercase the user login before comparing with database <%_ if (reactive) { _%> } - return userRepository.findOneByLogin(userDTO.getLogin().toLowerCase()) + return userRepository + .findOneByLogin(userDTO.getLogin().toLowerCase()) .hasElement() .flatMap(loginExists -> { if (Boolean.TRUE.equals(loginExists)) { @@ -282,9 +283,15 @@ public class UserResource { return Mono.just(ResponseEntity.badRequest().build()); } - return userService.countManagedUsers() + return userService + .countManagedUsers() .map(total -> new PageImpl<>(new ArrayList<>(), pageable, total)) - .map(page -> PaginationUtil.generatePaginationHttpHeaders(ForwardedHeaderUtils.adaptFromForwardedHeaders(request.getURI(), request.getHeaders()), page)) + .map(page -> + PaginationUtil.generatePaginationHttpHeaders( + ForwardedHeaderUtils.adaptFromForwardedHeaders(request.getURI(), request.getHeaders()), + page + ) + ) .map(headers -> ResponseEntity.ok().headers(headers).body(userService.getAllManagedUsers(pageable))); <%_ } else { _%> public ResponseEntity>> getAllUsers(@org.springdoc.core.annotations.ParameterObject Pageable pageable) { diff --git a/generators/spring-boot/templates/src/main/java/_package_/config/Constants.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/Constants.java.ejs index a35b2a6041ed..3f83f4f5a4a8 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/config/Constants.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/config/Constants.java.ejs @@ -36,6 +36,5 @@ public final class Constants { public static final String ID_DELIMITER = "__"; <%_ } _%> - private Constants() { - } + private Constants() {} } diff --git a/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs index 8c0732901b13..dc987fc12acb 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs @@ -321,20 +321,22 @@ public class SecurityConfiguration { <%_ if (authenticationTypeOauth2) { _%> <%_ if (!applicationTypeMicroservice) { _%> private ServerOAuth2AuthorizationRequestResolver authorizationRequestResolver( - ReactiveClientRegistrationRepository clientRegistrationRepository) { - DefaultServerOAuth2AuthorizationRequestResolver authorizationRequestResolver = - new DefaultServerOAuth2AuthorizationRequestResolver(clientRegistrationRepository); + ReactiveClientRegistrationRepository clientRegistrationRepository + ) { + DefaultServerOAuth2AuthorizationRequestResolver authorizationRequestResolver = new DefaultServerOAuth2AuthorizationRequestResolver( + clientRegistrationRepository + ); if (this.issuerUri.contains("auth0.com")) { authorizationRequestResolver.setAuthorizationRequestCustomizer(authorizationRequestCustomizer()); } - return authorizationRequestResolver; + return authorizationRequestResolver; } private Consumer authorizationRequestCustomizer() { - return customizer -> customizer - .authorizationRequestUri(uriBuilder -> - uriBuilder.queryParam("audience", jHipsterProperties.getSecurity().getOauth2().getAudience()) - .build()); + return customizer -> + customizer.authorizationRequestUri(uriBuilder -> + uriBuilder.queryParam("audience", jHipsterProperties.getSecurity().getOauth2().getAudience()).build() + ); } <%_ } _%> @@ -410,8 +412,7 @@ public class SecurityConfiguration { private ReactiveJwtDecoder createJwtDecoder(String issuerUri, String jwkSetUri, String userInfoUri) { NimbusReactiveJwtDecoder jwtDecoder = new NimbusReactiveJwtDecoder(jwkSetUri); - OAuth2TokenValidator audienceValidator = new AudienceValidator( - jHipsterProperties.getSecurity().getOauth2().getAudience()); + OAuth2TokenValidator audienceValidator = new AudienceValidator(jHipsterProperties.getSecurity().getOauth2().getAudience()); OAuth2TokenValidator withIssuer = JwtValidators.createDefaultWithIssuer(issuerUri); OAuth2TokenValidator withAudience = new DelegatingOAuth2TokenValidator<>(withIssuer, audienceValidator); diff --git a/generators/spring-boot/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs index d83964ef1894..07e2504e409e 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs @@ -93,8 +93,6 @@ public class DomainUserDetailsService implements <% if (reactive) { %>Reactive<% .map(Authority::getName)<% } %> .map(SimpleGrantedAuthority::new) .toList(); - return new org.springframework.security.core.userdetails.User(user.getLogin(), - user.getPassword(), - grantedAuthorities); + return new org.springframework.security.core.userdetails.User(user.getLogin(), user.getPassword(), grantedAuthorities); } } diff --git a/generators/spring-boot/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs index 14851ba0e9e3..de0894f4a1de 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs @@ -153,9 +153,7 @@ public class PersistentTokenRememberMeServices extends AbstractRememberMeService } @Override - protected void onLoginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication - successfulAuthentication) { - + protected void onLoginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) { String login = successfulAuthentication.getName(); LOG.debug("Creating new persistent login for user {}", login); diff --git a/generators/spring-boot/templates/src/main/java/_package_/security/SecurityUtils.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/security/SecurityUtils.java.ejs index 56b5d79ca71e..15549cb33aba 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/security/SecurityUtils.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/security/SecurityUtils.java.ejs @@ -79,8 +79,7 @@ public final class SecurityUtils { public static final String AUTHORITIES_KEY = "auth"; <%_ } _%> - private SecurityUtils() { - } + private SecurityUtils() {} /** * Get the login of the current user. @@ -109,7 +108,7 @@ public final class SecurityUtils { <%_ } _%> <%_ if (authenticationTypeOauth2) { _%> } else if (authentication instanceof JwtAuthenticationToken) { - return (String) ((JwtAuthenticationToken)authentication).getToken().getClaims().get("preferred_username"); + return (String) ((JwtAuthenticationToken) authentication).getToken().getClaims().get("preferred_username"); } else if (authentication.getPrincipal() instanceof DefaultOidcUser) { Map attributes = ((DefaultOidcUser) authentication.getPrincipal()).getAttributes(); if (attributes.containsKey("preferred_username")) { @@ -174,9 +173,11 @@ public final class SecurityUtils { return ReactiveSecurityContextHolder.getContext() .map(SecurityContext::getAuthentication) .map(Authentication::getAuthorities) - .map(authorityList -> authorityList.stream() - .map(GrantedAuthority::getAuthority) - .anyMatch(authority -> Arrays.asList(authorities).contains(authority)) + .map(authorityList -> + authorityList + .stream() + .map(GrantedAuthority::getAuthority) + .anyMatch(authority -> Arrays.asList(authorities).contains(authority)) ); <%_ } else { _%> Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); @@ -231,16 +232,14 @@ public final class SecurityUtils { @SuppressWarnings("unchecked") private static Collection getRolesFromClaims(Map claims) { - return (Collection) claims.getOrDefault("groups", - claims.getOrDefault("roles", - claims.getOrDefault(CLAIMS_NAMESPACE + "roles", new ArrayList<>()))); + return (Collection) claims.getOrDefault( + "groups", + claims.getOrDefault("roles", claims.getOrDefault(CLAIMS_NAMESPACE + "roles", new ArrayList<>())) + ); } private static List mapRolesToGrantedAuthorities(Collection roles) { - return roles.stream() - .filter(role -> role.startsWith("ROLE_")) - .map(SimpleGrantedAuthority::new) - .collect(Collectors.toList()); + return roles.stream().filter(role -> role.startsWith("ROLE_")).map(SimpleGrantedAuthority::new).collect(Collectors.toList()); } <%_ } _%> <%_ if (generateAuthenticationApi && ((authenticationTypeOauth2 && !syncUserWithIdp) || (authenticationTypeJwt && skipUserManagement))) { _%> diff --git a/generators/spring-boot/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs index 0ff8f79de5c4..37ec631039c4 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs @@ -110,11 +110,14 @@ public class UserMapper { Set authorities = new HashSet<>(); if (authoritiesAsString != null) { - authorities = authoritiesAsString.stream().map(string -> { - Authority auth = new Authority(); - auth.setName(string); - return auth; - }).collect(Collectors.toSet()); + authorities = authoritiesAsString + .stream() + .map(string -> { + Authority auth = new Authority(); + auth.setName(string); + return auth; + }) + .collect(Collectors.toSet()); } return authorities; diff --git a/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs index 5bfc4c1e6bd5..cc2a3b2e6af4 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs @@ -291,7 +291,8 @@ public class AccountResource { @PostMapping(path = "/account/reset-password/init") <%_ if (reactive) { _%> public Mono requestPasswordReset(@RequestBody String mail) { - return userService.requestPasswordReset(mail) + return userService + .requestPasswordReset(mail) .doOnSuccess(user -> { if (Objects.nonNull(user)) { mailService.sendPasswordResetMail(user); diff --git a/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs index c459ec0b070a..b683c32e9457 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs @@ -35,6 +35,5 @@ public final class ErrorConstants { public static final URI LOGIN_ALREADY_USED_TYPE = URI.create(PROBLEM_BASE_URL + "/login-already-used"); <%_ } _%> - private ErrorConstants() { - } + private ErrorConstants() {} } diff --git a/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs index 2f8eef5a6a51..184f2884d37d 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs @@ -180,12 +180,12 @@ _%> String title = extractTitle(err, problem.getStatus()); String problemTitle = problem.getTitle(); if (problemTitle == null || !problemTitle.equals(title)) { - problem.setTitle(title); + problem.setTitle(title); } if (problem.getDetail() == null) { // higher precedence to cause - problem.setDetail(getCustomizedErrorDetails(err)); + problem.setDetail(getCustomizedErrorDetails(err)); } Map problemProperties = problem.getProperties(); @@ -255,8 +255,7 @@ _%> } private URI getMappedType(Throwable err) { - if(err instanceof MethodArgumentNotValidException) - return ErrorConstants.CONSTRAINT_VIOLATION_TYPE; + if (err instanceof MethodArgumentNotValidException) return ErrorConstants.CONSTRAINT_VIOLATION_TYPE; return ErrorConstants.DEFAULT_TYPE; } @@ -277,8 +276,7 @@ _%> } private String getCustomizedTitle(Throwable err) { - if(err instanceof MethodArgumentNotValidException) - return "Method argument not valid"; + if (err instanceof MethodArgumentNotValidException) return "Method argument not valid"; return null; } @@ -313,9 +311,15 @@ _%> } private HttpHeaders buildHeaders(Throwable err) { - return err instanceof BadRequestAlertException badRequestAlertException ? - HeaderUtil.createFailureAlert(applicationName, true, badRequestAlertException.getEntityName(), - badRequestAlertException.getErrorKey(), badRequestAlertException.getMessage()) : null; + return err instanceof BadRequestAlertException badRequestAlertException + ? HeaderUtil.createFailureAlert( + applicationName, + true, + badRequestAlertException.getEntityName(), + badRequestAlertException.getErrorKey(), + badRequestAlertException.getMessage() + ) + : null; } <%_ if (reactive) { _%> private HttpHeaders updateContentType(HttpHeaders headers) { diff --git a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/UserResourceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/UserResourceIT.java.ejs index ce6b9ba026c6..3eb7946ce45c 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/UserResourceIT.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/UserResourceIT.java.ejs @@ -460,7 +460,7 @@ class UserResourceIT { userDTO.setLogin("anotherlogin"); userDTO.setFirstName(DEFAULT_FIRSTNAME); userDTO.setLastName(DEFAULT_LASTNAME); - userDTO.setEmail(DEFAULT_EMAIL);// this email should already be used + userDTO.setEmail(DEFAULT_EMAIL); // this email should already be used userDTO.setActivated(true); <%_ if (!databaseTypeCassandra) { _%> userDTO.setImageUrl(DEFAULT_IMAGEURL); @@ -759,7 +759,7 @@ class UserResourceIT { userDTO.setLogin(updatedUser.getLogin()); userDTO.setFirstName(updatedUser.getFirstName()); userDTO.setLastName(updatedUser.getLastName()); - userDTO.setEmail("jhipster@localhost");// this email should already be used by anotherUser + userDTO.setEmail("jhipster@localhost"); // this email should already be used by anotherUser userDTO.setActivated(updatedUser.isActivated()); <%_ if (!databaseTypeCassandra) { _%> userDTO.setImageUrl(updatedUser.getImageUrl()); @@ -826,7 +826,7 @@ class UserResourceIT { <%= user.adminUserDto %> userDTO = new <%= user.adminUserDto %>(); userDTO.setId(updatedUser.getId()); - userDTO.setLogin("jhipster");// this login should already be used by anotherUser + userDTO.setLogin("jhipster"); // this login should already be used by anotherUser userDTO.setFirstName(updatedUser.getFirstName()); userDTO.setLastName(updatedUser.getLastName()); userDTO.setEmail(updatedUser.getEmail()); diff --git a/generators/spring-boot/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs index 31dbad76fdd6..f84bb9c67919 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs @@ -18,16 +18,14 @@ -%> package <%= packageName %>.management; +import static org.assertj.core.api.Assertions.assertThat; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - import java.util.Collection; -import static org.assertj.core.api.Assertions.assertThat; - class SecurityMetersServiceTests { private static final String INVALID_TOKENS_METER_EXPECTED_NAME = "security.authentication.invalid-tokens"; diff --git a/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs index 8f353b543acf..254c98c8568a 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs @@ -106,7 +106,10 @@ class SecurityUtilsUnitTest { Map claims = new HashMap<>(); claims.put(SecurityUtils.CLAIMS_NAMESPACE + "roles", Arrays.asList(AuthoritiesConstants.ADMIN, AuthoritiesConstants.USER)); - List expectedAuthorities = Arrays.asList(new SimpleGrantedAuthority(AuthoritiesConstants.ADMIN), new SimpleGrantedAuthority(AuthoritiesConstants.USER)); + List expectedAuthorities = Arrays.asList( + new SimpleGrantedAuthority(AuthoritiesConstants.ADMIN), + new SimpleGrantedAuthority(AuthoritiesConstants.USER) + ); List authorities = SecurityUtils.extractAuthorityFromClaims(claims); diff --git a/generators/spring-boot/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs index fea1a4b9ef7e..a42f866ab60d 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs @@ -153,9 +153,7 @@ class UserMapperTest { List<<%= user.dtoClass %>> userDTOS = userMapper.usersToUserDTOs(users); - assertThat(userDTOS) - .isNotEmpty() - .size().isEqualTo(1); + assertThat(userDTOS).isNotEmpty().size().isEqualTo(1); } @Test @@ -166,9 +164,7 @@ class UserMapperTest { List<<%= user.persistClass %>> users = userMapper.userDTOsToUsers(usersDto); - assertThat(users) - .isNotEmpty() - .size().isEqualTo(1); + assertThat(users).isNotEmpty().size().isEqualTo(1); } @Test @@ -182,9 +178,7 @@ class UserMapperTest { List<<%= user.persistClass %>> users = userMapper.userDTOsToUsers(usersDto); - assertThat(users) - .isNotEmpty() - .size().isEqualTo(1); + assertThat(users).isNotEmpty().size().isEqualTo(1); assertThat(users.get(0).getAuthorities()).isNotNull(); assertThat(users.get(0).getAuthorities()).isNotEmpty(); <%_ if (databaseTypeSql || databaseTypeMongodb) { _%> @@ -204,9 +198,7 @@ class UserMapperTest { List<<%= user.persistClass %>> users = userMapper.userDTOsToUsers(usersDto); - assertThat(users) - .isNotEmpty() - .size().isEqualTo(1); + assertThat(users).isNotEmpty().size().isEqualTo(1); assertThat(users.get(0).getAuthorities()).isNotNull(); assertThat(users.get(0).getAuthorities()).isEmpty(); } diff --git a/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs index 1a8f96f1f0bf..91aab914452c 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs @@ -180,8 +180,8 @@ class AccountResourceIT { .expectBody().isEmpty(); <%_ } else { _%> void testNonAuthenticatedUser() throws Exception { - restAccountMockMvc.perform(get("/api/authenticate") - .accept(MediaType.APPLICATION_JSON)) + restAccountMockMvc + .perform(get("/api/authenticate").accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(content().string("")); <%_ } _%> @@ -199,9 +199,8 @@ class AccountResourceIT { .expectBody(String.class).isEqualTo(TEST_USER_LOGIN); <%_ } else { _%> void testAuthenticatedUser() throws Exception { - restAccountMockMvc.perform(get("/api/authenticate") - .with(request -> request) - .accept(MediaType.APPLICATION_JSON)) + restAccountMockMvc + .perform(get("/api/authenticate").with(request -> request).accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(content().string(TEST_USER_LOGIN)); <%_ } _%> @@ -1208,7 +1207,8 @@ class AccountResourceIT { token.setUserAgent("Test agent"); persistentTokenRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(token); - restAccountMockMvc.perform(get("/api/account/sessions")) + restAccountMockMvc + .perform(get("/api/account/sessions")) .andExpect(status().isOk()) .andExpect(jsonPath("$.[*].series").value(hasItem(token.getSeries()))) .andExpect(jsonPath("$.[*].ipAddress").value(hasItem(token.getIpAddress()))) diff --git a/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs index 20c4f5bbe7c4..a25b51087232 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs @@ -59,69 +59,103 @@ class ExceptionTranslatorIT { @Test void testConcurrencyFailure() { - webTestClient.get().uri("/api/exception-translator-test/concurrency-failure") + webTestClient + .get() + .uri("/api/exception-translator-test/concurrency-failure") .exchange() - .expectStatus().isEqualTo(HttpStatus.CONFLICT) - .expectHeader().contentType(MediaType.APPLICATION_PROBLEM_JSON) + .expectStatus() + .isEqualTo(HttpStatus.CONFLICT) + .expectHeader() + .contentType(MediaType.APPLICATION_PROBLEM_JSON) .expectBody() - .jsonPath("$.message").isEqualTo(ErrorConstants.ERR_CONCURRENCY_FAILURE); + .jsonPath("$.message") + .isEqualTo(ErrorConstants.ERR_CONCURRENCY_FAILURE); } <%_ } _%> @Test void testMethodArgumentNotValid() { - webTestClient.post().uri("/api/exception-translator-test/method-argument") - .contentType(MediaType.APPLICATION_JSON) - .bodyValue("{}") - .exchange() - .expectHeader().contentType(MediaType.APPLICATION_PROBLEM_JSON) - .expectBody() - .jsonPath("$.message").isEqualTo(ErrorConstants.ERR_VALIDATION) - .jsonPath("$.fieldErrors.[0].objectName").isEqualTo("test") - .jsonPath("$.fieldErrors.[0].field").isEqualTo("test") - .jsonPath("$.fieldErrors.[0].message").isEqualTo("must not be null"); + webTestClient + .post() + .uri("/api/exception-translator-test/method-argument") + .contentType(MediaType.APPLICATION_JSON) + .bodyValue("{}") + .exchange() + .expectHeader() + .contentType(MediaType.APPLICATION_PROBLEM_JSON) + .expectBody() + .jsonPath("$.message") + .isEqualTo(ErrorConstants.ERR_VALIDATION) + .jsonPath("$.fieldErrors.[0].objectName") + .isEqualTo("test") + .jsonPath("$.fieldErrors.[0].field") + .isEqualTo("test") + .jsonPath("$.fieldErrors.[0].message") + .isEqualTo("must not be null"); } @Test void testMissingRequestPart() { - webTestClient.get().uri("/api/exception-translator-test/missing-servlet-request-part") + webTestClient + .get() + .uri("/api/exception-translator-test/missing-servlet-request-part") .exchange() - .expectStatus().isBadRequest() - .expectHeader().contentType(MediaType.APPLICATION_PROBLEM_JSON) + .expectStatus() + .isBadRequest() + .expectHeader() + .contentType(MediaType.APPLICATION_PROBLEM_JSON) .expectBody() - .jsonPath("$.message").isEqualTo("error.http.400"); + .jsonPath("$.message") + .isEqualTo("error.http.400"); } @Test void testMissingRequestParameter() { - webTestClient.get().uri("/api/exception-translator-test/missing-servlet-request-parameter") + webTestClient + .get() + .uri("/api/exception-translator-test/missing-servlet-request-parameter") .exchange() - .expectStatus().isBadRequest() - .expectHeader().contentType(MediaType.APPLICATION_PROBLEM_JSON) + .expectStatus() + .isBadRequest() + .expectHeader() + .contentType(MediaType.APPLICATION_PROBLEM_JSON) .expectBody() - .jsonPath("$.message").isEqualTo("error.http.400"); + .jsonPath("$.message") + .isEqualTo("error.http.400"); } @Test void testAccessDenied() { - webTestClient.get().uri("/api/exception-translator-test/access-denied") + webTestClient + .get() + .uri("/api/exception-translator-test/access-denied") .exchange() - .expectStatus().isForbidden() - .expectHeader().contentType(MediaType.APPLICATION_PROBLEM_JSON) + .expectStatus() + .isForbidden() + .expectHeader() + .contentType(MediaType.APPLICATION_PROBLEM_JSON) .expectBody() - .jsonPath("$.message").isEqualTo("error.http.403") - .jsonPath("$.detail").isEqualTo("test access denied!"); + .jsonPath("$.message") + .isEqualTo("error.http.403") + .jsonPath("$.detail") + .isEqualTo("test access denied!"); } @Test void testUnauthorized() { - webTestClient.get().uri("/api/exception-translator-test/unauthorized") + webTestClient + .get() + .uri("/api/exception-translator-test/unauthorized") .exchange() - .expectStatus().isUnauthorized() - .expectHeader().contentType(MediaType.APPLICATION_PROBLEM_JSON) + .expectStatus() + .isUnauthorized() + .expectHeader() + .contentType(MediaType.APPLICATION_PROBLEM_JSON) .expectBody() - .jsonPath("$.message").isEqualTo("error.http.401") - .jsonPath("$.path").isEqualTo("/api/exception-translator-test/unauthorized") + .jsonPath("$.message") + .isEqualTo("error.http.401") + .jsonPath("$.path") + .isEqualTo("/api/exception-translator-test/unauthorized") .jsonPath("$.detail") .value(AnyOf.anyOf(IsEqual.equalTo("test authentication failed!"), IsEqual.equalTo("Invalid credentials"))); } From c93c94acee753c302c7dc96415f0206edbe9b109 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 12 Aug 2024 19:51:29 -0300 Subject: [PATCH 220/938] adjusts --- .../user-management/user-management-detail.tsx.ejs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs b/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs index f0c77ca629ed..8e75e47db1c4 100644 --- a/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs +++ b/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs @@ -79,11 +79,14 @@ export const UserManagementDetail = () => {
      { user.authorities ? ( - user.authorities.map((authority, i) => ( -
    • - {authority} -
      • - )) + user.authorities.map( + (authority, i) => ( +
    • + {authority} +
      • + ) + ) + ) : null}
    From 43a15a7f9c7d3ebe94c4483f143caa8421d1aadf Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 12 Aug 2024 20:12:41 -0300 Subject: [PATCH 221/938] revert maxThreads to 1, there is no notable speed gain --- generators/bootstrap/support/eslint-transform.ts | 3 +-- generators/bootstrap/support/java-unused-imports-transform.ts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/generators/bootstrap/support/eslint-transform.ts b/generators/bootstrap/support/eslint-transform.ts index 553a515a8f9d..65b41f85c731 100644 --- a/generators/bootstrap/support/eslint-transform.ts +++ b/generators/bootstrap/support/eslint-transform.ts @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import os from 'node:os'; import { passthrough } from 'p-transform'; import { isFileStateModified } from 'mem-fs-editor/state'; import { Minimatch } from 'minimatch'; @@ -31,7 +30,7 @@ type ESLintWorkerOptions = { cwd?: string; extensions: string; recreateEslint?: export class ESLintPool extends Piscina { constructor(options?: PoolOptions) { super({ - maxThreads: Math.ceil(os.availableParallelism() / 3), + maxThreads: 1, filename: new URL('./eslint-worker.js', import.meta.url).href, ...options, }); diff --git a/generators/bootstrap/support/java-unused-imports-transform.ts b/generators/bootstrap/support/java-unused-imports-transform.ts index 023c5f16e4e7..1ad35266aea8 100644 --- a/generators/bootstrap/support/java-unused-imports-transform.ts +++ b/generators/bootstrap/support/java-unused-imports-transform.ts @@ -1,5 +1,4 @@ import { extname } from 'path'; -import os from 'node:os'; import { passthrough } from 'p-transform'; import { isFileStateModified } from 'mem-fs-editor/state'; import { VinylMemFsEditorFile } from 'mem-fs-editor'; @@ -17,7 +16,7 @@ export const createRemoveUnusedImportsTransform = function ( const { ignoreErrors } = options; const pool = new Piscina({ - maxThreads: Math.ceil(os.availableParallelism() / 3), + maxThreads: 1, filename: new URL('./java-lint-worker.js', import.meta.url).href, }); From c88872247237a2545102e207cdd60b9a565945b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 23:30:59 +0000 Subject: [PATCH 222/938] Bump eslint-plugin-unused-imports from 4.1.2 to 4.1.3 Bumps [eslint-plugin-unused-imports](https://github.com/sweepline/eslint-plugin-unused-imports) from 4.1.2 to 4.1.3. - [Commits](https://github.com/sweepline/eslint-plugin-unused-imports/compare/v4.1.2...v4.1.3) --- updated-dependencies: - dependency-name: eslint-plugin-unused-imports dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 46eed8b53c2a..2713865a773c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "ejs": "3.1.10", "eslint": "9.9.0", "eslint-plugin-import": "2.29.1", - "eslint-plugin-unused-imports": "4.1.2", + "eslint-plugin-unused-imports": "4.1.3", "execa": "9.3.0", "fast-xml-parser": "4.4.1", "glob": "10.4.2", @@ -5985,10 +5985,9 @@ } }, "node_modules/eslint-plugin-unused-imports": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.2.tgz", - "integrity": "sha512-A/Ypb0DQlDEzIbcoAv87NpLLcG3iwlE0gBEpS9Ud/62v2v3CoO15lZ/WfGyo2Wq7YraWJ2aE0TeHgJcpor6KQQ==", - "license": "MIT", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.3.tgz", + "integrity": "sha512-lqrNZIZjFMUr7P06eoKtQLwyVRibvG7N+LtfKtObYGizAAGrcqLkc3tDx+iAik2z7q0j/XI3ihjupIqxhFabFA==", "peerDependencies": { "@typescript-eslint/eslint-plugin": "^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0", "eslint": "^9.0.0 || ^8.0.0" diff --git a/package.json b/package.json index 9c6d6e8511fd..736b7e733c5e 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "ejs": "3.1.10", "eslint": "9.9.0", "eslint-plugin-import": "2.29.1", - "eslint-plugin-unused-imports": "4.1.2", + "eslint-plugin-unused-imports": "4.1.3", "execa": "9.3.0", "fast-xml-parser": "4.4.1", "glob": "10.4.2", From 01a8e870beff4a98194436a7583ef24e389a0497 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 23:31:25 +0000 Subject: [PATCH 223/938] Bump typescript-eslint from 8.0.1 to 8.1.0 Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.1 to 8.1.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.1.0/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 111 ++++++++++++++++++++-------------------------- package.json | 2 +- 2 files changed, 50 insertions(+), 63 deletions(-) diff --git a/package-lock.json b/package-lock.json index 46eed8b53c2a..643e92fd58cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,7 +61,7 @@ "sort-keys": "5.0.0", "type-fest": "4.24.0", "typescript": "5.4.5", - "typescript-eslint": "8.0.1", + "typescript-eslint": "8.1.0", "winston": "3.14.1", "yaml": "2.5.0", "yeoman-environment": "4.4.1", @@ -3224,16 +3224,15 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.0.1.tgz", - "integrity": "sha512-5g3Y7GDFsJAnY4Yhvk8sZtFfV6YNF2caLzjrRPUBzewjPCaj0yokePB4LJSobyCzGMzjZZYFbwuzbfDHlimXbQ==", - "license": "MIT", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.1.0.tgz", + "integrity": "sha512-LlNBaHFCEBPHyD4pZXb35mzjGkuGKXU5eeCA1SxvHfiRES0E82dOounfVpL4DCqYvJEKab0bZIA0gCRpdLKkCw==", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.0.1", - "@typescript-eslint/type-utils": "8.0.1", - "@typescript-eslint/utils": "8.0.1", - "@typescript-eslint/visitor-keys": "8.0.1", + "@typescript-eslint/scope-manager": "8.1.0", + "@typescript-eslint/type-utils": "8.1.0", + "@typescript-eslint/utils": "8.1.0", + "@typescript-eslint/visitor-keys": "8.1.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -3257,15 +3256,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.0.1.tgz", - "integrity": "sha512-5IgYJ9EO/12pOUwiBKFkpU7rS3IU21mtXzB81TNwq2xEybcmAZrE9qwDtsb5uQd9aVO9o0fdabFyAmKveXyujg==", - "license": "BSD-2-Clause", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.1.0.tgz", + "integrity": "sha512-U7iTAtGgJk6DPX9wIWPPOlt1gO57097G06gIcl0N0EEnNw8RGD62c+2/DiP/zL7KrkqnnqF7gtFGR7YgzPllTA==", "dependencies": { - "@typescript-eslint/scope-manager": "8.0.1", - "@typescript-eslint/types": "8.0.1", - "@typescript-eslint/typescript-estree": "8.0.1", - "@typescript-eslint/visitor-keys": "8.0.1", + "@typescript-eslint/scope-manager": "8.1.0", + "@typescript-eslint/types": "8.1.0", + "@typescript-eslint/typescript-estree": "8.1.0", + "@typescript-eslint/visitor-keys": "8.1.0", "debug": "^4.3.4" }, "engines": { @@ -3285,13 +3283,12 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.0.1.tgz", - "integrity": "sha512-NpixInP5dm7uukMiRyiHjRKkom5RIFA4dfiHvalanD2cF0CLUuQqxfg8PtEUo9yqJI2bBhF+pcSafqnG3UBnRQ==", - "license": "MIT", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.1.0.tgz", + "integrity": "sha512-DsuOZQji687sQUjm4N6c9xABJa7fjvfIdjqpSIIVOgaENf2jFXiM9hIBZOL3hb6DHK9Nvd2d7zZnoMLf9e0OtQ==", "dependencies": { - "@typescript-eslint/types": "8.0.1", - "@typescript-eslint/visitor-keys": "8.0.1" + "@typescript-eslint/types": "8.1.0", + "@typescript-eslint/visitor-keys": "8.1.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3302,13 +3299,12 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.0.1.tgz", - "integrity": "sha512-+/UT25MWvXeDX9YaHv1IS6KI1fiuTto43WprE7pgSMswHbn1Jm9GEM4Txp+X74ifOWV8emu2AWcbLhpJAvD5Ng==", - "license": "MIT", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.1.0.tgz", + "integrity": "sha512-oLYvTxljVvsMnldfl6jIKxTaU7ok7km0KDrwOt1RHYu6nxlhN3TIx8k5Q52L6wR33nOwDgM7VwW1fT1qMNfFIA==", "dependencies": { - "@typescript-eslint/typescript-estree": "8.0.1", - "@typescript-eslint/utils": "8.0.1", + "@typescript-eslint/typescript-estree": "8.1.0", + "@typescript-eslint/utils": "8.1.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -3326,10 +3322,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.0.1.tgz", - "integrity": "sha512-PpqTVT3yCA/bIgJ12czBuE3iBlM3g4inRSC5J0QOdQFAn07TYrYEQBBKgXH1lQpglup+Zy6c1fxuwTk4MTNKIw==", - "license": "MIT", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.1.0.tgz", + "integrity": "sha512-q2/Bxa0gMOu/2/AKALI0tCKbG2zppccnRIRCW6BaaTlRVaPKft4oVYPp7WOPpcnsgbr0qROAVCVKCvIQ0tbWog==", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -3339,13 +3334,12 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.0.1.tgz", - "integrity": "sha512-8V9hriRvZQXPWU3bbiUV4Epo7EvgM6RTs+sUmxp5G//dBGy402S7Fx0W0QkB2fb4obCF8SInoUzvTYtc3bkb5w==", - "license": "BSD-2-Clause", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.1.0.tgz", + "integrity": "sha512-NTHhmufocEkMiAord/g++gWKb0Fr34e9AExBRdqgWdVBaKoei2dIyYKD9Q0jBnvfbEA5zaf8plUFMUH6kQ0vGg==", "dependencies": { - "@typescript-eslint/types": "8.0.1", - "@typescript-eslint/visitor-keys": "8.0.1", + "@typescript-eslint/types": "8.1.0", + "@typescript-eslint/visitor-keys": "8.1.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3370,7 +3364,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "license": "MIT", "engines": { "node": ">=8" } @@ -3379,7 +3372,6 @@ "version": "11.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "license": "MIT", "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", @@ -3399,21 +3391,19 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/@typescript-eslint/utils": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.0.1.tgz", - "integrity": "sha512-CBFR0G0sCt0+fzfnKaciu9IBsKvEKYwN9UZ+eeogK1fYHg4Qxk1yf/wLQkLXlq8wbU2dFlgAesxt8Gi76E8RTA==", - "license": "MIT", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.1.0.tgz", + "integrity": "sha512-ypRueFNKTIFwqPeJBfeIpxZ895PQhNyH4YID6js0UoBImWYoSjBsahUn9KMiJXh94uOjVBgHD9AmkyPsPnFwJA==", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.0.1", - "@typescript-eslint/types": "8.0.1", - "@typescript-eslint/typescript-estree": "8.0.1" + "@typescript-eslint/scope-manager": "8.1.0", + "@typescript-eslint/types": "8.1.0", + "@typescript-eslint/typescript-estree": "8.1.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3427,12 +3417,11 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.0.1.tgz", - "integrity": "sha512-W5E+o0UfUcK5EgchLZsyVWqARmsM7v54/qEq6PY3YI5arkgmCzHiuk0zKSJJbm71V0xdRna4BGomkCTXz2/LkQ==", - "license": "MIT", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.1.0.tgz", + "integrity": "sha512-ba0lNI19awqZ5ZNKh6wCModMwoZs457StTebQ0q1NP58zSi2F6MOZRXwfKZy+jB78JNJ/WH8GSh2IQNzXX8Nag==", "dependencies": { - "@typescript-eslint/types": "8.0.1", + "@typescript-eslint/types": "8.1.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -3447,7 +3436,6 @@ "version": "3.4.3", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -13457,14 +13445,13 @@ } }, "node_modules/typescript-eslint": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.0.1.tgz", - "integrity": "sha512-V3Y+MdfhawxEjE16dWpb7/IOgeXnLwAEEkS7v8oDqNcR1oYlqWhGH/iHqHdKVdpWme1VPZ0SoywXAkCqawj2eQ==", - "license": "MIT", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.1.0.tgz", + "integrity": "sha512-prB2U3jXPJLpo1iVLN338Lvolh6OrcCZO+9Yv6AR+tvegPPptYCDBIHiEEUdqRi8gAv2bXNKfMUrgAd2ejn/ow==", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.0.1", - "@typescript-eslint/parser": "8.0.1", - "@typescript-eslint/utils": "8.0.1" + "@typescript-eslint/eslint-plugin": "8.1.0", + "@typescript-eslint/parser": "8.1.0", + "@typescript-eslint/utils": "8.1.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" diff --git a/package.json b/package.json index 9c6d6e8511fd..6c0435237aa6 100644 --- a/package.json +++ b/package.json @@ -169,7 +169,7 @@ "sort-keys": "5.0.0", "type-fest": "4.24.0", "typescript": "5.4.5", - "typescript-eslint": "8.0.1", + "typescript-eslint": "8.1.0", "winston": "3.14.1", "yaml": "2.5.0", "yeoman-environment": "4.4.1", From c9250d11e35fa3dc4658eec38df7378d6060a43c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 00:17:01 +0000 Subject: [PATCH 224/938] Bump mariadb from 11.4.2 to 11.4.3 in /generators/server/resources Bumps mariadb from 11.4.2 to 11.4.3. --- updated-dependencies: - dependency-name: mariadb dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/server/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile index cf1677a64f72..a1b3efd9c86e 100644 --- a/generators/server/resources/Dockerfile +++ b/generators/server/resources/Dockerfile @@ -18,7 +18,7 @@ LABEL ALIAS=keycloak FROM mysql:9.0.1 -FROM mariadb:11.4.2 +FROM mariadb:11.4.3 FROM mongo:7.0.6 LABEL ALIAS=mongodb From b9f7aaddf06a5a3408a36034c6832b4fe012f66c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 02:00:15 +0000 Subject: [PATCH 225/938] Bump typescript-eslint in /generators/react/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.1 to 8.1.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.1.0/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index 2f82a5ad6158..553dee61cd18 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -81,7 +81,7 @@ "ts-jest": "29.2.4", "ts-loader": "9.5.1", "typescript": "5.5.4", - "typescript-eslint": "8.0.1", + "typescript-eslint": "8.1.0", "webpack": "5.93.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", From 1f236e55304cb6d3d19d4e7145c35f572ac4b9a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 02:08:42 +0000 Subject: [PATCH 226/938] Bump typescript-eslint from 8.0.1 to 8.1.0 in /generators/vue/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.1 to 8.1.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.1.0/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index da9feb96fa6d..7d06f961316b 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -56,7 +56,7 @@ "terser-webpack-plugin": "5.3.10", "ts-loader": "9.5.1", "typescript": "5.5.4", - "typescript-eslint": "8.0.1", + "typescript-eslint": "8.1.0", "vite": "5.4.0", "vite-plugin-static-copy": "1.0.6", "vitest": "2.0.5", From 9c4e0aa5612d8a4c384b81000eba35791da50a5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 03:29:59 +0000 Subject: [PATCH 227/938] Bump typescript-eslint in /generators/angular/resources Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.0.1 to 8.1.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.1.0/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 936dd72e0e24..bfb6215301d9 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -48,7 +48,7 @@ "rimraf": "5.0.8", "ts-jest": "29.2.4", "typescript": "5.4.5", - "typescript-eslint": "8.0.1", + "typescript-eslint": "8.1.0", "webpack": "5.93.0", "webpack-bundle-analyzer": "4.10.2", "webpack-merge": "6.0.1", From f5ce3a17f07dfee4efff2e8b5d5d18659c9fadca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 05:45:24 +0000 Subject: [PATCH 228/938] Bump org.mapstruct:mapstruct in /generators/server/resources Bumps [org.mapstruct:mapstruct](https://github.com/mapstruct/mapstruct) from 1.5.5.Final to 1.6.0. - [Release notes](https://github.com/mapstruct/mapstruct/releases) - [Commits](https://github.com/mapstruct/mapstruct/compare/1.5.5.Final...1.6.0) --- updated-dependencies: - dependency-name: org.mapstruct:mapstruct dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/server/resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/pom.xml b/generators/server/resources/pom.xml index 2596abc3b9fd..e60899ca5511 100644 --- a/generators/server/resources/pom.xml +++ b/generators/server/resources/pom.xml @@ -13,7 +13,7 @@ 1.9.4 3.11.5 0.2.6 - 1.5.5.Final + 1.6.0 1.1.1 4.7.6 From 80a550a03b6f1bbc2804aa7b50c3f91369fb2091 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 07:23:57 +0000 Subject: [PATCH 229/938] Bump eslint-plugin-cypress in /generators/client/resources Bumps [eslint-plugin-cypress](https://github.com/cypress-io/eslint-plugin-cypress) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/cypress-io/eslint-plugin-cypress/releases) - [Commits](https://github.com/cypress-io/eslint-plugin-cypress/compare/v3.4.0...v3.5.0) --- updated-dependencies: - dependency-name: eslint-plugin-cypress dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/client/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/resources/package.json b/generators/client/resources/package.json index 0ed737d3dcfa..59937cb09c70 100644 --- a/generators/client/resources/package.json +++ b/generators/client/resources/package.json @@ -8,7 +8,7 @@ "babel-plugin-istanbul": "7.0.0", "cypress": "13.13.2", "cypress-audit": "1.1.0", - "eslint-plugin-cypress": "3.4.0", + "eslint-plugin-cypress": "3.5.0", "lighthouse": "12.2.0", "nyc": "17.0.0", "swagger-ui-dist": "5.17.14" From 16c10f260edafcf74bddb78d60ecaa40fa542200 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 07:24:09 +0000 Subject: [PATCH 230/938] Bump @cypress/code-coverage in /generators/client/resources Bumps [@cypress/code-coverage](https://github.com/cypress-io/code-coverage) from 3.12.44 to 3.12.45. - [Release notes](https://github.com/cypress-io/code-coverage/releases) - [Changelog](https://github.com/cypress-io/code-coverage/blob/master/.releaserc) - [Commits](https://github.com/cypress-io/code-coverage/compare/v3.12.44...v3.12.45) --- updated-dependencies: - dependency-name: "@cypress/code-coverage" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/client/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/resources/package.json b/generators/client/resources/package.json index 0ed737d3dcfa..1b59cb593e47 100644 --- a/generators/client/resources/package.json +++ b/generators/client/resources/package.json @@ -3,7 +3,7 @@ "dayjs": "1.11.12" }, "devDependencies": { - "@cypress/code-coverage": "3.12.44", + "@cypress/code-coverage": "3.12.45", "babel-loader": "9.1.3", "babel-plugin-istanbul": "7.0.0", "cypress": "13.13.2", From 897ed7cc8108cafa3bdda0c39ce46dabcca82ae9 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 13 Aug 2024 07:40:08 -0300 Subject: [PATCH 231/938] test adjust --- generators/react/generator.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/react/generator.spec.ts b/generators/react/generator.spec.ts index e3c7b389cbbf..f8fec51ed5c6 100644 --- a/generators/react/generator.spec.ts +++ b/generators/react/generator.spec.ts @@ -99,7 +99,7 @@ describe(`generator - ${clientFramework}`, () => { assertion( `${clientSrcDir}app/modules/administration/administration.reducer.ts`, 'logs: {\n' + - ' loggers: [] as any[]\n' + + ' loggers: [] as any[],\n' + ' },\n' + ' health: {} as any,\n' + ' metrics: {} as any,\n' + From 0e286c4dbd273af5a01b221af058fc8230dad2a2 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 12 Aug 2024 19:27:31 -0300 Subject: [PATCH 232/938] replace v-on: --- .../app/account/activate/activate.vue.ejs | 2 +- .../change-password/change-password.vue.ejs | 2 +- .../app/account/login-form/login-form.vue.ejs | 2 +- .../app/account/register/register.vue.ejs | 4 +-- .../finish/reset-password-finish.vue.ejs | 4 +-- .../init/reset-password-init.vue.ejs | 2 +- .../app/account/sessions/sessions.vue.ejs | 2 +- .../app/account/settings/settings.vue.ejs | 2 +- .../admin/configuration/configuration.vue.ejs | 4 +-- .../webapp/app/admin/gateway/gateway.vue.ejs | 2 +- .../webapp/app/admin/health/health.vue.ejs | 4 +-- .../main/webapp/app/admin/logs/logs.vue.ejs | 16 ++++++------ .../app/admin/metrics/metrics-modal.vue.ejs | 12 ++++----- .../webapp/app/admin/metrics/metrics.vue.ejs | 4 +-- .../user-management-edit.vue.ejs | 4 +-- .../user-management/user-management.vue.ejs | 26 +++++++++---------- .../main/webapp/app/core/home/home.vue.ejs | 2 +- .../app/core/jhi-navbar/jhi-navbar.vue.ejs | 6 ++--- .../_entityFile_-details.vue.ejs | 6 ++--- .../_entityFile_-update.vue.ejs | 12 ++++----- .../_entityFolder_/_entityFile_.vue.ejs | 24 ++++++++--------- 21 files changed, 71 insertions(+), 71 deletions(-) diff --git a/generators/vue/templates/src/main/webapp/app/account/activate/activate.vue.ejs b/generators/vue/templates/src/main/webapp/app/account/activate/activate.vue.ejs index 77e8ce22ff67..d34170165871 100644 --- a/generators/vue/templates/src/main/webapp/app/account/activate/activate.vue.ejs +++ b/generators/vue/templates/src/main/webapp/app/account/activate/activate.vue.ejs @@ -5,7 +5,7 @@

    Activation

    Your user account has been activated. Please - sign in. + sign in.
    Your user could not be activated. Please use the registration form to sign up. diff --git a/generators/vue/templates/src/main/webapp/app/account/change-password/change-password.vue.ejs b/generators/vue/templates/src/main/webapp/app/account/change-password/change-password.vue.ejs index dcf4a5bf7a4a..f1ef455ddd21 100644 --- a/generators/vue/templates/src/main/webapp/app/account/change-password/change-password.vue.ejs +++ b/generators/vue/templates/src/main/webapp/app/account/change-password/change-password.vue.ejs @@ -20,7 +20,7 @@ The password and its confirmation do not match!
    -
    +
    - +
    - +

    If you want to - sign insign in, you can try the default accounts:
    - Administrator (login="admin" and password="admin")
    - User (login="user" and password="user").     Your password had been reset. Please - sign in + sign in

    The password and its confirmation do not match!

    @@ -27,7 +27,7 @@
    - +
    Check your email for details on how to reset your password.

    - +
    {{ session.userAgent }} {{ session.tokenDate }} - diff --git a/generators/vue/templates/src/main/webapp/app/account/settings/settings.vue.ejs b/generators/vue/templates/src/main/webapp/app/account/settings/settings.vue.ejs index ae8ff86702dc..18630346bc70 100644 --- a/generators/vue/templates/src/main/webapp/app/account/settings/settings.vue.ejs +++ b/generators/vue/templates/src/main/webapp/app/account/settings/settings.vue.ejs @@ -20,7 +20,7 @@ Email is already in use! Please choose another one.
    - +
    - + Prefix - + Properties diff --git a/generators/vue/templates/src/main/webapp/app/admin/gateway/gateway.vue.ejs b/generators/vue/templates/src/main/webapp/app/admin/gateway/gateway.vue.ejs index ccafc74e16eb..7995f0d6cade 100644 --- a/generators/vue/templates/src/main/webapp/app/admin/gateway/gateway.vue.ejs +++ b/generators/vue/templates/src/main/webapp/app/admin/gateway/gateway.vue.ejs @@ -2,7 +2,7 @@

    Gateway -

    diff --git a/generators/vue/templates/src/main/webapp/app/admin/health/health.vue.ejs b/generators/vue/templates/src/main/webapp/app/admin/health/health.vue.ejs index 153d9ba67f9f..bbb852d2f87e 100644 --- a/generators/vue/templates/src/main/webapp/app/admin/health/health.vue.ejs +++ b/generators/vue/templates/src/main/webapp/app/admin/health/health.vue.ejs @@ -2,7 +2,7 @@

    Health Checks -

    @@ -24,7 +24,7 @@ - + diff --git a/generators/vue/templates/src/main/webapp/app/admin/logs/logs.vue.ejs b/generators/vue/templates/src/main/webapp/app/admin/logs/logs.vue.ejs index 64e77b3134de..e1263f815f37 100644 --- a/generators/vue/templates/src/main/webapp/app/admin/logs/logs.vue.ejs +++ b/generators/vue/templates/src/main/webapp/app/admin/logs/logs.vue.ejs @@ -10,8 +10,8 @@ - - + + @@ -21,42 +21,42 @@
    NameLevelNameLevel