generator-jhipster 8.10.0 → 8.11.0

package/README.md

@@ -19,7 +19,7 @@ We are honored by any contributions you may have small or large. Please refer to
 The following Java and Node combinations are tested and verified by GitHub Actions:
 
 | Java     | Node     | Status |
-|----------| -------- | ------ |
+| -------- | -------- | ------ |
 | 17/21/24 | 18/20/22 | ✅     |
 
 ## Sponsors

package/dist/cli/cli.mjs

@@ -16,28 +16,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { dirname, join, relative } from 'path';
-import { fileURLToPath } from 'url';
-import { existsSync } from 'fs';
 import semver from 'semver';
-import chalk from 'chalk';
 import { packageJson } from '../lib/index.js';
 import { runJHipster } from './program.mjs';
 import { done, logger } from './utils.mjs';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
 const currentNodeVersion = process.versions.node;
 const minimumNodeVersion = packageJson.engines.node;
 if (!process.argv.includes('--skip-checks') && !semver.satisfies(currentNodeVersion, minimumNodeVersion)) {
     logger.fatal(`You are running Node version ${currentNodeVersion}.\nJHipster requires Node version ${minimumNodeVersion}.\nPlease update your version of Node.`);
 }
-const appFolderOrWorkspaceRoot = existsSync('../node_modules') ? join(process.cwd(), '..') : process.cwd();
-// If this file is not inside app npm repository and the executable exists inside the repository show warning.
-if (relative(appFolderOrWorkspaceRoot, __dirname).startsWith('..') &&
-    existsSync(join(appFolderOrWorkspaceRoot, 'node_modules/.bin/jhipster'))) {
-    logger.warn(`Since JHipster v8, the jhipster command will not use the locally installed generator-jhipster.
-    If you want to execute the locally installed generator-jhipster, run: ${chalk.yellow('npx jhipster')}`);
-}
 export default runJHipster().catch(done);
 process.on('unhandledRejection', up => {
     logger.error('Unhandled promise rejection at:');

package/dist/cli/environment-builder.mjs

@@ -99,7 +99,9 @@ export default class EnvironmentBuilder {
         this.env = env;
     }
     async prepare({ blueprints, lookups, devBlueprintPath = jhipsterDevBlueprintPath } = {}) {
-        this.devBlueprintPath = existsSync(devBlueprintPath) ? devBlueprintPath : undefined;
+        const devBlueprintEnabled = existsSync(devBlueprintPath);
+        this.env.sharedOptions.devBlueprintEnabled = devBlueprintEnabled;
+        this.devBlueprintPath = devBlueprintEnabled ? devBlueprintPath : undefined;
         this.localBlueprintPath = path.join(process.cwd(), '.blueprint');
         this.localBlueprintExists = this.localBlueprintPath !== this.devBlueprintPath && existsSync(this.localBlueprintPath);
         await this._lookupJHipster();

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

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@angular/common": "19.2.4",
+    "@angular/common": "19.2.9",
     "@fortawesome/angular-fontawesome": "1.0.0",
     "@fortawesome/fontawesome-svg-core": "6.7.2",
     "@fortawesome/free-solid-svg-icons": "6.7.2",
@@ -9,8 +9,8 @@
     "@ngx-translate/http-loader": "16.0.1",
     "@popperjs/core": "2.11.8",
     "@stomp/rx-stomp": "2.0.1",
-    "bootstrap": "5.3.3",
-    "bootswatch": "5.3.3",
+    "bootstrap": "5.3.6",
+    "bootswatch": "5.3.5",
     "ngx-cookie-service": "19.1.2",
     "ngx-infinite-scroll": "19.0.0",
     "rxjs": "7.8.2",
@@ -21,38 +21,38 @@
   "devDependencies": {
     "@angular-architects/module-federation": "19.0.3",
     "@angular-architects/module-federation-runtime": "19.0.3",
-    "@angular-builders/custom-esbuild": "19.0.0",
-    "@angular-builders/custom-webpack": "19.0.0",
-    "@angular-builders/jest": "19.0.0",
-    "@angular/cli": "19.2.5",
-    "@eslint/js": "9.23.0",
+    "@angular-builders/custom-esbuild": "19.1.0",
+    "@angular-builders/custom-webpack": "19.0.1",
+    "@angular-builders/jest": "19.0.1",
+    "@angular/cli": "19.2.10",
+    "@eslint/js": "9.26.0",
     "@types/jest": "29.5.14",
     "@types/node": "20.11.25",
     "@types/sockjs-client": "1.5.4",
     "angular-eslint": "19.3.0",
-    "browser-sync": "3.0.3",
+    "browser-sync": "3.0.4",
     "browser-sync-webpack-plugin": "2.3.0",
     "buffer": "6.0.3",
     "copy-webpack-plugin": "13.0.0",
     "deepmerge": "4.3.1",
-    "eslint": "9.23.0",
-    "eslint-config-prettier": "10.1.1",
-    "eslint-plugin-prettier": "5.2.5",
+    "eslint": "9.26.0",
+    "eslint-config-prettier": "10.1.2",
+    "eslint-plugin-prettier": "5.4.0",
     "folder-hash": "4.1.1",
     "globals": "16.0.0",
     "globby": "14.1.0",
     "jest": "29.7.0",
     "jest-date-mock": "1.0.10",
     "jest-junit": "16.0.0",
-    "jest-preset-angular": "14.5.3",
+    "jest-preset-angular": "14.5.5",
     "jest-sonar": "0.2.16",
     "merge-jsons-webpack-plugin": "2.0.1",
-    "postcss-rtlcss": "5.6.0",
+    "postcss-rtlcss": "5.7.0",
     "rimraf": "5.0.8",
-    "ts-jest": "29.3.0",
-    "typescript": "5.8.2",
-    "typescript-eslint": "8.29.0",
-    "webpack": "5.98.0",
+    "ts-jest": "29.3.2",
+    "typescript": "5.8.3",
+    "typescript-eslint": "8.32.0",
+    "webpack": "5.99.7",
     "webpack-bundle-analyzer": "4.10.2",
     "webpack-merge": "6.0.1",
     "webpack-notifier": "1.15.0"

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

@@ -44,5 +44,5 @@ update <%= clientSrcDir %>app/app.config.ts
 
 <&_ } -&>
 <&_ if (fragment.referenceSection) { _&>
-[Angular CLI]: https://cli.angular.io/
+[Angular CLI]: https://angular.dev/tools/cli
 <&_ } -&>

package/dist/generators/angular/templates/eslint.config.js.jhi.angular.ejs

@@ -126,11 +126,9 @@ import angular from 'angular-eslint';
   {
     files: ['**/*.html'],
     extends: [...angular.configs.templateRecommended, ...angular.configs.templateAccessibility],
-    rules: {},
-  },
-  {
-    // Html templates require some work
-    ignores: ['**/*.html'],
-    extends: [prettier],
+    rules: {
+      '@angular-eslint/template/click-events-have-key-events': 'off',
+      '@angular-eslint/template/interactive-supports-focus': 'off',
+    },
   },
 <&_ } -&>

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs

@@ -137,7 +137,7 @@
 
   <div>
     <div class="d-flex justify-content-center">
-      <<%= jhiPrefixDashed %>-item-count [params]="{ page: page, totalItems: totalItems(), itemsPerPage: itemsPerPage }" />
+      <<%= jhiPrefixDashed %>-item-count [params]="{ page, totalItems: totalItems(), itemsPerPage }" />
     </div>
 
     <div class="d-flex justify-content-center">

package/dist/generators/angular/templates/src/main/webapp/app/core/tracker/tracker.service.ts.ejs

@@ -85,7 +85,7 @@ export class TrackerService {
     return this.rxStomp;
   }
 
-  public subscribe(observer: Partial<Observer<TrackerActivity>>): Subscription {
+  subscribe(observer: Partial<Observer<TrackerActivity>>): Subscription {
     return (
       this.stomp
         .watch(DESTINATION_TRACKER)

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs

@@ -221,7 +221,7 @@ _%>
 @if (<%= entityInstancePlural %>().length > 0) {
     <div>
         <div class="d-flex justify-content-center">
-            <<%= jhiPrefixDashed %>-item-count [params]="{ page: page, totalItems: totalItems, itemsPerPage: itemsPerPage }" />
+            <<%= jhiPrefixDashed %>-item-count [params]="{ page, totalItems, itemsPerPage }" />
         </div>
 
         <div class="d-flex justify-content-center">

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs

@@ -177,7 +177,7 @@ _%>
                         <option [ngValue]="null" selected></option>
                     }
     <%_ } else { _%>
-                    @if (editForm.get(['<%- relationship.propertyName %>'])!.value == null) {
+                    @if (editForm.get(['<%- relationship.propertyName %>'])!.value === null) {
                         <option [ngValue]="null" selected></option>
                     }
     <%_ } _%>

package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort.service.ts.ejs

@@ -26,7 +26,7 @@ export class SortService {
     sensitivity: 'base',
   });
 
-  public startSort({ predicate, order }: Required<SortState>, fallback?: Required<SortState>): (a: any, b: any) => number {
+  startSort({ predicate, order }: Required<SortState>, fallback?: Required<SortState>): (a: any, b: any) => number {
     const multiply = order === 'desc' ? -1 : 1;
     return (a: any, b: any) => {
       const compare = this.collator.compare(a[predicate], b[predicate]);
@@ -37,7 +37,7 @@ export class SortService {
     };
   }
 
-  public parseSortParam(sortParam: string | undefined): SortState {
+  parseSortParam(sortParam: string | undefined): SortState {
     if (sortParam?.includes(',')) {
       const split = sortParam.split(',');
       if (split[0]) {
@@ -47,7 +47,7 @@ export class SortService {
     return { predicate: sortParam?.length ? sortParam : undefined };
   }
 
-  public buildSortParam({ predicate, order }: SortState, fallback?: string): string[] {
+  buildSortParam({ predicate, order }: SortState, fallback?: string): string[] {
     const sortParam = predicate && order ? [`${predicate},${order}`] : [];
     if (fallback && predicate !== fallback) {
       sortParam.push(`${fallback},asc`);

package/dist/generators/base/api.d.ts

@@ -18,6 +18,8 @@ export type JHipsterGeneratorOptions = BaseOptions &
     programName: string;
     positionalArguments?: unknown[];
     createEnvBuilder?: any;
+    devBlueprintEnabled?: boolean;
+
     /** @experimental */
     jdlDefinition?: JDLApplicationConfig;
     /** @experimental */
@@ -115,7 +117,7 @@ export type NeedleCallback = (content: string) => string;
 
 export type EditFileCallback<Generator = CoreGenerator> = (this: Generator, content: string, filePath: string) => string;
 
-export type EditFileOptions = { create?: boolean; ignoreNonExisting?: boolean | string; assertModified?: boolean };
+export type EditFileOptions = { create?: boolean; ignoreNonExisting?: boolean | string; assertModified?: boolean; autoCrlf?: boolean };
 
 export type CascatedEditFileCallback<Generator = CoreGenerator> = (
   ...callbacks: EditFileCallback<Generator>[]

package/dist/generators/base/shared-data.js

@@ -56,6 +56,7 @@ export default class SharedData {
         defaults(this._storage.sharedApplication, {
             nodeDependencies: {},
             customizeTemplatePaths: [],
+            user: undefined,
         });
         let customizeRemoveFiles = [];
         const removeFiles = async (assertions, ...files) => {

package/dist/generators/base/support/contents.d.ts

@@ -16,6 +16,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export declare const CRLF = "\r\n";
+export declare const LF = "\n";
+/**
+ * Check if a string contains CRLF line endings.
+ *
+ * @param str
+ * @returns
+ */
+export declare const hasCrlr: (str?: string) => boolean;
 /**
  * Replace line endings with the specified one.
  *
@@ -23,7 +32,7 @@
  * @param lineEnding
  * @returns normalized line ending string
  */
-export declare function normalizeLineEndings(str: string, lineEnding: '\n' | '\r\n'): string;
+export declare function normalizeLineEndings(str: string, lineEnding: typeof LF | typeof CRLF): string;
 /**
  * @private
  * @deprecated

package/dist/generators/base/support/contents.js

@@ -16,6 +16,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export const CRLF = '\r\n';
+export const LF = '\n';
+/**
+ * Check if a string contains CRLF line endings.
+ *
+ * @param str
+ * @returns
+ */
+export const hasCrlr = (str) => Boolean(str?.includes(CRLF));
 /**
  * Replace line endings with the specified one.
  *

package/dist/generators/base/support/index.d.ts

@@ -28,6 +28,7 @@ export { default as getHipster } from './hipster.js';
 export * from './jhipster7-context.js';
 export * from './namespace.js';
 export * from './needles.js';
+export * from './os.js';
 export * from './path.js';
 export { default as httpsGet } from './remote.js';
 export * from './secret.js';

package/dist/generators/base/support/index.js

@@ -28,6 +28,7 @@ export { default as getHipster } from './hipster.js';
 export * from './jhipster7-context.js';
 export * from './namespace.js';
 export * from './needles.js';
+export * from './os.js';
 export * from './path.js';
 export { default as httpsGet } from './remote.js';
 export * from './secret.js';

package/dist/generators/base/support/needles.js

@@ -19,7 +19,6 @@
 import assert from 'assert';
 import { escapeRegExp, kebabCase } from 'lodash-es';
 import { joinCallbacks } from './write-files.js';
-import { normalizeLineEndings } from './contents.js';
 /**
  * Change spaces sequences and characters that prettier breaks line (<>()) to allow any number of spaces or new line prefix
  */
@@ -62,9 +61,6 @@ export const insertContentBeforeNeedle = ({ content, contentToAdd, needle, autoI
     assert(needle, 'needle is required');
     assert(content, 'content is required');
     assert(contentToAdd, 'contentToAdd is required');
-    const isCrLr = content.includes('\r\n');
-    content = isCrLr ? normalizeLineEndings(content, '\n') : content;
-    const lineEnding = isCrLr ? '\r\n' : '\n';
     needle = needle.includes('jhipster-needle-') ? needle : `jhipster-needle-${needle}`;
     const regexp = new RegExp(`(?://|<!--|/\\*|#) ${needle}(?:$|\n| )`, 'g');
     const firstMatch = regexp.exec(content);
@@ -87,7 +83,7 @@ export const insertContentBeforeNeedle = ({ content, contentToAdd, needle, autoI
             needleIndent,
             indentPrefix: ' '.repeat(needleIndent),
         });
-        return isCrLr ? normalizeLineEndings(newContent, lineEnding) : newContent;
+        return newContent;
     }
     contentToAdd = Array.isArray(contentToAdd) ? contentToAdd : [contentToAdd];
     if (autoIndent) {
@@ -118,7 +114,7 @@ export const insertContentBeforeNeedle = ({ content, contentToAdd, needle, autoI
         contentToAdd = contentToAdd.map(line => (line.length > identToRemove ? line.substring(identToRemove) : ''));
     }
     const newContent = `${beforeContent}${contentToAdd.join('\n')}\n${afterContent}`;
-    return isCrLr ? normalizeLineEndings(newContent, lineEnding) : newContent;
+    return newContent;
 };
 /**
  * Create an callback to insert the new content into existing content.

package/dist/generators/base/support/os.d.ts

@@ -0,0 +1 @@
+export declare const isWin32: boolean;

package/dist/generators/base/support/os.js

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2013-2025 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 { platform } from 'os';
+export const isWin32 = platform() === 'win32';

package/dist/generators/base/support/write-files.d.ts

@@ -1,3 +1,21 @@
+/**
+ * Copyright 2013-2025 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 type { EditFileCallback } from '../api.js';
 /**
  * TODO move to utils when converted to typescripts

package/dist/generators/base/support/write-files.js

@@ -1,35 +1,9 @@
-/**
- * Copyright 2013-2025 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 { platform } from 'os';
-import { normalizeLineEndings } from './contents.js';
-const isWin32 = platform() === 'win32';
 /**
  * TODO move to utils when converted to typescripts
  * Converts multiples EditFileCallback callbacks into one.
  */
 export function joinCallbacks(...callbacks) {
     return function (content, filePath) {
-        if (isWin32 && /\r\n/.exec(content)) {
-            const removeSlashRSlashN = ct => normalizeLineEndings(ct, '\n');
-            const addSlashRSlashN = ct => normalizeLineEndings(ct, '\r\n');
-            callbacks = [removeSlashRSlashN, ...callbacks, addSlashRSlashN];
-        }
         for (const callback of callbacks) {
             content = callback.call(this, content, filePath);
         }

package/dist/generators/base-core/generator.js

@@ -32,7 +32,7 @@ import YeomanGenerator from 'yeoman-generator';
 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 { createJHipster7Context, formatDateForChangelog, joinCallbacks, removeFieldsWithNullishValues } from '../base/support/index.js';
+import { CRLF, LF, createJHipster7Context, formatDateForChangelog, hasCrlr, joinCallbacks, normalizeLineEndings, removeFieldsWithNullishValues, } from '../base/support/index.js';
 import { convertConfigToOption, } from '../../lib/command/index.js';
 import { packageJson } from '../../lib/index.js';
 import { GENERATOR_BOOTSTRAP } from '../generator-list.js';
@@ -171,6 +171,7 @@ export default class CoreGenerator extends YeomanGenerator {
             skipFakeData: false,
             skipCheckLengthOfIdentifier: false,
             enableGradleEnterprise: false,
+            autoCrlf: false,
             pages: [],
         });
         return configWithDefaults;
@@ -1051,16 +1052,18 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
         }
         let newContent = originalContent;
         const writeCallback = (...callbacks) => {
+            const { autoCrlf = this.jhipsterConfigWithDefaults.autoCrlf, assertModified } = actualOptions;
             try {
-                newContent = joinCallbacks(...callbacks).call(this, newContent, filePath);
-                if (actualOptions.assertModified && originalContent === newContent) {
+                const fileHasCrlf = autoCrlf && hasCrlr(newContent);
+                newContent = joinCallbacks(...callbacks).call(this, fileHasCrlf ? normalizeLineEndings(newContent, LF) : newContent, filePath);
+                if (assertModified && originalContent === newContent) {
                     const errorMessage = `${chalk.yellow('Fail to modify ')}${filePath}.`;
                     if (!this.ignoreNeedlesError) {
                         throw new Error(errorMessage);
                     }
                     this.log(errorMessage);
                 }
-                this.writeDestination(filePath, newContent);
+                this.writeDestination(filePath, fileHasCrlf ? normalizeLineEndings(newContent, CRLF) : newContent);
             }
             catch (error) {
                 if (error instanceof Error) {

package/dist/generators/bootstrap/generator.js

@@ -16,6 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { rm } from 'fs/promises';
 import { createConflicterTransform, createYoResolveTransform, forceYoFiles } from '@yeoman/conflicter';
 import { transform } from '@yeoman/transform';
 import { isFilePending, isFileStateModified } from 'mem-fs-editor/state';
@@ -169,9 +170,37 @@ export default class BootstrapGenerator extends BaseGenerator {
             }));
         }
         const autoCrlfTransforms = [];
-        if (this.jhipsterConfig.autoCrlf) {
+        if (this.jhipsterConfigWithDefaults.autoCrlf) {
             autoCrlfTransforms.push(await autoCrlfTransform({ baseDir: this.destinationPath() }));
         }
+        let customizeActions;
+        if (this.options.devBlueprintEnabled) {
+            customizeActions = (actions, { separator }) => {
+                return [
+                    ...actions,
+                    ...(separator ? [separator()] : []),
+                    {
+                        key: 't',
+                        name: 'apply to template',
+                        value: async ({ file }) => {
+                            const { applyChangesToFileOrCopy } = await import('../../lib/testing/apply-patch-to-template.js');
+                            if (file.history?.[0] && file.conflicterData?.diskContents) {
+                                const templateFile = file.history[0];
+                                if (!file.contents) {
+                                    await rm(templateFile, { force: true });
+                                }
+                                else {
+                                    const oldFileContents = file.conflicterData.diskContents.toString();
+                                    const newFileContents = file.contents.toString();
+                                    applyChangesToFileOrCopy({ templateFile, oldFileContents, newFileContents });
+                                }
+                            }
+                            return 'skip';
+                        },
+                    },
+                ];
+            };
+        }
         const transformStreams = [
             ...skipYoResolveTransforms,
             forceYoFiles(),
@@ -179,7 +208,7 @@ export default class BootstrapGenerator extends BaseGenerator {
             createForceWriteConfigFilesTransform(),
             ...prettierTransforms,
             ...autoCrlfTransforms,
-            createConflicterTransform(this.env.adapter, { ...this.env.conflicterOptions }),
+            createConflicterTransform(this.env.adapter, { ...this.env.conflicterOptions, customizeActions }),
             createCommitTransform(),
         ];
         await this.pipeline({

package/dist/generators/bootstrap/support/auto-crlf-transform.js

@@ -23,7 +23,7 @@ import { transform } from 'p-transform';
 import { isBinaryFile } from 'isbinaryfile';
 import { simpleGit } from 'simple-git';
 import { isFileStateModified } from 'mem-fs-editor/state';
-import { normalizeLineEndings } from '../../base/support/index.js';
+import { CRLF, normalizeLineEndings } from '../../base/support/index.js';
 /**
  * Detect the file first line endings
  */
@@ -70,7 +70,7 @@ const autoCrlfTransform = async ({ baseDir }) => {
                     .map(attr => attr.split(':'))
                     .map(([_file, attr, value]) => [attr, value]));
                 if (attrs.eol === 'crlf' || (attrs.binary !== 'set' && attrs.eol !== 'lf' && (await detectCrLf(file.path)))) {
-                    file.contents = Buffer.from(normalizeLineEndings(file.contents.toString(), '\r\n'));
+                    file.contents = Buffer.from(normalizeLineEndings(file.contents.toString(), CRLF));
                 }
             }
         }

package/dist/generators/bootstrap-application-base/generator.js

@@ -17,7 +17,6 @@
  * limitations under the License.
  */
 import assert from 'assert';
-import os from 'os';
 import { lowerFirst } from 'lodash-es';
 import chalk from 'chalk';
 import { passthrough } from '@yeoman/transform';
@@ -32,11 +31,10 @@ import { loadAppConfig, loadDerivedAppConfig, loadStoredAppOptions } from '../ap
 import { lookupCommandsConfigs } from '../../lib/command/lookup-commands-configs.js';
 import { loadCommandConfigsIntoApplication, loadCommandConfigsKeysIntoTemplatesContext } from '../../lib/command/load.js';
 import { getConfigWithDefaults } from '../../lib/jhipster/default-application-options.js';
-import { removeFieldsWithNullishValues } from '../base/support/index.js';
+import { isWin32, removeFieldsWithNullishValues } from '../base/support/index.js';
 import { convertFieldBlobType, getBlobContentType, isFieldBinaryType, isFieldBlobType } from '../../lib/application/field-types.js';
 import { createAuthorityEntity, createUserEntity, createUserManagementEntity } from './utils.js';
 import { exportJDLTransform, importJDLTransform } from './support/index.js';
-const isWin32 = os.platform() === 'win32';
 export default class BootstrapApplicationBase extends BaseApplicationGenerator {
     constructor(args, options, features) {
         super(args, options, { jhipsterBootstrap: false, ...features });

package/dist/generators/client/resources/package.json

@@ -6,12 +6,12 @@
     "@cypress/code-coverage": "3.14.0",
     "babel-loader": "9.2.1",
     "babel-plugin-istanbul": "7.0.0",
-    "cypress": "14.2.1",
+    "cypress": "14.3.2",
     "cypress-audit": "1.1.0",
-    "eslint-plugin-cypress": "4.2.0",
-    "lighthouse": "12.5.1",
+    "eslint-plugin-cypress": "4.3.0",
+    "lighthouse": "12.6.0",
     "nyc": "17.1.0",
-    "swagger-ui-dist": "5.20.2"
+    "swagger-ui-dist": "5.21.0"
   },
   "packageManager": "npm@11"
 }

package/dist/generators/common/resources/package.json

@@ -1,7 +1,7 @@
 {
   "devDependencies": {
     "concurrently": "9.1.2",
-    "npm": "11.2.0",
+    "npm": "11.3.0",
     "wait-on": "8.0.3"
   },
   "packageManager": "npm@11"

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/logout.cy.ts.ejs

@@ -26,13 +26,21 @@ describe('logout', () => {
   const username = Cypress.env('E2E_USERNAME') ?? '<%- generateInMemoryUserCredentials ? 'admin' : 'user' %>';
   const password = Cypress.env('E2E_PASSWORD') ?? '<%- generateInMemoryUserCredentials ? 'admin' : 'user' %>';
 
+<%_ if (authenticationUsesCsrf) { _%>
+  beforeEach(() => {
+    cy.intercept('POST', '/api/logout').as('logout');
+  });
+
+<%_ } _%>
   it<%- clientFrameworkReact ? '.skip' : '' %>('go to home page when successfully logs out', () => {
     cy.login(username, password);
     cy.visit('');
+
     cy.clickOnLogoutItem();
-    // Wait logout
-    cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
-    cy.visit('');
+
+<%_ if (authenticationUsesCsrf) { _%>
+    cy.wait('@logout');
+<%_ } _%>
     cy.get(navbarSelector).get(accountMenuSelector).click();
     cy.get(navbarSelector).get(accountMenuSelector).get(loginItemSelector).should('be.visible');
   });

package/dist/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs

@@ -58,8 +58,8 @@ Cypress.Commands.add('keycloakLogin', (oauth2Data, username: string, password: s
         followRedirect: false,
         form: true,
         body: {
-          username: username,
-          password: password,
+          username,
+          password,
         },
       });
     })
@@ -91,8 +91,8 @@ Cypress.Commands.add('auth0Login', (oauth2Data, username: string, password: stri
         body: {
           state: state,
           action: 'default',
-          username: username,
-          password: password,
+          username,
+          password,
         },
       });
     })