generator-jhipster 7.8.0 → 7.9.1

package/generators/client/templates/vue/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs

@@ -16,6 +16,20 @@ export default class <%=jhiPrefixCapitalized%>GatewayComponent extends Vue {
     this.updatingRoutes = true;
     this.gatewayService().findAll().then((res) => {
       this.gatewayRoutes = res.data;
+      <%_ if (serviceDiscoveryType === 'consul') { _%>
+      this.gatewayRoutes.serviceInstances = this.gatewayRoutes.serviceInstances.map(serviceInstance => {
+        if (serviceInstance.healthService && serviceInstance.healthService.checks) {
+          if (serviceInstance.healthService.checks.filter(
+            check => check.status === 'PASSING'
+          ).length === serviceInstance.healthService.checks.length) {
+            serviceInstance.instanceInfo.status = 'UP'
+          } else {
+            serviceInstance.instanceInfo.status = 'DOWN'
+          }
+        }
+        return serviceInstance;
+      });
+      <%_ } _%>
       this.updatingRoutes = false;
     });
   }

package/generators/client/templates/vue/src/main/webapp/app/admin/metrics/metrics.vue.ejs

@@ -78,7 +78,7 @@
         </div>
         <div class="row" v-if="!updatingMetrics">
           <div class="col-md-4">Start time</div>
-          <div class="col-md-8 text-right">{{ metrics.processMetrics['process.start.time'] | formatMillis }}</div>
+          <div class="col-md-8 text-right">{{ metrics.processMetrics['process.start.time'] | formatDate }}</div>
         </div>
         <div class="row" v-if="!updatingMetrics">
           <div class="col-md-9">Process CPU usage</div>

package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-edit.component.ts.ejs

@@ -83,7 +83,7 @@ export default class <%=jhiPrefixCapitalized%>UserManagementEdit extends Vue {
     if (this.userAccount.id) {
       this.userManagementService().update(this.userAccount).then((res) => {
         this.returnToList();
-        this.$root.$bvToast.toast(this.getMessageFromHeader(res).toString(), {
+        (this.$root as any).$bvToast.toast(this.getMessageFromHeader(res).toString(), {
           toaster: 'b-toaster-top-center',
           title: 'Info',
           variant: 'info',
@@ -100,7 +100,7 @@ export default class <%=jhiPrefixCapitalized%>UserManagementEdit extends Vue {
 <%_ } _%>
       this.userManagementService().create(this.userAccount).then(res => {
         this.returnToList();
-        this.$root.$bvToast.toast(this.getMessageFromHeader(res).toString(), {
+        (this.$root as any).$bvToast.toast(this.getMessageFromHeader(res).toString(), {
           toaster: 'b-toaster-top-center',
           title: 'Success',
           variant: 'success',

package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs

@@ -11,8 +11,8 @@ import EntitiesMenu from '@/entities/entities-menu.vue';
   components: {
     'entities-menu': EntitiesMenu,
 <%_ if (applicationTypeGateway && microfrontend) { _%>
-  <%_ for (const remote of remotes) { _%>
-    '<%= remote.lowercaseBaseName %>-menu': () => import('@<%= remote.lowercaseBaseName %>/entities-menu'),
+  <%_ for (const microfrontend of microfrontends) { _%>
+    '<%= microfrontend.lowercaseBaseName %>-menu': () => import('@<%= microfrontend.lowercaseBaseName %>/entities-menu'),
   <%_ } _%>
 <%_ } _%>
   },
@@ -94,7 +94,9 @@ export default class JhiNavbar extends Vue {
 
   public hasAnyAuthority(authorities: any): boolean {
     this.accountService().hasAnyAuthorityAndCheckAuth(authorities).then(value => {
-      this.hasAnyAuthorityValues[authorities] = value;
+      if (this.hasAnyAuthorityValues[authorities] !== value) {
+        this.hasAnyAuthorityValues = { ...this.hasAnyAuthorityValues, [authorities]: value };
+      }
     });
     return this.hasAnyAuthorityValues[authorities] ?? false;
   }

package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs

@@ -35,8 +35,8 @@
           </span>
           <entities-menu></entities-menu>
 <%_ if (applicationTypeGateway && microfrontend) { _%>
-  <%_ for (const remote of remotes) { _%>
-          <<%= remote.lowercaseBaseName %>-menu></<%= remote.lowercaseBaseName %>-menu>
+  <%_ for (const microfrontend of microfrontends) { _%>
+          <<%= microfrontend.lowercaseBaseName %>-menu></<%= microfrontend.lowercaseBaseName %>-menu>
   <%_ } _%>
 <%_ } _%>
           <!-- jhipster-needle-add-entity-to-menu - JHipster will add entities to the menu here -->

package/generators/client/templates/vue/src/main/webapp/app/shared/alert/alert.service.ts.ejs

@@ -7,7 +7,7 @@ export default class AlertService {
     <%_ } else {_%>
     const alertMessage = message;
     <%_ } _%>
-    instance.$root.$bvToast.toast(alertMessage.toString(), {
+    (instance.$root as any).$bvToast.toast(alertMessage.toString(), {
       toaster: 'b-toaster-top-center',
       title: 'Error',
       variant: 'danger',

package/generators/client/templates/vue/src/main/webapp/app/shared/date/filters.ts.ejs

@@ -13,12 +13,6 @@ export function initFilters() {
         }
         return '';
     });
-    Vue.filter('formatMillis', value => {
-        if (value) {
-          return dayjs(value).format(DATE_TIME_FORMAT);
-        }
-        return '';
-    });
     Vue.filter('duration', value => {
         if (value) {
           const formatted = dayjs.duration(value).humanize();

package/generators/client/templates/vue/src/test/javascript/jest.conf.js.ejs

@@ -15,6 +15,7 @@ module.exports = {
     '^.+\\.tsx?$': 'ts-jest',
   },
   moduleNameMapper: {
+    rxjs: '<rootDir>/node_modules/rxjs/dist/bundles/rxjs.umd.js',
     '^@/(.*)$': '<rootDir>/<%= CLIENT_MAIN_SRC_DIR %>app/$1',
     ...pathsToModuleNameMapper(paths, { prefix: `<rootDir>/${baseUrl}/` }),
 <%_ if (applicationTypeGateway && microfrontend) { _%>
@@ -41,7 +42,11 @@ module.exports = {
   coverageThreshold: {
     global: {
       statements: 80,
+<%_ if (microfrontend) { _%>
+      branches: 57,
+<%_ } else { _%>
       branches: 60,
+<%_ } _%>
       functions: 70,
       lines: 80,
     },

package/generators/client/templates/vue/src/test/javascript/spec/app/account/register/register.component.spec.ts.ejs

@@ -58,7 +58,7 @@ describe('Register Component', () => {
 
   it('should open login modal when asked to', () => {
     let called = false;
-    register.$root.$on('bv::show::modal', () => {
+    (register.$root as any).$on('bv::show::modal', () => {
       called = true;
     });
     register.openLogin();

package/generators/client/templates/vue/tsconfig.json.ejs

@@ -21,5 +21,5 @@
     "include": [
         "<%= CLIENT_MAIN_SRC_DIR %>app"
     ],
-    "exclude": ["node_modules"<% if (cypressTests) { %>,"<%= CLIENT_TEST_SRC_DIR %>cypress"<% } %>]
+    "exclude": ["node_modules"]
 }

package/generators/client/templates/vue/tsconfig.spec.json.ejs

@@ -31,7 +31,7 @@
     "types": ["jest", "node"]
   },
   "include": [
-    "<%= CLIENT_MAIN_SRC_DIR %>app/**/*",
-    "<%= CLIENT_TEST_SRC_DIR %>spec/**/*"
+    "<%= CLIENT_MAIN_SRC_DIR %>app",
+    "<%= CLIENT_TEST_SRC_DIR %>spec"
   ]
 }

package/generators/client/templates/vue/webpack/webpack.dev.js.ejs

@@ -30,6 +30,10 @@ module.exports = (env, options) => {
     },
     // cheap-module-eval-source-map is faster for development
     devtool: config.dev.devtool,
+    output: {
+      filename: 'app/[contenthash].bundle.js',
+      chunkFilename: 'app/[id].chunk.js'
+    },
     optimization: {
       moduleIds: 'named',
     },

package/generators/client/templates/vue/webpack/webpack.prod.js.ejs

@@ -36,6 +36,10 @@ const webpackConfig = {
     })
   },
   devtool: config.build.productionSourceMap ? config.build.devtool : false,
+  output: {
+    filename: 'app/[name].[contenthash].bundle.js',
+    chunkFilename: 'app/[id].[chunkhash].chunk.js'
+  },
   optimization: {
     moduleIds: 'deterministic',
     minimizer: [
@@ -90,7 +94,10 @@ const webpackConfig = {
       extractComments: false,
     }),
     // extract css into its own file
-    new MiniCssExtractPlugin(),
+    new MiniCssExtractPlugin({
+      filename: 'content/[name].[contenthash].css',
+      chunkFilename: 'content/[id].css'
+    }),
     // keep module.id stable when vendor modules does not change
     new ForkTsCheckerWebpackPlugin(
       {

package/generators/client/transform-angular.cjs

@@ -0,0 +1,117 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+const PLACEHOLDER_REGEX = /(?:placeholder|title)=['|"](\{\{\s?['|"]([a-zA-Z0-9.\-_]+)['|"]\s?\|\s?translate\s?\}\})['|"]/.source;
+
+const JHI_TRANSLATE_REGEX = /(\n?\s*[a-z][a-zA-Z]*Translate="[a-zA-Z0-9 +{}'_!?.]+")/.source;
+const TRANSLATE_VALUES_REGEX = /(\n?\s*\[translateValues\]="\{(?:(?!\}").)*?\}")/.source;
+const TRANSLATE_REGEX = [JHI_TRANSLATE_REGEX, TRANSLATE_VALUES_REGEX].join('|');
+
+function getTranslationValue(generator, key, data) {
+  return (generator._getClientTranslation && generator._getClientTranslation(key, data)) || undefined;
+}
+
+/**
+ * Replace translation key with translation values
+ *
+ * @param {import('../generator-base.js')} generator
+ * @param {string} content
+ * @param {string} regexSource regular expression to find keys
+ * @param {object} [options]
+ * @param {number} [options.keyIndex]
+ * @param {number} [options.replacementIndex]
+ * @returns {string}
+ */
+function replaceTranslationKeysWithText(generator, content, regexSource, { keyIndex = 1, replacementIndex = 1 } = {}) {
+  const regex = new RegExp(regexSource, 'g');
+  let match = regex.exec(content);
+  while (match !== null) {
+    // match is now the next match, in array form and our key is at index 1, index 1 is replace target.
+    const key = match[keyIndex];
+    const target = match[replacementIndex];
+    const translation = getTranslationValue(generator, key) || generator.baseName;
+    content = content.replace(target, translation);
+    match = regex.exec(content);
+  }
+
+  return content;
+}
+
+/**
+ *
+ * @param {import('../generator-base.js')} generator reference to the generator
+ * @param {string} content html content
+ * @param {string} jsKey
+ * @returns string with pageTitle replaced
+ */
+function replaceJSTranslation(generator, content, jsKey) {
+  return replaceTranslationKeysWithText(generator, content, `${jsKey}\\s?:\\s?['|"]([a-zA-Z0-9.\\-_]+)['|"]`);
+}
+
+/**
+ *
+ * @param {import('../generator-base.js')} generator reference to the generator
+ * @param {string} content html content
+ * @returns string with pageTitle replaced
+ */
+function replacePageTitles(generator, content) {
+  return replaceJSTranslation(generator, content, 'pageTitle');
+}
+
+/**
+ * @type {function(import('../generator-base.js'), string): string}
+ */
+function replacePlaceholders(generator, content) {
+  return replaceTranslationKeysWithText(generator, content, PLACEHOLDER_REGEX, { keyIndex: 2 });
+}
+
+/**
+ * Replace error code translation key with translated message
+ *
+ * @type {function(import('../generator-base.js'), string): string}
+ */
+function replaceErrorMessage(generator, content) {
+  return replaceJSTranslation(generator, content, 'errorMessage');
+}
+
+/**
+ * Replace and cleanup translations.
+ *
+ * @type {import('../generator-base.js').EditFileCallback}
+ * @this {import('../generator-base.js')}
+ */
+function replaceAngularTranslations(content, filePath) {
+  if (this.enableTranslation) {
+    return content;
+  }
+  if (/\.html$/.test(filePath)) {
+    content = content.replace(new RegExp(TRANSLATE_REGEX, 'g'), '');
+    content = replacePlaceholders(this, content);
+  }
+  if (/(:?route|module)\.ts$/.test(filePath)) {
+    content = replacePageTitles(this, content);
+  }
+  if (/error\.route\.ts$/.test(filePath)) {
+    content = replaceErrorMessage(this, content);
+  }
+  return content;
+}
+
+module.exports = {
+  replaceAngularTranslations,
+};

package/generators/client/transform-react.cjs

@@ -0,0 +1,126 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+const TRANSLATE_IMPORT_1 = /import { ?[T|t]ranslate(?:, ?[T|t]ranslate)? ?} from 'react-jhipster';?/.source; // Translate imports
+const TRANSLATE_IMPORT_2 = / *[T|t]ranslate,|, ?[T|t]ranslate/.source; // Translate import
+const TRANSLATE_IMPORT = [TRANSLATE_IMPORT_1, TRANSLATE_IMPORT_2].join('|');
+
+const TRANSLATE_FUNCTION = /translate\(\s*'(?<key>[^']+)'(?:,\s*(?<interpolate>\{[^}]*\}))?\s*\)/g.source;
+
+const CONTENT_TYPE_ATTRIBUTE = 'contentKey=(?:"(?<key>[^"]+)"|\\{[^\\}]+\\})\\s*';
+const INTERPOLATE_ATTRIBUTE = 'interpolate=\\{(?<interpolate>\\{[^\\}]+\\})\\}\\s*';
+const COMPONENT_ATTRIBUTE = 'component="(?<component>[^"]+)"\\s*';
+const TRANSLATE_TAG = `<Translate\\s*(?:(?:${COMPONENT_ATTRIBUTE}|${INTERPOLATE_ATTRIBUTE}|${CONTENT_TYPE_ATTRIBUTE})+)>(?<translation>[\\s\\S]*?)<\\/Translate>`;
+
+function getTranslationValue(generator, key, data) {
+  if (generator._getEntityClientTranslation) {
+    return generator._getEntityClientTranslation(key, data);
+  }
+  return (generator._getClientTranslation && generator._getClientTranslation(key, data)) || undefined;
+}
+
+const replaceTranslationKeysWithText = (generator, body, regexp, { keyPattern, interpolatePattern, wrapTranslation, escapeHtml } = {}) => {
+  const matches = body.matchAll(new RegExp(regexp, 'g'));
+  if (typeof wrapTranslation === 'string') {
+    wrapTranslation = [wrapTranslation, wrapTranslation];
+  }
+  for (const match of matches) {
+    const target = match[0];
+
+    let key = match.groups && match.groups.key;
+    if (!key && keyPattern) {
+      const keyMatch = target.match(new RegExp(keyPattern));
+      key = keyMatch && keyMatch.groups && keyMatch.groups.key;
+    }
+    if (!key) {
+      throw new Error(`Translation key not found for ${target}`);
+    }
+
+    let interpolate = match.groups && match.groups.interpolate;
+    if (!interpolate && interpolatePattern) {
+      const interpolateMatch = target.match(new RegExp(interpolatePattern));
+      interpolate = interpolateMatch && interpolateMatch.groups && interpolateMatch.groups.interpolate;
+    }
+
+    let data;
+    if (interpolate) {
+      const interpolateMatches = interpolate.matchAll(/(?<field>[^{\s:,}]+)(?::\s*(?<value>[^,}]+))?/g);
+      data = {};
+      for (const interpolateMatch of interpolateMatches) {
+        const field = interpolateMatch.groups.field;
+        let value = interpolateMatch.groups.value;
+        if (value === undefined) {
+          value = key;
+        }
+        value = value.trim();
+        if (/^\d+$/.test(value)) {
+          // convert integer
+          value = parseInt(value, 10);
+        } else if (/^'.*'$/.test(value) || /^".*"$/.test(value)) {
+          // extract string value
+          value = value.substring(1, value.length - 2);
+        } else {
+          // wrap expression
+          value = `{${value}}`;
+        }
+        data[field] = value;
+      }
+    }
+
+    const translation = getTranslationValue(generator, key, data);
+
+    let replacement = translation;
+    if (!replacement) {
+      replacement = wrapTranslation ? `${wrapTranslation[0]}${wrapTranslation[1]}` : '';
+    } else if (wrapTranslation) {
+      replacement = `${wrapTranslation[0]}${translation}${wrapTranslation[1]}`;
+    } else if (escapeHtml) {
+      // Escape specific chars
+      replacement = replacement.replace(/'/g, '&apos;').replace(/"/g, '&quot;');
+    }
+    body = body.replace(target, replacement);
+  }
+  return body;
+};
+
+/**
+ * Replace and cleanup translations.
+ *
+ * @type {import('../generator-base.js').EditFileCallback}
+ * @this {import('../generator-base.js')}
+ */
+function replaceReactTranslations(body, filePath) {
+  if (this.enableTranslation || !this._getClientTranslation) {
+    return body;
+  }
+  if (/\.tsx$/.test(filePath)) {
+    body = body.replace(new RegExp(TRANSLATE_IMPORT, 'g'), '');
+    body = replaceTranslationKeysWithText(this, body, `\\{\\s*${TRANSLATE_FUNCTION}\\s*\\}`, { wrapTranslation: '"' });
+    body = replaceTranslationKeysWithText(this, body, TRANSLATE_FUNCTION, { wrapTranslation: '"' });
+    body = replaceTranslationKeysWithText(this, body, TRANSLATE_TAG, {
+      keyPattern: CONTENT_TYPE_ATTRIBUTE,
+      interpolatePattern: INTERPOLATE_ATTRIBUTE,
+      escapeHtml: true,
+    });
+  }
+  return body;
+}
+
+module.exports = {
+  replaceReactTranslations,
+};

package/generators/client/transform-vue.cjs

@@ -0,0 +1,42 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+
+const TRANSLATIONS_ATTRIBUTES = ['v-text', 'v-bind:placeholder', 'v-html', 'v-bind:title', 'v-bind:label', 'v-bind:value', 'v-bind:html']
+  .map(s => `(?:${s}="\\$t\\(.*?\\)")`)
+  .join('|');
+
+/**
+ * Replace and cleanup vue translations.
+ *
+ * @type {import('../generator-base.js').EditFileCallback}
+ * @this {import('../generator-base.js')}
+ */
+function replaceVueTranslations(body, filePath) {
+  if (this.enableTranslation || !this._getClientTranslation) {
+    return body;
+  }
+  if (/\.vue$/.test(filePath)) {
+    body = body.replace(new RegExp(`[\\s\\n]*(?:${TRANSLATIONS_ATTRIBUTES})`, 'g'), '');
+  }
+  return body;
+}
+
+module.exports = {
+  replaceVueTranslations,
+};

package/generators/common/files.js

@@ -41,12 +41,10 @@ const commonFiles = {
         {
           file: 'gitattributes',
           renameTo: () => '.gitattributes',
-          method: 'copy',
         },
         {
           file: 'editorconfig',
           renameTo: () => '.editorconfig',
-          method: 'copy',
         },
         {
           file: 'sonar-project.properties',
@@ -58,12 +56,7 @@ const commonFiles = {
   commitHooks: [
     {
       condition: generator => !generator.skipCommitHook,
-      templates: [
-        '.lintstagedrc.js',
-        {
-          file: '.husky/pre-commit',
-        },
-      ],
+      templates: ['.lintstagedrc.js', '.husky/pre-commit'],
     },
   ],
 };
@@ -71,7 +64,7 @@ const commonFiles = {
 function writeFiles() {
   return {
     writeFiles() {
-      return this.writeFilesToDisk(commonFiles);
+      return this.writeFiles({ sections: commonFiles });
     },
   };
 }

package/generators/common/templates/README.md.jhi.ejs

@@ -37,7 +37,7 @@ let clientPackageMngrName = 'Npm';
 let clientPackageMngrAddGlobal = 'install -g';
 let clientPackageMngrAdd = 'install --save --save-exact';
 let clientPackageMngrAddDev = 'install --save-dev --save-exact';
-let DOCUMENTATION_ARCHIVE_URL = `${DOCUMENTATION_URL}`;
+let DOCUMENTATION_ARCHIVE_URL = `${DOCUMENTATION_URL + DOCUMENTATION_ARCHIVE_PATH}v${jhipsterVersion}`;
 _%>
 This application was generated using JHipster <%= jhipsterVersion %>, you can find documentation and help at [<%= DOCUMENTATION_ARCHIVE_URL %>](<%= DOCUMENTATION_ARCHIVE_URL %>).
 <%_ if (applicationTypeGateway || applicationTypeMicroservice) { _%>
@@ -50,7 +50,7 @@ This application is configured for Service Discovery and Configuration with <% i
 
 Node is required for generation and recommended for development. `package.json` is always generated for a better development experience with prettier, commit hooks, scripts and so on.
 
-In the project root, JHipster generates configuration files for tools like git, prettier, eslint, husk, and others that are well known and you can find references in the web.
+In the project root, JHipster generates configuration files for tools like git, prettier, eslint, husky, and others that are well known and you can find references in the web.
 
 <%_ if (configOptions.backendName === 'Java') { %>
 `/src/*` structure follows default <%= configOptions.backendName %> structure.
@@ -109,7 +109,7 @@ spring:
       client:
         provider:
           oidc:
-            issuer-uri: http://localhost:9080/auth/realms/jhipster
+            issuer-uri: http://localhost:9080/realms/jhipster
         registration:
           oidc:
             client-id: web_app
@@ -117,6 +117,14 @@ spring:
             scope: openid,profile,email
 ```
 
+Some of Keycloak configuration is now done in build time and the other part before running the app, here is the [list](https://www.keycloak.org/server/all-config) of all build and configuration options.
+
+Before moving to production, please make sure to follow this [guide](https://www.keycloak.org/server/configuration) for better security and performance.
+
+Also, you should never use `start-dev` nor `KC_DB=dev-file` in production.
+
+When using Kubernetes, importing should be done using init-containers (with a volume when using `db=dev-file`).
+
 ### Okta
 
 If you'd like to use Okta instead of Keycloak, it's pretty quick using the [Okta CLI](https://cli.okta.com/). After you've installed it, run:
@@ -233,7 +241,7 @@ See Cypress' documentation for setting OS [environment variables](https://docs.c
 <%_ } _%>
 
 <%_ if (enableSwaggerCodegen) { _%>
-### Doing API-First development using openapi-generator
+### Doing API-First development using openapi-generator-cli
 
 [OpenAPI-Generator]() is configured for this application. You can generate API code from the `src/main/resources/swagger/api.yml` definition file by running:
     <%_ if (buildToolMaven) { _%>
@@ -399,7 +407,13 @@ You can also fully dockerize your application and all the services that it depen
 To achieve this, first build a docker image of your app by running:
 
 ```
-<% if (buildToolMaven) { %>./mvnw -Pprod verify jib:dockerBuild<% } %><% if (buildToolGradle) { %>./gradlew bootJar -Pprod jibDockerBuild<% } %>
+npm run java:docker
+```
+
+Or build a arm64 docker image when using an arm64 processor os like MacOS with M1 processor family running:
+
+```
+npm run java:docker:arm64
 ```
 
 Then run:
@@ -408,6 +422,8 @@ Then run:
 docker-compose -f src/main/docker/app.yml up -d
 ```
 
+When running Docker Desktop on MacOS Big Sur or later, consider enabling experimental `Use the new Virtualization framework` for better processing performance ([disk access performance is worse](https://github.com/docker/roadmap/issues/7)).
+
 For more information refer to [Using Docker and Docker-Compose][], this page also contains information on the docker-compose sub-generator (`jhipster docker-compose`), which is able to generate docker configurations for one or several JHipster applications.
 
 ## Continuous Integration (optional)

package/generators/common/templates/package.json

@@ -1,9 +1,9 @@
 {
   "devDependencies": {
-    "concurrently": "7.0.0",
+    "concurrently": "7.3.0",
     "husky": "7.0.4",
-    "lint-staged": "12.3.7",
-    "npm": "8.6.0",
+    "lint-staged": "13.0.3",
+    "npm": "8.15.1",
     "wait-on": "6.0.1"
   }
 }