generator-jhipster 7.4.0 → 7.4.1

package/cli/import-jdl.js

@@ -158,6 +158,7 @@ function runGenerator(command, { cwd, fork, env }, generatorOptions = {}) {
     forceNoFiltering: undefined,
     unidirectionalRelationships: undefined,
     localConfigOnly: undefined,
+    commandName: undefined,
     fromJdl: true,
   };
 
@@ -432,8 +433,8 @@ class JDLProcessor {
         applicationWithEntities.config.applications = Object.fromEntries(
           relatedApplications.map(([baseName, config]) => {
             config.gatewayServerPort = gatewayServerPort;
-            const { serverPort, applicationIndex, devServerPort } = config;
-            return [baseName, { serverPort, applicationIndex, devServerPort }];
+            const { clientFramework, serverPort, applicationIndex, devServerPort } = config;
+            return [baseName, { clientFramework, serverPort, applicationIndex, devServerPort }];
           })
         );
       }

package/cli/program.js

@@ -168,6 +168,7 @@ const buildCommands = ({ program, commands = {}, envBuilder, env, loadCommand })
         const options = {
           ...program.opts(),
           ...cmdOptions,
+          commandName: cmdName,
         };
         if (options.installPath) {
           // eslint-disable-next-line no-console

package/generators/app/index.js

@@ -29,6 +29,7 @@ const { GENERATOR_APP } = require('../generator-list');
 const { JHIPSTER_CONFIG_DIR, GENERATOR_JHIPSTER } = require('../generator-constants');
 const { MICROSERVICE } = require('../../jdl/jhipster/application-types');
 const { OptionNames } = require('../../jdl/jhipster/application-options');
+const { NO: CLIENT_FRAMEWORK_NO } = require('../../jdl/jhipster/client-framework-types');
 
 const { JHI_PREFIX, BASE_NAME, JWT_SECRET_KEY, PACKAGE_NAME, PACKAGE_FOLDER, REMEMBER_ME_KEY } = OptionNames;
 const {
@@ -373,7 +374,10 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
 
         this.configOptions.logo = false;
         if (this.jhipsterConfig.applicationType === MICROSERVICE) {
-          this.jhipsterConfig.skipClient = !this.jhipsterConfig.microfrontend;
+          this.jhipsterConfig.skipClient =
+            this.jhipsterConfig.skipClient ||
+            !this.jhipsterConfig.clientFramework ||
+            this.jhipsterConfig.clientFramework === CLIENT_FRAMEWORK_NO;
           this.jhipsterConfig.withAdminUi = false;
           this.jhipsterConfig.skipUserManagement = true;
         }

package/generators/bootstrap/index.js

@@ -21,8 +21,8 @@ const _ = require('lodash');
 const {
   createConflicterCheckTransform,
   createConflicterStatusTransform,
-  createYoRcTransform,
-  createYoResolveTransform,
+  createYoRcTransform: createForceYoRcTransform,
+  createYoResolveTransform: createApplyYoResolveTransform,
   patternFilter,
   patternSpy,
 } = require('yeoman-environment/transform');
@@ -148,6 +148,9 @@ module.exports = class extends BaseGenerator {
    * @return {Promise}
    */
   async _commitSharedFs(stream = this.env.sharedFs.stream(), skipPrettier = this.options.skipPrettier) {
+    const { skipYoResolve } = this.options;
+    const { withGeneratedFlag } = this.jhipsterConfig;
+
     // JDL writes directly to disk, set the file as modified so prettier will be applied
     stream = stream.pipe(
       patternSpy(file => {
@@ -170,29 +173,30 @@ module.exports = class extends BaseGenerator {
       ],
     };
 
-    const yoResolveTranform = this.options.skipYoResolve ? [] : [createYoResolveTransform(this.env.conflicter)];
+    const createApplyPrettierTransform = () => {
+      const prettierOptions = { packageJson: true, java: !this.skipServer && !this.jhipsterConfig.skipServer };
+      // Prettier is clever, it uses correct rules and correct parser according to file extension.
+      const ignoreErrors = this.options.commandName === 'upgrade' || this.options.ignoreErrors;
+      return prettierTransform(prettierOptions, this, ignoreErrors);
+    };
+
+    const createForceWriteConfigFiles = () =>
+      patternSpy(file => {
+        file.conflicter = 'force';
+      }, '**/.jhipster/*.json').name('jhipster:config-files:force');
+
     const transformStreams = [
       // multi-step changes the file path, should be executed earlier in the pipeline
       new MultiStepTransform(),
-      ...yoResolveTranform,
-      createYoRcTransform(),
-      patternSpy(file => {
-        file.conflicter = 'force';
-      }, '**/.jhipster/*.json').name('jhipster:config-files:force'),
+      ...(skipYoResolve ? [] : [createApplyYoResolveTransform(this.env.conflicter)]),
+      createForceYoRcTransform(),
+      createForceWriteConfigFiles(),
+      ...(withGeneratedFlag ? [generatedAnnotationTransform(this)] : []),
+      ...(skipPrettier ? [] : [createApplyPrettierTransform()]),
+      createConflicterCheckTransform(this.env.conflicter, conflicterStatus),
+      createConflicterStatusTransform(),
     ];
 
-    if (this.jhipsterConfig.withGeneratedFlag) {
-      transformStreams.push(generatedAnnotationTransform(this));
-    }
-
-    if (!skipPrettier) {
-      const prettierOptions = { packageJson: true, java: !this.skipServer && !this.jhipsterConfig.skipServer };
-      // Prettier is clever, it uses correct rules and correct parser according to file extension.
-      transformStreams.push(prettierTransform(prettierOptions, this, this.options.ignoreErrors));
-    }
-
-    transformStreams.push(createConflicterCheckTransform(this.env.conflicter, conflicterStatus), createConflicterStatusTransform());
-
     await this.env.fs.commit(transformStreams, stream);
   }
 

package/generators/client/files-common.js

@@ -67,7 +67,7 @@ const commonFiles = {
       templates: ['content/scss/rtl.scss'],
     },
     {
-      condition: generator => generator.microfrontend,
+      condition: generator => generator.microfrontend && generator.clientFrameworkVue,
       templates: ['webpack/webpack.microfrontend.js.jhi'],
     },
   ],

package/generators/client/files-react.js

@@ -31,7 +31,6 @@ const files = {
   common: [
     {
       templates: [
-        '.npmrc',
         'package.json',
         '.eslintrc.json',
         'tsconfig.json',
@@ -347,6 +346,9 @@ function cleanup() {
   if (this.isJhipsterVersionLessThan('7.4.0') && this.enableI18nRTL) {
     this.removeFile(`${CLIENT_MAIN_SRC_DIR}content/scss/rtl.scss`);
   }
+  if (this.isJhipsterVersionLessThan('7.4.1')) {
+    this.removeFile('.npmrc');
+  }
 }
 
 function writeFiles() {

package/generators/client/index.js

@@ -297,11 +297,11 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
       },
 
       loadEntities() {
-        if (!this.configOptions.sharedEntities || (this.applicationTypeGateway && this.microfrontend)) {
+        if (!this.configOptions.sharedEntities) {
           this.localEntities = [];
           return;
         }
-        this.localEntities = Object.values(this.configOptions.sharedEntities).filter(entity => !entity.builtIn);
+        this.localEntities = Object.values(this.configOptions.sharedEntities).filter(entity => !entity.builtIn && !entity.skipClient);
       },
 
       insight() {

package/generators/client/needle-api/needle-client-angular.js

@@ -236,7 +236,7 @@ module.exports = class extends needleClientBase {
 
       if (!isSpecificEntityAlreadyGenerated) {
         const modulePath =
-          this.generator.jhipsterConfig.microfrontend && this.generator.jhipsterConfig.applicationType === 'gateway' && microserviceName
+          this.generator.microfrontend && this.generator.applicationTypeGateway && microserviceName
             ? `${microserviceName}/${entityFileName}`
             : `./${entityFolderName}/${entityFileName}.module`;
         const moduleName = microserviceName

package/generators/client/needle-api/needle-client-vue.js

@@ -25,6 +25,16 @@ module.exports = class extends needleClientBase {
   addEntityToMenu(routerName, enableTranslation, entityTranslationKeyMenu, entityTranslationValue = _.startCase(routerName)) {
     const errorMessage = `${chalk.yellow('Reference to ') + routerName} ${chalk.yellow('not added to menu.\n')}`;
     const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/entities/entities-menu.vue`;
+
+    const isSpecificEntityAlreadyGenerated = jhipsterUtils.checkStringInFile(
+      filePath,
+      `<b-dropdown-item to="/${routerName}">`,
+      this.generator
+    );
+    if (isSpecificEntityAlreadyGenerated) {
+      return;
+    }
+
     const menuI18nTitle = enableTranslation ? ` v-text="$t('global.menu.entities.${entityTranslationKeyMenu}')"` : '';
     const entityEntry =
       // prettier-ignore
@@ -41,6 +51,16 @@ module.exports = class extends needleClientBase {
   addEntityToRouterImport(entityName, fileName, folderName, readOnly) {
     const errorMessage = `${chalk.yellow('Reference to entity ') + entityName} ${chalk.yellow('not added to router entities import.\n')}`;
     const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/router/entities.ts`;
+
+    const isSpecificEntityAlreadyGenerated = jhipsterUtils.checkStringInFile(
+      filePath,
+      `import('@/entities/${folderName}/${fileName}.vue');`,
+      this.generator
+    );
+    if (isSpecificEntityAlreadyGenerated) {
+      return;
+    }
+
     let entityEntry;
     if (!readOnly) {
       // prettier-ignore
@@ -70,8 +90,7 @@ module.exports = class extends needleClientBase {
     const errorMessage = `${chalk.yellow('Reference to entity ') + entityName} ${chalk.yellow('not added to router entities.\n')}`;
     const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/router/entities.ts`;
 
-    const isSpecificEntityAlreadyGenerated = jhipsterUtils.checkStringInFile(filePath, `path: '/${entityFileName}'`, this.generator);
-
+    const isSpecificEntityAlreadyGenerated = jhipsterUtils.checkStringInFile(filePath, `path: '${entityFileName}'`, this.generator);
     if (isSpecificEntityAlreadyGenerated) {
       return;
     }
@@ -81,25 +100,25 @@ module.exports = class extends needleClientBase {
       // prettier-ignore
       entityEntry = this.generator.stripMargin(
                 `|{
-                |    path: '/${entityFileName}',
+                |    path: '${entityFileName}',
                 |    name: '${entityName}',
                 |    component: ${entityName},
                 |    meta: { authorities: [Authority.USER] }
                 |  },
                 |  {
-                |    path: '/${entityFileName}/new',
+                |    path: '${entityFileName}/new',
                 |    name: '${entityName}Create',
                 |    component: ${entityName}Update,
                 |    meta: { authorities: [Authority.USER] }
                 |  },
                 |  {
-                |    path: '/${entityFileName}/:${entityInstance}Id/edit',
+                |    path: '${entityFileName}/:${entityInstance}Id/edit',
                 |    name: '${entityName}Edit',
                 |    component: ${entityName}Update,
                 |    meta: { authorities: [Authority.USER] }
                 |  },
                 |  {
-                |    path: '/${entityFileName}/:${entityInstance}Id/view',
+                |    path: '${entityFileName}/:${entityInstance}Id/view',
                 |    name: '${entityName}View',
                 |    component: ${entityName}Details,
                 |    meta: { authorities: [Authority.USER] }
@@ -124,6 +143,7 @@ module.exports = class extends needleClientBase {
     }
 
     const rewriteFileModel = this.generateFileModel(filePath, 'jhipster-needle-add-entity-to-router', entityEntry);
+    rewriteFileModel.prettierAware = true;
     this.addBlockContentToFile(rewriteFileModel, errorMessage);
   }
 
@@ -152,4 +172,34 @@ module.exports = class extends needleClientBase {
     const rewriteFileModel = this.generateFileModel(filePath, 'jhipster-needle-add-entity-service-to-main', entityEntry);
     this.addBlockContentToFile(rewriteFileModel, errorMessage);
   }
+
+  addEntityServiceToEntitiesComponentImport(entityName, entityClass, entityFileName, entityFolderName) {
+    const errorMessage = `${chalk.yellow('Reference to entity ') + entityClass} ${chalk.yellow(
+      'not added to import in entities component.\n'
+    )}`;
+    const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/entities/entities.component.ts`;
+
+    // prettier-ignore
+    const entityEntry = `import ${entityName}Service from './${entityFolderName}/${entityFileName}.service';`;
+
+    const rewriteFileModel = this.generateFileModel(
+      filePath,
+      'jhipster-needle-add-entity-service-to-entities-component-import',
+      entityEntry
+    );
+    this.addBlockContentToFile(rewriteFileModel, errorMessage);
+  }
+
+  addEntityServiceToEntitiesComponent(entityInstance, entityName) {
+    const errorMessage = `${chalk.yellow('Reference to entity ') + entityName} ${chalk.yellow(
+      'not added to service in entities component.\n'
+    )}`;
+    const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/entities/entities.component.ts`;
+
+    // prettier-ignore
+    const entityEntry = `@Provide('${entityInstance}Service') private ${entityInstance}Service = () => new ${entityName}Service();`;
+
+    const rewriteFileModel = this.generateFileModel(filePath, 'jhipster-needle-add-entity-service-to-entities-component', entityEntry);
+    this.addBlockContentToFile(rewriteFileModel, errorMessage);
+  }
 };

package/generators/client/templates/angular/package.json

@@ -8,11 +8,11 @@
     "@ng-bootstrap/ng-bootstrap": "10.0.0",
     "@ngx-translate/core": "13.0.0",
     "@ngx-translate/http-loader": "6.0.0",
-    "ngx-cookie-service": "13.0.0",
+    "ngx-cookie-service": "12.0.3",
     "ngx-infinite-scroll": "10.0.1",
     "ngx-webstorage": "8.0.0",
     "rxjs": "6.6.7",
-    "swagger-ui-dist": "4.1.0",
+    "swagger-ui-dist": "4.1.2",
     "tslib": "2.3.1",
     "zone.js": "0.11.4"
   },
@@ -20,10 +20,10 @@
     "@angular/cli": "12.2.12",
     "@angular-builders/custom-webpack": "12.1.3",
     "@angular-builders/jest": "12.1.2",
-    "@angular-eslint/eslint-plugin": "12.6.1",
-    "@types/node": "16.11.7",
+    "@angular-eslint/eslint-plugin": "12.7.0",
+    "@types/node": "16.11.11",
     "@types/jest": "27.0.3",
-    "@typescript-eslint/eslint-plugin": "5.4.0",
+    "@typescript-eslint/eslint-plugin": "5.5.0",
     "browser-sync": "2.27.7",
     "browser-sync-webpack-plugin": "2.3.0",
     "copy-webpack-plugin": "10.0.0",
@@ -31,12 +31,12 @@
     "eslint-config-prettier": "8.3.0",
     "eslint-webpack-plugin": "3.1.1",
     "folder-hash": "4.0.1",
-    "jest": "27.3.1",
+    "jest": "27.4.3",
     "jest-preset-angular": "10.1.0",
     "jest-date-mock": "1.0.8",
     "jest-junit": "13.0.0",
     "jest-sonar-reporter": "2.0.0",
-    "merge-jsons-webpack-plugin": "1.0.21",
+    "merge-jsons-webpack-plugin": "2.0.1",
     "rimraf": "3.0.2",
     "ts-jest": "27.0.7",
     "typescript": "4.3.5",

package/generators/client/templates/common/package.json

@@ -1,12 +1,12 @@
 {
   "devDependencies": {
-    "@cypress/code-coverage": "3.9.11",
+    "@cypress/code-coverage": "3.9.12",
     "babel-loader": "8.2.3",
     "babel-plugin-istanbul": "6.1.1",
     "cypress": "9.0.0",
     "eslint-plugin-cypress": "2.12.1",
     "cypress-audit": "1.1.0",
-    "lighthouse": "9.0.0",
+    "lighthouse": "9.1.0",
     "nyc": "15.1.0"
   },
   "dependencies": {

package/generators/client/templates/react/package.json

@@ -11,7 +11,7 @@
     "path-browserify": "1.0.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "react-hook-form": "7.19.5",
+    "react-hook-form": "7.20.5",
     "react-jhipster": "0.18.0",
     "react-loadable": "5.5.0",
     "react-redux": "7.2.6",
@@ -21,7 +21,7 @@
     "react-transition-group": "4.4.2",
     "reactstrap": "9.0.1",
     "redux": "4.1.2",
-    "redux-thunk": "2.4.0",
+    "redux-thunk": "2.4.1",
     "sonar-scanner": "3.1.0",
     "tslib": "2.3.1",
     "uuid": "8.3.2"
@@ -30,58 +30,58 @@
     "@testing-library/react": "12.1.2",
     "@types/jest": "27.0.3",
     "@types/lodash": "4.14.177",
-    "@types/node": "16.11.8",
-    "@types/react": "17.0.35",
+    "@types/node": "16.11.11",
+    "@types/react": "17.0.37",
     "@types/react-dom": "17.0.11",
     "@types/react-redux": "7.1.20",
     "@types/react-router-dom": "5.3.2",
     "@types/redux": "3.6.31",
     "@types/webpack-env": "1.16.3",
-    "@typescript-eslint/eslint-plugin": "5.4.0",
-    "@typescript-eslint/parser": "5.4.0",
+    "@typescript-eslint/eslint-plugin": "5.5.0",
+    "@typescript-eslint/parser": "5.5.0",
     "autoprefixer": "10.4.0",
     "browser-sync": "2.27.7",
     "browser-sync-webpack-plugin": "2.3.0",
-    "copy-webpack-plugin": "9.1.0",
-    "core-js": "3.19.1",
+    "copy-webpack-plugin": "10.0.0",
+    "core-js": "3.19.2",
     "cross-env": "7.0.3",
     "css-loader": "6.5.1",
-    "css-minimizer-webpack-plugin": "3.1.4",
-    "eslint": "8.2.0",
+    "css-minimizer-webpack-plugin": "3.2.0",
+    "eslint": "8.3.0",
     "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-react": "7.27.0",
+    "eslint-plugin-react": "7.27.1",
     "eslint-webpack-plugin": "3.1.1",
     "folder-hash": "4.0.1",
-    "fork-ts-checker-webpack-plugin": "6.4.0",
+    "fork-ts-checker-webpack-plugin": "6.5.0",
     "html-webpack-plugin": "5.5.0",
     "identity-obj-proxy": "3.0.0",
-    "jest": "27.3.1",
+    "jest": "27.4.3",
     "jest-junit": "13.0.0",
     "jest-sonar-reporter": "2.0.0",
     "json-loader": "0.5.7",
-    "merge-jsons-webpack-plugin": "1.0.21",
+    "merge-jsons-webpack-plugin": "2.0.1",
     "mini-css-extract-plugin": "2.4.5",
-    "postcss-loader": "6.2.0",
+    "postcss-loader": "6.2.1",
     "postcss-rtlcss": "3.5.0",
-    "react-infinite-scroller": "1.2.4",
+    "react-infinite-scroll-component": "6.1.0",
     "redux-mock-store": "1.5.4",
     "rimraf": "3.0.2",
-    "sass": "1.43.4",
+    "sass": "1.44.0",
     "sass-loader": "12.3.0",
     "simple-progress-webpack-plugin": "2.0.0",
     "sinon": "12.0.1",
     "source-map-loader": "3.0.0",
     "sourcemap-istanbul-instrumenter-loader": "0.2.0",
     "style-loader": "3.3.1",
-    "swagger-ui-dist": "4.1.0",
+    "swagger-ui-dist": "4.1.2",
     "terser-webpack-plugin": "5.2.5",
     "thread-loader": "3.0.4",
     "ts-jest": "27.0.7",
     "ts-loader": "9.2.6",
     "typescript": "4.5.2",
-    "webpack": "5.64.1",
+    "webpack": "5.64.4",
     "webpack-cli": "4.9.1",
-    "webpack-dev-server": "4.5.0",
+    "webpack-dev-server": "4.6.0",
     "webpack-merge": "5.8.0",
     "webpack-notifier": "1.14.1",
     "workbox-webpack-plugin": "6.4.1"

package/generators/client/templates/react/package.json.ejs

@@ -134,7 +134,7 @@
 <%_ if (protractorTests) { _%>
     "protractor": "7.0.0",
 <%_ } _%>
-    "react-infinite-scroller": "<%= dependabotPackageJson.devDependencies['react-infinite-scroller'] %>",
+    "react-infinite-scroll-component": "<%= dependabotPackageJson.devDependencies['react-infinite-scroll-component'] %>",
     "redux-mock-store": "<%= dependabotPackageJson.devDependencies['redux-mock-store'] %>",
     "rimraf": "<%= dependabotPackageJson.devDependencies['rimraf'] %>",
     "sass": "<%= dependabotPackageJson.devDependencies['sass'] %>",

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

@@ -7,7 +7,7 @@
     "bootstrap": "4.6.1",
     "bootstrap-vue": "2.21.2",
     "bootswatch": "5.1.3",
-    "swagger-ui-dist": "4.1.0",
+    "swagger-ui-dist": "4.1.2",
     "vue": "2.6.14",
     "vue-class-component": "7.2.6",
     "vue-cookie": "1.1.4",
@@ -21,11 +21,11 @@
   },
   "devDependencies": {
     "@types/jest": "27.0.3",
-    "@types/node": "16.11.8",
+    "@types/node": "16.11.11",
     "@types/sinon": "10.0.6",
     "@types/vuelidate": "0.7.15",
-    "@typescript-eslint/eslint-plugin": "5.4.0",
-    "@typescript-eslint/parser": "5.4.0",
+    "@typescript-eslint/eslint-plugin": "5.5.0",
+    "@typescript-eslint/parser": "5.5.0",
     "@vue/eslint-config-prettier": "6.0.0",
     "@vue/eslint-config-typescript": "9.1.0",
     "@vue/vue2-jest": "27.0.0-alpha.3",
@@ -35,36 +35,36 @@
     "browser-sync-webpack-plugin": "2.3.0",
     "copy-webpack-plugin": "10.0.0",
     "css-loader": "6.5.1",
-    "css-minimizer-webpack-plugin": "3.1.4",
+    "css-minimizer-webpack-plugin": "3.2.0",
     "folder-hash": "4.0.1",
-    "fork-ts-checker-webpack-plugin": "6.4.0",
+    "fork-ts-checker-webpack-plugin": "6.5.0",
     "html-webpack-plugin": "5.5.0",
-    "jest": "27.3.1",
+    "jest": "27.4.3",
     "jest-junit": "13.0.0",
     "jest-serializer-vue": "2.0.2",
     "jest-sonar-reporter": "2.0.0",
     "jest-vue-preprocessor": "1.7.1",
-    "merge-jsons-webpack-plugin": "1.0.21",
+    "merge-jsons-webpack-plugin": "2.0.1",
     "mini-css-extract-plugin": "2.4.5",
     "numeral": "2.0.6",
     "postcss-import": "14.0.2",
-    "postcss-loader": "6.2.0",
+    "postcss-loader": "6.2.1",
     "postcss-url": "10.1.3",
     "rimraf": "3.0.2",
-    "sass": "1.43.4",
+    "sass": "1.44.0",
     "sass-loader": "12.3.0",
     "sinon": "12.0.1",
     "terser-webpack-plugin": "5.2.5",
     "ts-jest": "27.0.7",
     "ts-loader": "9.2.6",
-    "eslint": "8.2.0",
+    "eslint": "8.3.0",
     "eslint-plugin-prettier": "3.4.1",
     "eslint-plugin-vue": "8.1.1",
     "typescript": "4.5.2",
-    "webpack": "5.64.1",
+    "webpack": "5.64.4",
     "webpack-bundle-analyzer": "4.5.0",
     "webpack-cli": "4.9.1",
-    "webpack-dev-server": "4.5.0",
+    "webpack-dev-server": "4.6.0",
     "webpack-merge": "5.8.0",
     "workbox-webpack-plugin": "6.4.1",
     "vue-jest": "3.0.7",

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

@@ -65,7 +65,9 @@ export default class AccountService {
 <%_ } _%>
         } else {
           this.store.commit('logout');
-          this.router.push('/');
+          if (this.router.currentRoute.path !== '/') {
+            this.router.push('/');
+          }
           sessionStorage.removeItem("requested-url");
         }
 <%_ if (enableTranslation) { _%>

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

@@ -53,21 +53,30 @@ export default class JhiNavbar extends Vue {
   }
 <%_ } _%>
 
-  public logout() : void {
+  public logout() : Promise<any> {
 <%_ if (!authenticationTypeJwt) { _%>
-    this.loginService().logout().then(response => {
+    return this.loginService().logout().then(response => {
       this.$store.commit('logout');
-      this.$router.push('/');
   <%_ if (authenticationTypeOauth2) { _%>
-      window.location.href = response.data.logoutUrl;
+      const next = response.data?.logoutUrl ?? '/';
+      if (this.$route.path !== next) {
+        return this.$router.push(next);
+      }
+  <%_ } else { _%>
+      if (this.$route.path !== '/') {
+        return this.$router.push('/');
+      }
   <%_ } _%>
     });
 <%_ } else { _%>
     localStorage.removeItem('<%=jhiPrefixDashed %>-authenticationToken');
     sessionStorage.removeItem('<%=jhiPrefixDashed %>-authenticationToken');
     this.$store.commit('logout');
-    this.$router.push('/');
+    if (this.$route.path !== '/') {
+      return this.$router.push('/');
+    }
 <%_ } _%>
+    return Promise.resolve(this.$router.currentRoute);
   }
 
   public openLogin() : void {

package/generators/client/templates/vue/src/main/webapp/app/declarations.d.ts.ejs

@@ -26,10 +26,10 @@ declare const VERSION: string;
 declare const I18N_HASH: string;
 <%_ } _%>
 <%_ if (applicationTypeGateway && microfrontend) { _%>
-  <%_ for (const remote of remotes) { _%>
+  <%_ for (const remote of microfrontends) { _%>
 
 declare module '@<%= remote.lowercaseBaseName %>/entities-router' {
-  const _default: [];
+  const _default: unknown;
   export default _default;
 }
 

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

@@ -3,10 +3,12 @@ import { Component, Provide, Vue } from 'vue-property-decorator';
 <%_ for (entity of this.localEntities.filter(entity => !entity.embedded)) { _%>
 import <%= entity.entityAngularName %>Service from './<%= entity.entityFolderName %>/<%= entity.entityFileName %>.service';
 <%_ } _%>
+// jhipster-needle-add-entity-service-to-entities-component-import - JHipster will import entities services here
 
 @Component
 export default class Entities extends Vue {
 <%_ for (entity of this.localEntities.filter(entity => !entity.embedded)) { _%>
   @Provide('<%= entity.entityInstance %>Service') private <%= entity.entityInstance %>Service = () => new <%= entity.entityAngularName %>Service();
 <%_ } _%>
+  // jhipster-needle-add-entity-service-to-entities-component - JHipster will import entities services here
 }

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

@@ -5,7 +5,7 @@ import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome';
 import App from './app.vue';
 import Vue2Filters from 'vue2-filters';
 import { ToastPlugin } from 'bootstrap-vue';
-import router from './router';
+import router<% if (applicationTypeGateway && microfrontend) { %>, { lazyRoutes }<% } %> from './router';
 import * as config from './shared/config/config';
 import * as bootstrapVueConfig from './shared/config/config-bootstrap-vue';
 import JhiItemCountComponent from './shared/jhi-item-count.vue';
@@ -69,13 +69,18 @@ const translationService = new TranslationService(store, i18n);
 const loginService = new LoginService();
 const accountService = new AccountService(store, <%_ if (enableTranslation) { _%>translationService, <%_ } _%><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>(<any>Vue).cookie, <%_ } _%><%_ if (communicationSpringWebsocket) { _%>trackerService, <%_ } _%>router);
 
-router.beforeEach((to, from, next) => {
-
+router.beforeEach(async (to, from, next) => {
   if (!to.matched.length) {
-    next('/not-found');
-  }
+<%_ if (applicationTypeGateway && microfrontend) { _%>
+    await lazyRoutes;
+    if (router.match(to.fullPath).matched.length > 0) {
+      next(to.fullPath);
+      return;
+    }
 
-  if (to.meta && to.meta.authorities && to.meta.authorities.length > 0) {
+<%_ } _%>
+    next('/not-found');
+  } else if (to.meta && to.meta.authorities && to.meta.authorities.length > 0) {
     accountService.hasAnyAuthorityAndCheckAuth(to.meta.authorities).then(value => {
       if (!value) {
         sessionStorage.setItem('requested-url', to.fullPath);