generator-jhipster 8.5.0 → 8.6.0

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

@@ -25,7 +25,7 @@ import assert from 'assert';
 import { requireNamespace } from '@yeoman/namespace';
 import chalk from 'chalk';
 import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
-import { kebabCase, snakeCase, merge, get, set, defaults } from 'lodash-es';
+import { kebabCase, snakeCase, merge, get, set, defaults, mergeWith } from 'lodash-es';
 import { simpleGit } from 'simple-git';
 import semver, { lt as semverLessThan } from 'semver';
 import YeomanGenerator from 'yeoman-generator';
@@ -42,6 +42,7 @@ import { convertConfigToOption } from '../../lib/internal/index.js';
 import { getGradleLibsVersionsProperties } from '../gradle/support/dependabot-gradle.js';
 import { dockerPlaceholderGenerator } from '../docker/utils.js';
 import { getConfigWithDefaults } from '../../jdl/index.js';
+import { extractArgumentsFromConfigs } from '../base/internal/command.js';
 const { INITIALIZING, PROMPTING, CONFIGURING, COMPOSING, COMPOSING_COMPONENT, LOADING, PREPARING, POST_PREPARING, DEFAULT, WRITING, POST_WRITING, INSTALL, POST_INSTALL, END, } = PRIORITY_NAMES;
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -50,6 +51,7 @@ const relativeDir = (from, to) => {
     const rel = posixRelative(from, to);
     return rel ? `${rel}/` : '';
 };
+const deepMerge = (source1, source2) => mergeWith({}, source1, source2, (a, b) => (Array.isArray(a) ? a.concat(b) : undefined));
 /**
  * This is the base class for a generator for every generator.
  */
@@ -71,6 +73,7 @@ export default class CoreGenerator extends YeomanGenerator {
     static END = asPriority(END);
     useVersionPlaceholders;
     skipChecks;
+    ignoreNeedlesError;
     experimental;
     debugEnabled;
     jhipster7Migration;
@@ -101,14 +104,12 @@ export default class CoreGenerator extends YeomanGenerator {
             unique: 'namespace',
             ...features,
         });
-        let jhipsterOldVersion = null;
         if (!this.options.help) {
             /* Force config to use 'generator-jhipster' namespace. */
             this._config = this._getStorage('generator-jhipster');
             /* JHipster config using proxy mode used as a plain object instead of using get/set. */
             this.jhipsterConfig = this.config.createProxy();
-            jhipsterOldVersion = this.jhipsterConfig.jhipsterVersion ?? null;
-            this.sharedData = this.createSharedData({ jhipsterOldVersion, help: this.options.help });
+            this.sharedData = this.createSharedData({ help: this.options.help });
             /* Options parsing must be executed after forcing jhipster storage namespace and after sharedData have been populated */
             this.parseJHipsterOptions(command.options);
             // Don't write jhipsterVersion to .yo-rc.json when reproducible
@@ -297,7 +298,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
                 context[name] = context[name] ?? config?.[name] ?? this.config.get(name) ?? def.default;
             }
             if (def.scope === 'generator') {
-                context[name] = context[name] ?? this[name] ?? def.default;
+                this[name] = this[name] ?? this.options[name] ?? def.default;
             }
             if (def.scope === 'blueprint') {
                 context[name] = context[name] ?? this.blueprintStorage?.get(name) ?? def.default;
@@ -323,15 +324,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
             this.parseJHipsterArguments(commandDef.arguments);
         }
         else if (commandDef.configs) {
-            this.parseJHipsterArguments(Object.fromEntries(Object.entries(commandDef.configs)
-                .filter(([_name, def]) => def.argument)
-                .map(([name, def]) => [
-                name,
-                {
-                    description: def.description,
-                    ...def.argument,
-                },
-            ])));
+            this.parseJHipsterArguments(extractArgumentsFromConfigs(commandDef.configs));
         }
         if (commandDef.options || commandDef.configs) {
             this.parseJHipsterOptions(commandDef.options, commandDef.configs);
@@ -626,7 +619,12 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
         // 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 = this.jhipsterTemplatesFolders ?? this.templatePath();
-        return this.renderTemplate(source, destination, data, { root, ...options }, { noGlob: true, ...copyOptions });
+        try {
+            return this.renderTemplate(source, destination, data, { root, ...options }, { noGlob: true, ...copyOptions });
+        }
+        catch (error) {
+            throw new Error(`Error writing file ${source} to ${destination}: ${error}`, { cause: error });
+        }
     }
     /**
      * write the given files using provided options.
@@ -635,10 +633,15 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
         const paramCount = Object.keys(options).filter(key => ['sections', 'blocks', 'templates'].includes(key)).length;
         assert(paramCount > 0, 'One of sections, blocks or templates is required');
         assert(paramCount === 1, 'Only one of sections, blocks or templates must be provided');
-        const { sections, blocks, templates, rootTemplatesPath, context = this, transform: methodTransform = [] } = options;
+        const { sections, blocks, context = this, templates } = options;
+        const { rootTemplatesPath, customizeTemplatePath = file => file, transform: methodTransform = [] } = options;
         const { _: commonSpec = {} } = sections || {};
         const { transform: sectionTransform = [] } = commonSpec;
         const startTime = new Date().getMilliseconds();
+        const { customizeTemplatePaths: contextCustomizeTemplatePaths = [] } = context;
+        const templateData = this.jhipster7Migration
+            ? createJHipster7Context(this, context, { log: this.jhipster7Migration === 'verbose' ? msg => this.log.info(msg) : () => { } })
+            : context;
         /* Build lookup order first has preference.
          * Example
          * rootTemplatesPath = ['reactive', 'common']
@@ -673,7 +676,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
                 return val;
             }
             if (typeof val === 'function') {
-                return val.call(this, context) || false;
+                return val.call(this, templateData) || false;
             }
             throw new Error(`Type not supported ${val}`);
         };
@@ -681,7 +684,6 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
             const extension = extname(sourceFile);
             const isBinary = binary || ['.png', '.jpg', '.gif', '.svg', '.ico'].includes(extension);
             const appendEjs = noEjs === undefined ? !isBinary && extension !== '.ejs' : !noEjs;
-            const ejsFile = appendEjs || extension === '.ejs';
             let targetFile;
             if (typeof destinationFile === 'function') {
                 targetFile = resolveCallback(destinationFile);
@@ -692,9 +694,14 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
             let sourceFileFrom;
             if (Array.isArray(rootTemplatesAbsolutePath)) {
                 // Look for existing templates
-                const existingTemplates = rootTemplatesAbsolutePath
+                let existingTemplates = rootTemplatesAbsolutePath
                     .map(rootPath => this.templatePath(rootPath, sourceFile))
                     .filter(templateFile => existsSync(appendEjs ? `${templateFile}.ejs` : templateFile));
+                if (existingTemplates.length === 0 && this.getFeatures().jhipster7Migration) {
+                    existingTemplates = rootTemplatesAbsolutePath
+                        .map(rootPath => this.templatePath(rootPath, appendEjs ? sourceFile : `${sourceFile}.ejs`))
+                        .filter(templateFile => existsSync(templateFile));
+                }
                 if (existingTemplates.length > 1) {
                     const moreThanOneMessage = `Multiples templates were found for file ${sourceFile}, using the first
 templates: ${JSON.stringify(existingTemplates, null, 2)}`;
@@ -716,43 +723,68 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
             else {
                 sourceFileFrom = this.templatePath(sourceFile);
             }
-            if (appendEjs) {
-                sourceFileFrom = `${sourceFileFrom}.ejs`;
+            const file = customizeTemplatePath({ sourceFile, resolvedSourceFile: sourceFileFrom, destinationFile: targetFile });
+            if (!file) {
+                return undefined;
             }
-            if (!ejsFile) {
-                await this.copyTemplateAsync(sourceFileFrom, targetFile);
-            }
-            else {
-                let useAsync = true;
-                if (context.entityClass) {
-                    if (!context.baseName) {
-                        throw new Error('baseName is require at templates context');
-                    }
-                    const sourceBasename = basename(sourceFileFrom);
-                    const seed = `${context.entityClass}-${sourceBasename}${context.fakerSeed ?? ''}`;
-                    Object.values(this.sharedData.getApplication()?.sharedEntities ?? {}).forEach((entity) => {
-                        entity.resetFakerSeed(seed);
-                    });
-                    // Async calls will make the render method to be scheduled, allowing the faker key to change in the meantime.
-                    useAsync = false;
+            sourceFileFrom = file.resolvedSourceFile;
+            targetFile = file.destinationFile;
+            let templatesRoots = [].concat(rootTemplatesAbsolutePath);
+            for (const contextCustomizeTemplatePath of contextCustomizeTemplatePaths) {
+                const file = contextCustomizeTemplatePath({
+                    namespace: this.options.namespace,
+                    sourceFile,
+                    resolvedSourceFile: sourceFileFrom,
+                    destinationFile: targetFile,
+                    templatesRoots,
+                });
+                if (!file) {
+                    return undefined;
                 }
-                const renderOptions = {
-                    ...(options?.renderOptions ?? {}),
-                    // Set root for ejs to lookup for partials.
-                    root: rootTemplatesAbsolutePath,
-                    // ejs caching cause problem https://github.com/jhipster/generator-jhipster/pull/20757
-                    cache: false,
-                };
-                const copyOptions = { noGlob: true };
-                // TODO drop for v8 final release
-                const data = this.jhipster7Migration ? createJHipster7Context(this, context, { ignoreWarnings: true }) : context;
-                if (useAsync) {
-                    await this.renderTemplateAsync(sourceFileFrom, targetFile, data, renderOptions, copyOptions);
+                sourceFileFrom = file.resolvedSourceFile;
+                targetFile = file.destinationFile;
+                templatesRoots = file.templatesRoots;
+            }
+            try {
+                if (!appendEjs && extname(sourceFileFrom) !== '.ejs') {
+                    await this.copyTemplateAsync(sourceFileFrom, targetFile);
                 }
                 else {
-                    this.renderTemplate(sourceFileFrom, targetFile, data, renderOptions, copyOptions);
+                    let useAsync = true;
+                    if (context.entityClass) {
+                        if (!context.baseName) {
+                            throw new Error('baseName is required at templates context');
+                        }
+                        const sourceBasename = basename(sourceFileFrom);
+                        const seed = `${context.entityClass}-${sourceBasename}${context.fakerSeed ?? ''}`;
+                        Object.values(this.sharedData.getApplication()?.sharedEntities ?? {}).forEach((entity) => {
+                            entity.resetFakerSeed(seed);
+                        });
+                        // Async calls will make the render method to be scheduled, allowing the faker key to change in the meantime.
+                        useAsync = false;
+                    }
+                    const renderOptions = {
+                        ...(options?.renderOptions ?? {}),
+                        // Set root for ejs to lookup for partials.
+                        root: templatesRoots,
+                        // ejs caching cause problem https://github.com/jhipster/generator-jhipster/pull/20757
+                        cache: false,
+                    };
+                    const copyOptions = { noGlob: true };
+                    if (appendEjs) {
+                        sourceFileFrom = `${sourceFileFrom}.ejs`;
+                    }
+                    if (useAsync) {
+                        await this.renderTemplateAsync(sourceFileFrom, targetFile, templateData, renderOptions, copyOptions);
+                    }
+                    else {
+                        this.renderTemplate(sourceFileFrom, targetFile, templateData, renderOptions, copyOptions);
+                    }
                 }
             }
+            catch (error) {
+                throw new Error(`Error rendering template ${sourceFileFrom} to ${targetFile}: ${error}`, { cause: error });
+            }
             if (!isBinary && transform && transform.length) {
                 this.editFile(targetFile, ...transform);
             }
@@ -898,7 +930,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
         if (!originalContent) {
             const { ignoreNonExisting, create } = actualOptions;
             const errorMessage = typeof ignoreNonExisting === 'string' ? ` ${ignoreNonExisting}.` : '';
-            if (ignoreNonExisting) {
+            if (ignoreNonExisting || (!create && this.ignoreNeedlesError)) {
                 this.log(`${chalk.yellow('\nUnable to find ')}${filePath}.${chalk.yellow(errorMessage)}\n`);
                 // return a noop.
                 const noop = () => noop;
@@ -915,7 +947,11 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
             try {
                 newContent = joinCallbacks(...callbacks).call(this, newContent, filePath);
                 if (actualOptions.assertModified && originalContent === newContent) {
-                    throw new Error(`Fail to edit file '${file}'.`);
+                    const errorMessage = `${chalk.yellow('Fail to modify ')}${filePath}.`;
+                    if (!this.ignoreNeedlesError) {
+                        throw new Error(errorMessage);
+                    }
+                    this.log(errorMessage);
                 }
                 this.writeDestination(filePath, newContent);
             }
@@ -950,7 +986,9 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                 }
                 return true;
             });
-            return headerComments.join('\n').concat('\n', stringifyYaml(merge(parseYaml(content), value)));
+            const mergedContent = stringifyYaml(deepMerge(parseYaml(content), value));
+            const header = headerComments.length > 0 ? headerComments.join('\n').concat('\n') : '';
+            return `${header}${mergedContent}`;
         });
     }
     /**
@@ -1091,7 +1129,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     getSharedApplication(applicationFolder = this.destinationPath()) {
         return this.options.sharedData.applications?.[this.calculateApplicationId(applicationFolder)];
     }
-    createSharedData({ jhipsterOldVersion, help, }) {
+    createSharedData({ help }) {
         const applicationId = this.options.applicationId ?? this.calculateApplicationId(this.destinationPath());
         if (this.options.sharedData.applications === undefined) {
             this.options.sharedData.applications = {};
@@ -1101,6 +1139,6 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
             sharedApplications[applicationId] = {};
         }
         const { ignoreNeedlesError } = this.options;
-        return new SharedData(sharedApplications[applicationId], { jhipsterOldVersion, ignoreNeedlesError });
+        return new SharedData(sharedApplications[applicationId], { destinationPath: this.destinationPath(), memFs: this.env.sharedFs, log: this.log, logCwd: this.env.logCwd }, { ignoreNeedlesError });
     }
 }

package/dist/generators/bootstrap/generator.js

@@ -157,7 +157,7 @@ export default class BootstrapGenerator extends BaseGenerator {
         const prettierTransforms = [];
         if (!this.skipPrettier) {
             const ignoreErrors = this.options.ignoreErrors || this.upgradeCommand;
-            prettierTransforms.push(createESLintTransform.call(this, { ignoreErrors, extensions: 'ts,js' }), createRemoveUnusedImportsTransform.call(this, { ignoreErrors }), await createPrettierTransform.call(this, {
+            prettierTransforms.push(createESLintTransform.call(this, { ignoreErrors, extensions: 'ts,js,cjs,mjs' }), createRemoveUnusedImportsTransform.call(this, { ignoreErrors }), await createPrettierTransform.call(this, {
                 ignoreErrors,
                 prettierPackageJson: true,
                 prettierJava: !this.jhipsterConfig.skipServer,

package/dist/generators/bootstrap/support/eslint-worker.js

@@ -1,8 +1,15 @@
-import ESLint from 'eslint';
-let eslint;
+import eslint from 'eslint';
+import { baseRules } from '../../../lib/eslint/base.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 }) => {
-    if (!eslint) {
-        eslint = new ESLint.ESLint({
+    if (!eslintInstance) {
+        eslintInstance = new eslint.ESLint({
             fix: true,
             // Disable destination configs. We should apply plugins and rules which jhipster depends on.
             useEslintrc: false,
@@ -14,20 +21,15 @@ export default async ({ resolvePluginsRelativeTo, filePath, fileContents }) => {
                     sourceType: 'module',
                     ecmaVersion: 'latest',
                 },
-                rules: {
-                    'import/order': 'error',
-                    'import/no-duplicates': 'error',
-                    'unused-imports/no-unused-imports': 'error',
-                    'unused-imports/no-unused-vars': ['warn', { vars: 'all', varsIgnorePattern: '^_', args: 'after-used', argsIgnorePattern: '^_' }],
-                },
+                rules: baseRules,
             },
         });
     }
-    if (await eslint.isPathIgnored(filePath)) {
+    if (await eslintInstance.isPathIgnored(filePath)) {
         return { result: fileContents };
     }
     try {
-        const [result] = await eslint.lintText(fileContents, { filePath });
+        const [result] = await eslintInstance.lintText(fileContents, { filePath });
         return { result: result.output ?? fileContents };
     }
     catch (error) {

package/dist/generators/bootstrap/support/multi-step-transform/template-file.js

@@ -36,7 +36,12 @@ export default class TemplateFile {
             this._debug('======');
             this._debug(contents);
         }
-        this._compiled = ejs.compile(contents, options);
+        try {
+            this._compiled = ejs.compile(contents, options);
+        }
+        catch (error) {
+            throw new Error(`Error compiling ${this._filename}, with contents:\n${contents}`, { cause: error });
+        }
     }
     addFragment(templateFile) {
         assert(templateFile, 'templateFile is required');

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

@@ -48,7 +48,7 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
                     application.skipUserManagement = true;
                 }
                 applicationDefaults({
-                    useNpmWrapper: application => application.clientFrameworkAny && application.backendTypeSpringBoot,
+                    useNpmWrapper: application => application.clientFrameworkAny && application.backendTypeJavaAny,
                     documentationArchiveUrl: ({ jhipsterVersion }) => `${JHIPSTER_DOCUMENTATION_URL}${JHIPSTER_DOCUMENTATION_ARCHIVE_PATH}v${jhipsterVersion}`,
                 });
                 let prettierExtensions = 'md,json,yml,html';

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties } from '../client/support/index.js';
+import { loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties, filterEntitiesAndPropertiesForClient, filterEntitiesForClient, } from '../client/support/index.js';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
 import clientCommand from '../client/command.js';
@@ -61,6 +61,10 @@ export default class BootStrapApplicationClient extends BaseApplicationGenerator
     }
     get postPreparingEachEntity() {
         return this.asPostPreparingEachEntityTaskGroup({
+            control({ control }) {
+                control.filterEntitiesAndPropertiesForClient = filterEntitiesAndPropertiesForClient;
+                control.filterEntitiesForClient = filterEntitiesForClient;
+            },
             postPreparingEntity({ entity }) {
                 preparePostEntityClientDerivedProperties(entity);
             },

package/dist/generators/ci-cd/generator.js

@@ -153,7 +153,7 @@ export default class CiCdGenerator extends BaseApplicationGenerator {
             postWriting({ application }) {
                 if (application.ciCdIntegrations.includes('deploy')) {
                     if (application.buildToolMaven) {
-                        createPomStorage(this).addDistributionManagement({
+                        createPomStorage(this, { sortFile: false }).addDistributionManagement({
                             releasesId: application.artifactoryReleasesId,
                             releasesUrl: application.artifactoryReleasesUrl,
                             snapshotsId: application.artifactorySnapshotsId,

package/dist/generators/ci-cd/templates/docker-registry.yml.ejs

@@ -17,7 +17,6 @@
  limitations under the License.
 -%>
 # Documentation at https://docs.docker.com/registry/deploying
-version: '2'
 services:
   registry:
     image: registry:2

package/dist/generators/ci-cd/templates/jenkins/jenkins.yml.ejs

@@ -16,7 +16,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-version: '2'
 services:
   jenkins:
     image: <%- dockerContainers.jenkins %>

package/dist/generators/client/generator.js

@@ -26,7 +26,6 @@ import { testFrameworkTypes, clientFrameworkTypes } from '../../jdl/jhipster/ind
 import { createNeedleCallback } from '../base/support/index.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
 import command from './command.js';
-import { filterEntitiesAndPropertiesForClient } from './support/index.js';
 const { ANGULAR, VUE, REACT, NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
 const { CYPRESS } = testFrameworkTypes;
 export default class JHipsterClientGenerator extends BaseApplicationGenerator {
@@ -189,11 +188,11 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
     }
     get writingEntities() {
         return this.asWritingEntitiesTaskGroup({
-            async writeEnumerationFiles({ application, entities }) {
+            async writeEnumerationFiles({ control, application, entities }) {
                 if (!application.webappEnumerationsDir || ![ANGULAR, VUE, REACT].includes(application.clientFramework)) {
                     return;
                 }
-                for (const entity of filterEntitiesAndPropertiesForClient(entities)) {
+                for (const entity of (control.filterEntitiesAndPropertiesForClient ?? (entities => entities))(entities)) {
                     await addEnumerationFiles.call(this, { application, entity });
                 }
             },

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

@@ -6,11 +6,11 @@
     "@cypress/code-coverage": "3.12.39",
     "babel-loader": "9.1.3",
     "babel-plugin-istanbul": "6.1.1",
-    "cypress": "13.10.0",
+    "cypress": "13.12.0",
     "cypress-audit": "1.1.0",
     "eslint-plugin-cypress": "3.3.0",
-    "lighthouse": "12.0.0",
-    "nyc": "15.1.0",
+    "lighthouse": "12.1.0",
+    "nyc": "17.0.0",
     "swagger-ui-dist": "5.17.14"
   }
 }

package/dist/generators/client/support/filter-entities.js

@@ -5,7 +5,7 @@
 export const filterEntityPropertiesForClient = (entity) => ({
     ...entity,
     fields: entity.fields.filter(field => !field.skipClient),
-    relationships: entity.relationships.filter(rel => !rel.skipClient && (rel.persistableRelationship || rel.relationshipEagerLoad)),
+    relationships: entity.relationships.filter(rel => !(rel.skipClient ?? !(rel.persistableRelationship || rel.relationshipEagerLoad || rel.otherEntity?.jpaMetamodelFiltering))),
 });
 /**
  * Filter entities for frontend templates.

package/dist/generators/client/templates/.eslintignore.ejs

@@ -17,12 +17,16 @@
  limitations under the License.
 -%>
 node_modules/
-src/main/docker/
-<%= !clientFrameworkVue ? '' : clientTestDir %>jest.conf.js
+<%- dockerServicesDir %>
+<%_ if (!clientFrameworkVue) { _%>
+jest.conf.js
+<%_ } _%>
+<%_ if (!clientFrameworkVue || microfrontend) { _%>
 webpack/
-target/
-build/
-node/
+<%_ } _%>
+<%- temporaryDir %>
 coverage/
+<%_ if (clientFrameworkReact) { _%>
 postcss.config.js
+<%_ } _%>
 <%- this.relativeDir(clientRootDir, clientDistDir) %>

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

@@ -28,21 +28,28 @@
 _&>
 <%_
 let clientPackageMngrName = 'Npm';
+let clientPackageMngrWrapper = useNpmWrapper ? './npmw' : clientPackageManager;
 let clientPackageMngrAddGlobal = 'install -g';
 let clientPackageMngrAdd = 'install --save --save-exact';
 let clientPackageMngrAddDev = 'install --save-dev --save-exact';
 -%>
 <&_ if (fragment.developmentSection) { -&>
+<%_ if (useNpmWrapper) { _%>
+The build system will install automatically the recommended version of Node and <%= clientPackageManager %>.
+
+We provide a wrapper to launch <%= clientPackageManager %>.
+<%_ } else { _%>
 Before you can build this project, you must install and configure the following dependencies on your machine:
 
-1. [Node.js](https://nodejs.org/): We use Node to run a development web server and build the project.
+1. [Node.js](https://nodejs.org/): Node is used to run a development web server and build the project.
    Depending on your system, you can install Node either from source or as a pre-packaged bundle.
 
 After installing Node, you should be able to run the following command to install development tools.
+<%_ } _%>
 You will only need to run this command when dependencies change in [package.json](package.json).
 
 ```
-<%= clientPackageManager %> install
+<%= clientPackageMngrWrapper %> install
 ```
 
 We use <%= clientPackageManager %> scripts and <&- fragments.customCliSection(' ') &>[Webpack][] as our build system.
@@ -58,14 +65,16 @@ docker compose -f src/main/docker/<%= cacheProviderHazelcast?'hazelcast-manageme
     <%_ if (cacheProviderRedis) { _%>
 
 The cache can also be turned off by adding to the application yaml:
-```
+
+```yaml
 spring:
     cache:
         type: none
 ```
+
 See [here](https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-caching.html#boot-features-caching-provider-none) for details.
 
-**WARNING**: If you using second level hibernate cache and disabling the spring cache, you have to disable the second level hibernate cache as well since they are using
+**WARNING**: If you're using the second level Hibernate cache and disabling the Spring cache, you have to disable the second level Hibernate cache as well since they are using
 the same CacheManager.
     <%_ } _%>
   <%_ } _%>
@@ -80,14 +89,14 @@ auto-refreshes when files change on your hard drive.
   <%_ if (buildToolGradle) { _%>
 ./gradlew -x webapp
   <%_ } _%>
-<%= clientPackageManager %> start
+<%= clientPackageMngrWrapper %> start
 ```
 
 <%= clientPackageMngrName %> is also used to manage CSS and JavaScript dependencies used in this application. You can upgrade dependencies by
-specifying a newer version in [package.json](package.json). You can also run `<%= clientPackageManager %> update` and `<%= clientPackageManager %> install` to manage dependencies.
-Add the `help` flag on any command to see how you can use it. For example, `<%= clientPackageManager %> help update`.
+specifying a newer version in [package.json](package.json). You can also run `<%= clientPackageMngrWrapper %> update` and `<%= clientPackageMngrWrapper %> install` to manage dependencies.
+Add the `help` flag on any command to see how you can use it. For example, `<%= clientPackageMngrWrapper %> help update`.
 
-The `<%= clientPackageManager %> run` command will list all of the scripts available to run for this project.
+The `<%= clientPackageMngrWrapper %> run` command will list all the scripts available to run for this project.
 
 ### PWA Support
 
@@ -121,13 +130,13 @@ ServiceWorkerModule.register('ngsw-worker.js', { enabled: false }),
 For example, to add [Leaflet][] library as a runtime dependency of your application, you would run following command:
 
 ```
-<%= clientPackageManager %> <%= clientPackageMngrAdd %> leaflet
+<%= clientPackageMngrWrapper %> <%= clientPackageMngrAdd %> leaflet
 ```
 
 To benefit from TypeScript type definitions from [DefinitelyTyped][] repository in development, you would run following command:
 
 ```
-<%= clientPackageManager %> <%= clientPackageMngrAddDev %> @types/leaflet
+<%= clientPackageMngrWrapper %> <%= clientPackageMngrAddDev %> @types/leaflet
 ```
 
 Then you would import the JS and CSS files specified in library's installation instructions so that [Webpack][] knows about them:
@@ -159,9 +168,9 @@ Start gateway from source:
 
 ```
 cd gateway
-npm run docker:db:up # start database if necessary
-npm run docker:others:up # start service discovery and authentication service if necessary
-npm run app:start # alias for ./(mvnw|gradlew)
+<%= clientPackageMngrWrapper %> run docker:db:up # start database if necessary
+<%= clientPackageMngrWrapper %> run docker:others:up # start service discovery and authentication service if necessary
+<%= clientPackageMngrWrapper %> run app:start # alias for ./(mvnw|gradlew)
 ```
 
 Microfrontend's `build-watch` script is configured to watch and compile microfrontend's sources and synchronizes with gateway's frontend.
@@ -169,16 +178,16 @@ Start it using:
 
 ```
 cd microfrontend
-npm run docker:db:up # start database if necessary
-npm run build-watch
+<%= clientPackageMngrWrapper %> run docker:db:up # start database if necessary
+<%= clientPackageMngrWrapper %> run build-watch
 ```
 
 It's possible to run microfrontend's frontend standalone using:
 
 ```
 cd microfrontend
-npm run docker:db:up # start database if necessary
-npm watch # alias for `npm start` and `npm run backend:start` in parallel
+<%= clientPackageMngrWrapper %> run docker:db:up # start database if necessary
+<%= clientPackageMngrWrapper %> watch # alias for `npm start` and `npm run backend:start` in parallel
 ```
 
 <%_ } -%>
@@ -190,16 +199,16 @@ npm watch # alias for `npm start` and `npm run backend:start` in parallel
 Unit tests are run by [Jest][]. They're located in [<%= clientTestDir %>](<%= clientTestDir %>) and can be run with:
 
 ```
-<%= clientPackageManager %> test
+<%= clientPackageMngrWrapper %> test
 ```
 
   <%_ if (cypressTests) { _%>
 UI end-to-end tests are powered by [Cypress][]. They're located in [<%= clientTestDir %>cypress](<%= clientTestDir %>cypress)
-and can be run by starting Spring Boot in one terminal (`<% if (buildToolMaven) { %>./mvnw spring-boot:run<% } else { %>./gradlew bootRun<% } %>`) and running the tests (`<%= clientPackageManager %> run e2e`) in a second one.
+and can be run by starting Spring Boot in one terminal (`<% if (buildToolMaven) { %>./mvnw spring-boot:run<% } else { %>./gradlew bootRun<% } %>`) and running the tests (`<%= clientPackageMngrWrapper %> run e2e`) in a second one.
 
 #### Lighthouse audits
 
-You can execute automated [lighthouse audits][https://developers.google.com/web/tools/lighthouse/] with [cypress audits][https://github.com/mfrachet/cypress-audit] by running `<%= clientPackageManager %> run e2e:cypress:audits`.
+You can execute automated [Lighthouse audits](https://developers.google.com/web/tools/lighthouse/) with [cypress-audit](https://github.com/mfrachet/cypress-audit) by running `<%= clientPackageMngrWrapper %> run e2e:cypress:audits`.
 You should only run the audits when your application is packaged with the production profile.
 The lighthouse report is created in <% if (buildToolMaven) { %>`target/cypress/lhreport.html`<% } else { %>`build/cypress/lhreport.html`<% } %>
   <%_ } _%>

package/dist/generators/client/templates/src/main/webapp/index.html.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <!DOCTYPE html>
-<html class="no-js" lang="<%= nativeLanguage %>" dir="ltr">
+<html class="no-js" lang="<%= nativeLanguage %>" dir="<%- nativeLanguageDefinition.rtl ? 'rtl' : 'ltr' %>">
   <head>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />