generator-jhipster 7.4.0 → 7.4.1

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

@@ -13,7 +13,7 @@ const <%= entity.entityAngularName %>Details = () => import('@/entities/<%= enti
 <%_ } _%>
 // jhipster-needle-add-entity-to-router-import - JHipster will import entities to the router here
 
-export default [
+export default
   {
     path: '/<%= applicationTypeMicroservice ? baseName.toLowerCase() : '' %>',
     component: Entities,
@@ -48,5 +48,4 @@ export default [
 <%_ } _%>
       // jhipster-needle-add-entity-to-router - JHipster will add entities to the router here
     ],
-  },
-];
+  };

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

@@ -5,7 +5,7 @@ Component.registerHooks([
   'beforeRouteLeave',
   'beforeRouteUpdate' // for vue-router 2.2+
 ])
-import Router from 'vue-router';
+import Router, { RouteConfig } from 'vue-router';
 
 const Home = () => import('@/core/home/home.vue');
 const Error = () => import('@/core/error/error.vue');
@@ -15,17 +15,11 @@ import account from "@/router/account";
 import admin from "@/router/admin";
 import entities from "@/router/entities";
 import pages from "@/router/pages";
-<%_ if (applicationTypeGateway && microfrontend) { _%>
-
-  <%_ for (const remote of remotes) { _%>
-const <%= remote.lowercaseBaseName %>Router = await import('@<%= remote.lowercaseBaseName %>/entities-router').then(module => module.default).catch(() => []);
-  <%_ } _%>
-<%_ } _%>
 
 Vue.use(Router);
 
 // prettier-ignore
-export default new Router({
+const router = new Router({
   mode: 'history',
   routes: [
     {
@@ -49,12 +43,23 @@ export default new Router({
     ...account,
 <%_ } _%>
     ...admin,
-    ...entities,
-<%_ if (applicationTypeGateway && microfrontend) { _%>
-  <%_ for (const remote of remotes) { _%>
-    ...<%= remote.lowercaseBaseName %>Router,
-  <%_ } _%>
-<%_ } _%>
+    entities,
     ...pages
   ]
 });
+
+<%_ if (applicationTypeGateway && microfrontend) { _%>
+export const lazyRoutes = Promise.all([
+  <%_ for (const remote of microfrontends) { _%>
+  import('@<%= remote.lowercaseBaseName %>/entities-router')
+    .then(<%= remote.lowercaseBaseName %>Router => {
+      router.addRoute(<%= remote.lowercaseBaseName %>Router.default as RouteConfig);
+      return <%= remote.lowercaseBaseName %>Router.default;
+    }).catch(() => {
+      console.log("Error loading <%= remote.lowercaseBaseName %> menus. Make sure it's up.");
+    }),
+  <%_ } _%>
+]);
+
+<%_ } _%>
+export default router;

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

@@ -17,8 +17,8 @@ module.exports = {
   moduleNameMapper: {
     '^@/(.*)$': '<rootDir>/<%= CLIENT_MAIN_SRC_DIR %>app/$1',
     ...pathsToModuleNameMapper(paths, { prefix: `<rootDir>/${baseUrl}/` }),
-<%_ if (applicationTypeGateway) { _%>
-    '^@(<%= remotes.map(remote => remote.lowercaseBaseName).join('|') %>)/(.*)$': '<rootDir>/<%= CLIENT_TEST_SRC_DIR %>spec/app/microfrontends/$2',
+<%_ if (applicationTypeGateway && microfrontend) { _%>
+    '^@(<%= microfrontends.map(remote => remote.lowercaseBaseName).join('|') %>)/(.*)$': '<rootDir>/<%= CLIENT_TEST_SRC_DIR %>spec/app/microfrontends/$2',
 <%_ } _%>
   },
   reporters: [

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

@@ -2,7 +2,7 @@ import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils';
 import axios from 'axios';
 import sinon from 'sinon';
 import AccountService from '@/account/account.service';
-import router from '@/router';
+import VueRouter from 'vue-router';
 <%_ if (enableTranslation) { _%>
 import TranslationService from '@/locale/translation.service';
 <%_ } _%>
@@ -50,7 +50,7 @@ describe('LoginForm Component', () => {
         <%_ } _%>
         localVue,
         provide: {
-          accountService: () => new AccountService(store, <% if (enableTranslation) { %>new TranslationService(store, i18n), <% } %><% if (authenticationTypeSession) { %> { get: () => {} }, <% } %><% if (communicationSpringWebsocket) { %>new TrackerService(router<%_ if (authenticationTypeSession) { _%>,{ get: jest.fn()}<%_ } %>), <% } %>router)
+          accountService: () => new AccountService(store, <% if (enableTranslation) { %>new TranslationService(store, i18n), <% } %><% if (authenticationTypeSession) { %> { get: () => {} }, <% } %><% if (communicationSpringWebsocket) { %>new TrackerService(new VueRouter()<%_ if (authenticationTypeSession) { _%>,{ get: jest.fn()}<%_ } %>), <% } %>new VueRouter())
         }
       });
     loginForm = wrapper.vm;

package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-edit.component.spec.ts.ejs

@@ -11,10 +11,12 @@ import UserManagementEdit from '@/admin/user-management/user-management-edit.vue
 import UserManagementEditClass from '@/admin/user-management/user-management-edit.component';
 import UserManagementService from '@/admin/user-management/user-management.service';
 import VueRouter from 'vue-router';
+import { ToastPlugin } from 'bootstrap-vue';
 import AlertService from '@/shared/alert/alert.service';
 
 const localVue = createLocalVue();
 localVue.use(VueRouter);
+localVue.use(ToastPlugin);
 
 config.initVueApp(localVue);
 <%_ if (enableTranslation) { _%>

package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs

@@ -5,6 +5,7 @@ import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils';
 import axios from 'axios';
 import sinon from 'sinon';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
+import { ToastPlugin } from 'bootstrap-vue';
 
 import * as config from '@/shared/config/config';
 import UserManagement from '@/admin/user-management/user-management.vue';
@@ -14,6 +15,7 @@ import AlertService from '@/shared/alert/alert.service';
 
 const localVue = createLocalVue();
 
+localVue.use(ToastPlugin);
 config.initVueApp(localVue);
 <%_ if (enableTranslation) { _%>
 const i18n = config.initI18N(localVue);

package/generators/client/templates/vue/src/test/javascript/spec/app/core/jhi-navbar/jhi-navbar.component.spec.ts.ejs

@@ -94,15 +94,21 @@ let wrapper: Wrapper<JhiNavbarClass>;
     expect(accountService.hasAnyAuthorityAndCheckAuth).toHaveBeenCalled();
   });
 
-  it('logout should clear credentials', () => {
+  it('logout should clear credentials', async () => {
     store.commit('authenticated', { login: 'test' });
-<%_ if (!authenticationTypeJwt) { _%>
-    loginService.logout.mockReturnValue(Promise.resolve());
+<%_ if (authenticationTypeOauth2) { _%>
+    const logoutUrl = '/to-match';
+    loginService.logout.mockReturnValue(Promise.resolve({ data: { logoutUrl } }));
+<%_ } else if (!authenticationTypeJwt) { _%>
+    loginService.logout.mockReturnValue(Promise.resolve({}));
 <%_ } _%>
-    jhiNavbar.logout();
+    await jhiNavbar.logout();
 
 <%_ if (!authenticationTypeJwt) { _%>
     expect(loginService.logout).toHaveBeenCalled();
+  <%_ if (authenticationTypeOauth2) { _%>
+    expect(router.currentRoute.path).toBe(logoutUrl);
+  <%_ } _%>
 <%_ } else { _%>
     expect(jhiNavbar.authenticated).toBeFalsy();
 <%_ } _%>

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

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

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

@@ -22,7 +22,7 @@
     "outDir": "<%= BUILD_DIR %>out-tsc/spec",
 <%_ if (microfrontend && applicationTypeGateway) { _%>
     "paths": {
-  <%_ for (const remote of remotes) { _%>
+  <%_ for (const remote of microfrontends) { _%>
       "@<%= remote.lowercaseBaseName %>/*": ["<%= CLIENT_TEST_SRC_DIR %>spec/app/microfrontends/*"],
   <%_ } _%>
       "@/*": ["*"]

package/generators/client/templates/vue/webpack/webpack.microfrontend.js.jhi.vue.ejs

@@ -24,7 +24,7 @@ const { DefinePlugin } = require('webpack');
 <&_ if (fragment.moduleFederationSection) { -&>
 <%_ if (applicationTypeGateway) { _%>
         remotes: {
-  <%_ for (const remote of remotes) { _%>
+  <%_ for (const remote of microfrontends) { _%>
           '@<%= remote.lowercaseBaseName %>': `<%= remote.lowercaseBaseName %>@/<%= remote.endpointPrefix %>/remoteEntry.js`,
   <%_ } _%>
         },

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

@@ -46,6 +46,27 @@ This is a "<%= applicationType %>" application intended to be part of a microser
 This application is configured for Service Discovery and Configuration with <% if (serviceDiscoveryEureka) { %>the JHipster-Registry<% } %><% if (serviceDiscoveryConsul) { %>Consul<% } %>. On launch, it will refuse to start if it is not able to connect to <% if (serviceDiscoveryEureka) { %>the JHipster-Registry at [http://localhost:8761](http://localhost:8761)<% } %><% if (serviceDiscoveryConsul) { %>Consul at [http://localhost:8500](http://localhost:8500)<% } %>.<% if (serviceDiscoveryEureka) { %> For more information, read our documentation on [Service Discovery and Configuration with the JHipster-Registry][].<% } %><% if (serviceDiscoveryConsul) { %> For more information, read our documentation on [Service Discovery and Configuration with Consul][].<% } %>
 <%_ } _%>
 
+## Project Structure
+
+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.
+
+<%_ if (configOptions.backendName === 'Java') { %>
+`/src/*` structure follows default <%= configOptions.backendName %> structure.
+
+<%_ } _%>
+- `.yo-rc.json` - Yeoman configuration file
+JHipster configuration is stored in this file at `generator-jhipster` key. You may find `generator-jhipster-*` for specific blueprints configuration.
+- `.yo-resolve` (optional) - Yeoman conflict resolver
+Allows to use a specific action when conflicts are found skipping prompts for files that matches a pattern. Each line should match `[pattern] [action]` with pattern been a [Minimatch](https://github.com/isaacs/minimatch#minimatch) pattern and action been one of skip (default if ommited) or force. Lines starting with `#` are considered comments and are ignored.
+- `.jhipster/*.json` - JHipster entity configuration files
+<%_ if (buildToolMaven) { _%>
+- `npmw` - wrapper to use locally installed npm.
+JHipster installs Node and npm locally using the build tool by default. This wrapper makes sure npm is installed locally and uses it avoiding some differences different versions can cause. By using `./npmw` instead of the traditional `npm` you can configure a Node-less environment to develop your application.
+<%_ } _%>
+- `/src/main/docker` - Docker configurations for the application and services that the application depends on
+
 ## Development
 
 <%_ if (skipClient) { _%>

package/generators/common/templates/package.json

@@ -2,7 +2,7 @@
   "devDependencies": {
     "concurrently": "6.4.0",
     "husky": "7.0.4",
-    "lint-staged": "12.0.2",
+    "lint-staged": "12.1.2",
     "npm": "8.1.4",
     "wait-on": "6.0.0"
   }

package/generators/cypress/templates/cypress.json.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 {
-  "baseUrl": "http://localhost:<%= serverPort %>/",
+  "baseUrl": "http://localhost:<%= gatewayServerPort || serverPort %>/",
   "testFiles": "**/*.spec.ts",
   "supportFile": "<%= CLIENT_TEST_SRC_DIR %>cypress/support/index.ts",
   "video": false,

package/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs

@@ -41,7 +41,7 @@ module.exports = (on<%_ if (cypressCoverage) { _%>, config<%_ } _%>) => {
     prepareAudit(launchOptions);
     if (browser.name === 'chrome' && browser.isHeadless) {
       launchOptions.args.push('--disable-gpu');
-      return launchOptions
+      return launchOptions;
     }
   });
 

package/generators/entity/index.js

@@ -204,7 +204,6 @@ class EntityGenerator extends BaseBlueprintGenerator {
         const context = this.context;
 
         if (this.jhipsterConfig.applicationType === MICROSERVICE) {
-          context.skipClient = context.skipClient || !this.jhipsterConfig.microfrontend;
           context.microserviceName = this.entityConfig.microserviceName = this.jhipsterConfig.baseName;
           if (!this.entityConfig.clientRootFolder) {
             context.clientRootFolder = this.entityConfig.clientRootFolder = this.entityConfig.microserviceName;
@@ -232,6 +231,13 @@ class EntityGenerator extends BaseBlueprintGenerator {
               ? ''
               : this.entityConfig.microserviceName;
           }
+
+          if (this.jhipsterConfig.applications && !this.entityConfig.skipClient) {
+            const remoteConfig = this.jhipsterConfig.applications[this.entityConfig.microserviceName];
+            if (remoteConfig.clientFramework === 'vue') {
+              this.entityConfig.skipClient = true;
+            }
+          }
         }
       },
 

package/generators/entity-client/files.js

@@ -437,11 +437,7 @@ function addSampleRegexTestingStrings(generator) {
 function writeFiles() {
   return {
     writeClientFiles() {
-      if (
-        this.skipClient ||
-        (this.jhipsterConfig.microfrontend && this.jhipsterConfig.applicationType === 'gateway' && this.microserviceName)
-      )
-        return undefined;
+      if (this.skipClient || (this.microfrontend && this.applicationTypeGateway && this.microserviceName)) return undefined;
       if (this.protractorTests) {
         addSampleRegexTestingStrings(this);
       }
@@ -478,12 +474,12 @@ function writeFiles() {
 }
 
 function addToMenu() {
-  if (this.skipClient || this.clientFrameworkVue) return;
+  if (this.skipClient) return;
 
   if (!this.embedded) {
     this.addEntityToModule();
     this.addEntityToMenu(
-      this.entityStateName,
+      this.entityPage,
       this.enableTranslation,
       this.clientFramework,
       this.entityTranslationKeyMenu,

package/generators/entity-client/index.js

@@ -157,11 +157,7 @@ module.exports = class extends BaseBlueprintGenerator {
       },
 
       replaceTranslations() {
-        if (
-          this.skipClient ||
-          (this.jhipsterConfig.microfrontend && this.jhipsterConfig.applicationType === 'gateway' && this.microserviceName)
-        )
-          return undefined;
+        if (this.skipClient || (this.microfrontend && this.applicationTypeGateway && this.microserviceName)) return undefined;
         return replaceTranslations.call(this);
       },
     };

package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs

@@ -14,7 +14,7 @@ import {
 } from '../../support/entity';
 <%_
 
-const baseApi = (applicationTypeGateway && locals.microserviceName) ? 'services/' + microserviceName.toLowerCase() + '/api/' : 'api/';
+const baseApi = entityApi + 'api/';
 
 const entityFakeData = generateFakeData('cypress');
 const requiredRelationships = relationships.filter(rel => rel.relationshipRequired || rel.id);
@@ -32,9 +32,15 @@ const skipCreateTest =
 const sampleFields = fields.filter(f => !f.autoGenerate && !f.nullable);
 
 if (workaroundRelationshipReactivePostgress && sampleFields.length === 0) {
-  sampleFields.push(fields.find(f => !f.autoGenerate));
+  const sample = fields.find(f => !f.autoGenerate);
+  if (sample) {
+    sampleFields.push(sample);
+  }
 } else if (workaroundInstantReactiveMariaDB) {
-  sampleFields.push(...fields.filter(f => !f.autoGenerate && f.nullable && f.fieldType === 'Instant'));
+  const samples = fields.filter(f => !f.autoGenerate && f.nullable && f.fieldType === 'Instant');
+  if (samples.length > 0) {
+    sampleFields.push(...samples);
+  }
 }
 _%>
 

package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs

@@ -18,7 +18,7 @@
 -%>
 import React, { useState, useEffect } from 'react';
 <%_ if (paginationInfiniteScroll) { _%>
-import InfiniteScroll from 'react-infinite-scroller';
+import InfiniteScroll from 'react-infinite-scroll-component';
 <%_ } _%>
 import { Link, RouteComponentProps } from 'react-router-dom';
 import { Button, <% if (searchEngine) { %>Input, InputGroup, FormGroup, Form, Row, Col, <% } %>Table } from 'reactstrap';
@@ -324,12 +324,10 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
 <%_ } _%>
       <div className="table-responsive">
 <%_ if (paginationInfiniteScroll) { _%>
-        <InfiniteScroll pageStart={paginationState.activePage}
-                        loadMore={handleLoadMore}
+        <InfiniteScroll dataLength={<%= entityInstance %>List ? <%= entityInstance %>List.length : 0} 
+                        next={handleLoadMore}
                         hasMore={paginationState.activePage - 1 < links.next}
-                        loader={<div className="loader">Loading ...</div>}
-                        threshold={0}
-                        initialLoad={false}>
+                        loader={<div className="loader">Loading ...</div>}>
 <%_ } _%>
         {
           <%= entityInstance %>List && <%= entityInstance %>List.length > 0 ?(

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

@@ -330,11 +330,7 @@ _%>
   <%_ if (hasManyToMany) { _%>
   public getSelected(selectedVals, option) : any {
     if (selectedVals) {
-      for (let i = 0; i < selectedVals.length; i++) {
-        if (option.id === selectedVals[i].id) {
-          return selectedVals[i];
-        }
-      }
+      return selectedVals.find(value => option.id === value.id) ?? option;
     }
     return option;
   }

package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-update.component.spec.ts.ejs

@@ -21,6 +21,7 @@
 import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils';
 import sinon, { SinonStubbedInstance } from 'sinon';
 import Router from 'vue-router';
+import { ToastPlugin } from 'bootstrap-vue';
 
 <%_ let dayJsIncluded = false;
   for (field of fields.filter(field => !field.id)) { _%>
@@ -66,6 +67,7 @@ const i18n = config.initI18N(localVue);
 const store = config.initVueXStore(localVue);
 const router = new Router();
 localVue.use(Router);
+localVue.use(ToastPlugin);
 localVue.component('font-awesome-icon', {});
 localVue.component('b-input-group', {});
 localVue.component('b-input-group-prepend', {});
@@ -102,7 +104,10 @@ describe('Component Tests', () => {
       <%_ if (relationship.otherEntityUser && authenticationTypeOauth2) { _%>
           userOAuth2Service: () => new UserOAuth2Service(),
       <%_ } else { _%>
-          <%= otherEntityName %>Service: () => new <%= otherEntityAngularName %>Service(),
+          <%= otherEntityName %>Service: () =>
+            sinon.createStubInstance<<%= otherEntityAngularName %>Service>(<%= otherEntityAngularName %>Service, {
+              retrieve: sinon.stub().resolves({}),
+            } as any),
       <%_ } _%>
     <%_ } _%>
     <%_ entitiesSeen.push(otherEntityAngularName); _%>

package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.component.spec.ts.ejs

@@ -22,6 +22,7 @@ _%>
 /* tslint:disable max-line-length */
 import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils';
 import sinon, { SinonStubbedInstance } from 'sinon';
+import { ToastPlugin } from 'bootstrap-vue';
 
 import * as config from '@/shared/config/config';
 import <%= entityAngularName %>Component from '@/entities/<%= entityFolderName %>/<%= entityFileName %>.vue';
@@ -30,6 +31,7 @@ import <%= entityAngularName %>Service from '@/entities/<%= entityFolderName %>/
 import AlertService from '@/shared/alert/alert.service';
 
 const localVue = createLocalVue();
+localVue.use(ToastPlugin);
 
 config.initVueApp(localVue);
 <%_ if (enableTranslation) { _%>
@@ -185,12 +187,14 @@ describe('Component Tests', () => {
 
       // WHEN
       comp.prepareRemove({id: <%- tsKeyId %>});
+      expect(<%= entityInstance %>ServiceStub.retrieve.callCount).toEqual(1);
+
       comp.remove<%= entityAngularName %>();
       await comp.$nextTick();
 
       // THEN
       expect(<%= entityInstance %>ServiceStub.delete.called).toBeTruthy();
-      expect(<%= entityInstance %>ServiceStub.retrieve.callCount).toEqual(1);
+      expect(<%= entityInstance %>ServiceStub.retrieve.callCount).toEqual(2);
     });
 <%_ } _%>
   });

package/generators/generator-base-blueprint.js

@@ -51,8 +51,13 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
       // jhipsterContext is the original generator
       this.jhipsterContext = this.options.jhipsterContext;
 
-      // Fallback to the original generator if the file does not exists in the blueprint.
-      this.jhipsterTemplatesFolders.push(this.jhipsterTemplatePath());
+      try {
+        // Fallback to the original generator if the file does not exists in the blueprint.
+        this.jhipsterTemplatesFolders.push(this.jhipsterTemplatePath());
+      } catch (error) {
+        this.warning('Error adding current blueprint templates as alternative for JHipster templates.');
+        this.log(error);
+      }
     }
   }
 

package/generators/generator-base.js

@@ -41,15 +41,13 @@ const { formatDateForChangelog } = require('../utils/liquibase');
 const { calculateDbNameWithLimit, hibernateSnakeCase } = require('../utils/db');
 const defaultApplicationOptions = require('../jdl/jhipster/default-application-options');
 const databaseTypes = require('../jdl/jhipster/database-types');
+const { ANGULAR_X: ANGULAR, REACT, VUE, NO: CLIENT_FRAMEWORK_NO } = require('../jdl/jhipster/client-framework-types');
 
 const JHIPSTER_CONFIG_DIR = constants.JHIPSTER_CONFIG_DIR;
 const MODULES_HOOK_FILE = `${JHIPSTER_CONFIG_DIR}/modules/jhi-hooks.json`;
 const GENERATOR_JHIPSTER = 'generator-jhipster';
 
 const SERVER_MAIN_RES_DIR = constants.SERVER_MAIN_RES_DIR;
-const ANGULAR = constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR;
-const REACT = constants.SUPPORTED_CLIENT_FRAMEWORKS.REACT;
-const VUE = constants.SUPPORTED_CLIENT_FRAMEWORKS.VUE;
 
 const { ORACLE, MYSQL, POSTGRESQL, MARIADB, MSSQL, SQL, MONGODB, COUCHBASE, NEO4J, CASSANDRA, H2_MEMORY, H2_DISK } = databaseTypes;
 const NO_DATABASE = databaseTypes.NO;
@@ -159,7 +157,13 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
    * Alternative templatePath that fetches from the blueprinted generator, instead of the blueprint.
    */
   jhipsterTemplatePath(...args) {
-    this._jhipsterGenerator = this._jhipsterGenerator || this.env.requireNamespace(this.options.namespace).generator;
+    try {
+      this._jhipsterGenerator = this._jhipsterGenerator || this.env.requireNamespace(this.options.namespace).generator;
+    } catch (error) {
+      throw new Error(
+        `The Namespace ${this.options.namespace} may not be correct. Please check your configuration and ensure your blueprint folder start with "generator-". Detail: ${error}`
+      );
+    }
     return this.fetchFromInstalledJHipster(this._jhipsterGenerator, 'templates', ...args);
   }
 
@@ -450,8 +454,8 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
     } else if (clientFramework === VUE) {
       this.needleApi.clientVue.addEntityToRouterImport(entityName, entityFileName, entityFolderName, readOnly);
       this.needleApi.clientVue.addEntityToRouter(entityInstance, entityName, entityFileName, readOnly);
-      this.needleApi.clientVue.addEntityServiceToMainImport(entityName, entityClass, entityFileName, entityFolderName);
-      this.needleApi.clientVue.addEntityServiceToMain(entityInstance, entityName);
+      this.needleApi.clientVue.addEntityServiceToEntitiesComponentImport(entityName, entityClass, entityFileName, entityFolderName);
+      this.needleApi.clientVue.addEntityServiceToEntitiesComponent(entityInstance, entityName);
     }
   }
 
@@ -2660,7 +2664,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     }
 
     if (options.microfrontend) {
-      this.jhipsterConfig.microfrontend = options.microfrontend;
+      this.warning('Microfrontend option is deprecated.');
     }
 
     if (options.reactive !== undefined) {
@@ -2721,7 +2725,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
    * @param {any} config - config to load config from
    * @param {any} dest - destination context to use default is context
    */
-  loadAppConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+  loadAppConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.jhipsterVersion = config.jhipsterVersion;
     dest.baseName = config.baseName;
     dest.applicationType = config.applicationType;
@@ -2741,7 +2745,6 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     dest.pages = config.pages;
     dest.skipJhipsterDependencies = !!config.skipJhipsterDependencies;
     dest.withAdminUi = config.withAdminUi;
-    dest.microfrontend = config.microfrontend;
     dest.gatewayServerPort = config.gatewayServerPort;
 
     dest.capitalizedBaseName = config.capitalizedBaseName;
@@ -2786,7 +2789,11 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
 
     if (dest.remotes) {
       dest.remotes.forEach(app => this.loadDerivedAppConfig(app));
+      dest.microfrontends = dest.remotes.filter(r => r.clientFramework && r.clientFramework !== CLIENT_FRAMEWORK_NO);
     }
+    dest.microfrontend =
+      (dest.applicationTypeMicroservice && !dest.skipClient) ||
+      (dest.applicationTypeGateway && dest.microfrontends && dest.microfrontends.length > 0);
   }
 
   /**
@@ -2796,7 +2803,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
    * @param {any} config - config to load config from
    * @param {any} dest - destination context to use default is context
    */
-  loadClientConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+  loadClientConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.clientPackageManager = config.clientPackageManager;
     dest.clientFramework = config.clientFramework;
     dest.clientTheme = config.clientTheme;
@@ -2827,7 +2834,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
    * @param {any} config - config to load config from
    * @param {any} dest - destination context to use default is context
    */
-  loadTranslationConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+  loadTranslationConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.enableTranslation = config.enableTranslation;
     dest.nativeLanguage = config.nativeLanguage;
     dest.languages = config.languages;
@@ -2840,7 +2847,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
    * @param {any} config - config to load config from
    * @param {any} dest - destination context to use default is context
    */
-  loadServerConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+  loadServerConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.packageName = config.packageName;
     dest.packageFolder = config.packageFolder;
     dest.serverPort = config.serverPort;
@@ -2954,7 +2961,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
         [MYSQL, POSTGRESQL, MSSQL, MARIADB].includes(dest.devDatabaseType));
   }
 
-  loadPlatformConfig(config = _.defaults({}, this.jhipsterConfig, defaultConfig), dest = this) {
+  loadPlatformConfig(config = _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults), dest = this) {
     dest.serviceDiscoveryType = config.serviceDiscoveryType;
     dest.monitoring = config.monitoring;
     this.loadDerivedPlatformConfig(dest);
@@ -3024,11 +3031,21 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     return this._needleApi;
   }
 
+  /**
+   * Default config based on current applicationType
+   */
+  get jhipsterDefaults() {
+    return this.getDefaultConfigForApplicationType();
+  }
+
   /**
    * Get default config based on applicationType
    */
   getDefaultConfigForApplicationType(applicationType = this.jhipsterConfig.applicationType) {
-    return { ...defaultApplicationOptions.getConfigForApplicationType(applicationType), ...defaultConfig };
+    return {
+      ...defaultApplicationOptions.getConfigForApplicationType(applicationType),
+      ...(applicationType === MICROSERVICE ? defaultConfigMicroservice : defaultConfig),
+    };
   }
 
   setConfigDefaults(defaults = this.jhipsterConfig.applicationType === MICROSERVICE ? defaultConfigMicroservice : defaultConfig) {

package/generators/generator-constants.js

@@ -34,7 +34,7 @@ const GRADLE_VERSION = '7.0.2';
 const JIB_VERSION = '3.1.4';
 
 // Libraries version
-const JHIPSTER_DEPENDENCIES_VERSION = '7.4.0';
+const JHIPSTER_DEPENDENCIES_VERSION = '7.4.1';
 // The spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
 const SPRING_BOOT_VERSION = '2.5.7';
 const LIQUIBASE_VERSION = '4.6.1';

package/generators/generator-transforms.js

@@ -36,6 +36,9 @@ const prettierTransform = function (options, generator, transformOptions = {}) {
       if (isFileStateDeleted(file)) {
         return file;
       }
+      if (!file.contents) {
+        throw new Error(`File content doesn't exist for ${file.relative}`);
+      }
       /* resolve from the projects config */
       let fileContent;
       try {
@@ -58,12 +61,17 @@ const prettierTransform = function (options, generator, transformOptions = {}) {
         file.contents = Buffer.from(data);
         return file;
       } catch (error) {
-        const errorMessage = `Error parsing file ${file.relative}: ${error}
+        let errorMessage;
+        if (fileContent) {
+          errorMessage = `Error parsing file ${file.relative}: ${error}
 
 At: ${fileContent
-          .split('\n')
-          .map((value, idx) => `${idx + 1}: ${value}`)
-          .join('\n')}`;
+            .split('\n')
+            .map((value, idx) => `${idx + 1}: ${value}`)
+            .join('\n')}`;
+        } else {
+          errorMessage = `Unknown prettier error: ${error}`;
+        }
         if (ignoreErrors) {
           generator.warning(errorMessage);
           return file;