generator-jhipster 7.4.1 → 7.7.0

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

@@ -7,9 +7,6 @@ import AccountService from '@/account/account.service';
 <%_ if (enableTranslation) { _%>
 import TranslationService from '@/locale/translation.service';
 <%_ } %>
-<%_ if (communicationSpringWebsocket) { _%>
-import TrackerService from '@/admin/tracker/tracker.service';
-<%_ } _%>
 import * as config from '@/shared/config/config';
 
 const axiosStub = {
@@ -39,7 +36,7 @@ describe('Account Service test suite', () => {
   it('should init service and do not retrieve account', async () => {
     axiosStub.get.resolves({ data: { 'display-ribbon-on-profiles': 'dev', activeProfiles : ['dev', 'test']}});
     <%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>const cookie = {get: jest.fn()};<%_ } %>
-    accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>cookie,<%_ } %><%_ if (communicationSpringWebsocket) { _%>null,<%_ } %> router);
+    accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>cookie,<%_ } %> router);
 
     expect(store.getters.logon).toBe(false);
     expect(accountService.authenticated).toBe(false);
@@ -55,7 +52,7 @@ describe('Account Service test suite', () => {
     localStorage.setItem('<%=jhiPrefixDashed %>-authenticationToken', 'token');
 <%_ } %>
     axiosStub.get.resolves({});
-    accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>mockedCookie,<%_ } %><%_ if (communicationSpringWebsocket) { _%>null,<%_ } %> router);
+    accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>mockedCookie,<%_ } %> router);
 
     expect((<any>router).history.current.fullPath).toBe('/');
     expect(store.getters.logon).toBe(false);
@@ -70,7 +67,7 @@ describe('Account Service test suite', () => {
 <%_ } %>
     axiosStub.get.resolves({});
     axiosStub.get.withArgs('api/account').rejects();
-    accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>mockedCookie,<%_ } %><%_ if (communicationSpringWebsocket) { _%>null,<%_ } %> router);
+    accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>mockedCookie,<%_ } %> router);
 
     expect((<any>router).history.current.fullPath).toBe('/');
     expect(accountService.authenticated).toBe(false);
@@ -79,15 +76,11 @@ describe('Account Service test suite', () => {
   });
 
   it('should init service and check for authority after retrieving account but getAccount failed', async () => {
-<%_ if (communicationSpringWebsocket) { _%>
-    const trackerService = new TrackerService(null<%_ if (authenticationTypeSession) { _%>,null<%_ } %>);
-    trackerService.connect = jest.fn();
-<%_ } _%>
 <%_ if (authenticationTypeJwt) { _%>
     localStorage.setItem('<%=jhiPrefixDashed %>-authenticationToken', 'token');
 <%_ } %>
     axiosStub.get.rejects();
-    accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>mockedCookie,<%_ } %><%_ if (communicationSpringWebsocket) { _%>trackerService,<%_ } %> router);
+    accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>mockedCookie,<%_ } %> router);
 
     return accountService.hasAnyAuthorityAndCheckAuth('USER').then((value: boolean) => {
       expect(value).toBe(false);
@@ -95,15 +88,11 @@ describe('Account Service test suite', () => {
   });
 
   it('should init service and check for authority after retrieving account', async () => {
-<%_ if (communicationSpringWebsocket) { _%>
-    const trackerService = new TrackerService(null<%_ if (authenticationTypeSession) { _%>,null<%_ } %>);
-    trackerService.connect = jest.fn();
-<%_ } _%>
 <%_ if (authenticationTypeJwt) { _%>
     localStorage.setItem('<%=jhiPrefixDashed %>-authenticationToken', 'token');
 <%_ } %>
     axiosStub.get.resolves({ data: { authorities: ['USER'] } });
-    accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>mockedCookie,<%_ } %><%_ if (communicationSpringWebsocket) { _%>trackerService,<%_ } %> router);
+    accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>mockedCookie,<%_ } %> router);
 
     return accountService.hasAnyAuthorityAndCheckAuth('USER').then((value: boolean) => {
       expect(value).toBe(true);
@@ -113,7 +102,7 @@ describe('Account Service test suite', () => {
   it('should init service as not authentified and not return any authorities admin and not retrieve account', async () => {
     axiosStub.get.resolves({});
     axiosStub.get.withArgs('api/account').rejects();
-    accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>mockedCookie,<%_ } %><%_ if (communicationSpringWebsocket) { _%>null,<%_ } %> router);
+    accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>mockedCookie,<%_ } %> router);
 
     return accountService.hasAnyAuthorityAndCheckAuth('ADMIN').then((value: boolean) => {
       expect(value).toBe(false);
@@ -123,7 +112,7 @@ describe('Account Service test suite', () => {
   it('should init service as not authentified and return authority user', async () => {
     axiosStub.get.resolves({});
     axiosStub.get.withArgs('api/account').rejects();
-    accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>mockedCookie,<%_ } %><%_ if (communicationSpringWebsocket) { _%>null,<%_ } %> router);
+    accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>mockedCookie,<%_ } %> router);
 
     return accountService.hasAnyAuthorityAndCheckAuth('USER').then((value: boolean) => {
       expect(value).toBe(true);

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

@@ -6,9 +6,6 @@ import VueRouter from 'vue-router';
 <%_ if (enableTranslation) { _%>
 import TranslationService from '@/locale/translation.service';
 <%_ } _%>
-<%_ if (communicationSpringWebsocket) { _%>
-import TrackerService from '@/admin/tracker/tracker.service';
-<%_ } _%>
 
 import * as config from '@/shared/config/config';
 import LoginForm from '@/account/login-form/login-form.vue';
@@ -50,7 +47,7 @@ describe('LoginForm Component', () => {
         <%_ } _%>
         localVue,
         provide: {
-          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())
+          accountService: () => new AccountService(store, <% if (enableTranslation) { %>new TranslationService(store, i18n), <% } %><% if (authenticationTypeSession) { %> { get: () => {} }, <% } %>new VueRouter())
         }
       });
     loginForm = wrapper.vm;

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

@@ -8,9 +8,6 @@ import router from '@/router';
 <%_ if (enableTranslation) { _%>
 import TranslationService from '@/locale/translation.service';
 <%_ } _%>
-<%_ if (communicationSpringWebsocket) { _%>
-import TrackerService from '@/admin/tracker/tracker.service';
-<%_ } _%>
 
 const localVue = createLocalVue();
 

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

@@ -2,7 +2,7 @@ import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils';
 import axios from 'axios';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 import * as sinon from 'sinon';
-import { Observable, Observer } from 'rxjs';
+import { Subject, Subscription } from 'rxjs';
 
 import * as config from '@/shared/config/config';
 import <%=jhiPrefixCapitalized%>Tracker from '@/admin/tracker/tracker.vue';
@@ -10,8 +10,6 @@ import <%=jhiPrefixCapitalized%>TrackerComponent from '@/admin/tracker/tracker.c
 import TrackerService from '@/admin/tracker/tracker.service';
 
 const localVue = createLocalVue();
-let trackerServiceStub: any;
-let listenerObserver: Observer<any>;
 
 config.initVueApp(localVue);
 <%_ if (enableTranslation) { _%>
@@ -26,12 +24,23 @@ const axiosStub = {
 
 describe('<%=jhiPrefixCapitalized%>Tracker', () => {
   let wrapper: Wrapper<<%=jhiPrefixCapitalized%>TrackerComponent>;
-  let <%=jhiPrefix%>TrackerView: <%=jhiPrefixCapitalized%>TrackerComponent;
+  let trackerView: <%=jhiPrefixCapitalized%>TrackerComponent;
+
+  let subject: Subject<any>;
+  let subscription: Subscription;
+  let subscriptionSpy;
+  let trackerServiceStub: any;
 
   beforeEach(() => {
     axiosStub.get.resolves({ data: {} });
+    subject = new Subject<any>();
     trackerServiceStub = sinon.createStubInstance<TrackerService>(TrackerService);
-    trackerServiceStub.receive = sinon.stub().callsFake(() => new Observable(observer => listenerObserver = observer));
+    trackerServiceStub.subscribe = sinon.stub().callsFake(observer => {
+      subscription = subject.subscribe(observer);
+      subscriptionSpy = sinon.spy(subscription, 'unsubscribe');
+      return subscription;
+    });
+
     wrapper = shallowMount<<%=jhiPrefixCapitalized%>TrackerComponent>(<%=jhiPrefixCapitalized%>Tracker, {
       store,
 <%_ if (enableTranslation) { _%>
@@ -39,14 +48,14 @@ describe('<%=jhiPrefixCapitalized%>Tracker', () => {
 <%_ } _%>
       localVue,
       provide: {
-        trackerService: () => trackerServiceStub
-      }
+        trackerService: () => trackerServiceStub,
+      },
     });
-    <%=jhiPrefix%>TrackerView = wrapper.vm;
+    trackerView = wrapper.vm;
   });
 
   it('should subscribe', () => {
-    expect(trackerServiceStub.subscribe.called).toBeTruthy();
+    expect(trackerServiceStub.subscribe.calledOnce).toBeTruthy();
   });
 
   it('should unsubscribe at destroy', () => {
@@ -54,50 +63,50 @@ describe('<%=jhiPrefixCapitalized%>Tracker', () => {
     wrapper.destroy();
 
     // THEN
-    expect(trackerServiceStub.unsubscribe.called).toBeTruthy();
+    expect(subscriptionSpy.calledOnce).toBeTruthy();
   });
 
   it('should add new activity', () => {
     // GIVEN
-    const activity1 = { page: 'login', sessionId: '123' };
-    <%=jhiPrefix%>TrackerView.activities = [activity1];
+    const activity1 = { time: '2020-01-01', page: 'login', sessionId: '123' };
+    trackerView.activities = [activity1];
 
     // WHEN
-    const activity2 = { page: 'login', sessionId: '456' };
-    listenerObserver.next(activity2);
+    const activity2 = { time: '2020-01-01', page: 'login', sessionId: '456' };
+    subject.next(activity2);
 
     // THEN
-    expect(<%=jhiPrefix%>TrackerView.activities).toEqual([activity1, activity2]);
+    expect(trackerView.activities).toEqual([activity1, activity2]);
   });
 
   it('should not add logout activity', () => {
     // WHEN
-    listenerObserver.next({ page: 'logout', sessionId: '123' });
+    subject.next({ time: '2020-01-01', page: 'logout', sessionId: '123' });
 
     // THEN
-    expect(<%=jhiPrefix%>TrackerView.activities).toEqual([]);
+    expect(trackerView.activities).toEqual([]);
   });
 
   it('should update user activity', () => {
     // GIVEN
-    <%=jhiPrefix%>TrackerView.activities = [{ page: 'login', sessionId: '123' }];
+    trackerView.activities = [{ time: '2020-01-01', page: 'login', sessionId: '123' }];
 
     // WHEN
-    const activity = { page: 'login', sessionId: '123' };
-    listenerObserver.next(activity);
+    const activity = { time: '2020-01-01', page: 'login', sessionId: '123' };
+    subject.next(activity);
 
     // THEN
-    expect(<%=jhiPrefix%>TrackerView.activities).toEqual([activity]);
+    expect(trackerView.activities).toEqual([activity]);
   });
 
   it('should remove user activity', () => {
     // GIVEN
-    <%=jhiPrefix%>TrackerView.activities = [{ page: 'login', sessionId: '123' }];
+    trackerView.activities = [{ time: '2020-01-01', page: 'login', sessionId: '123' }];
 
     // WHEN
-    listenerObserver.next({ page: 'logout', sessionId: '123' });
+    subject.next({ time: '2020-01-01', page: 'logout', sessionId: '123' });
 
     // THEN
-    expect(<%=jhiPrefix%>TrackerView.activities).toEqual([]);
+    expect(trackerView.activities).toEqual([]);
   });
 });

package/generators/client/templates/vue/src/test/javascript/spec/app/admin/tracker/tracker.service.spec.ts.ejs

@@ -1,121 +1,84 @@
-import TrackerService from '@/admin/tracker/tracker.service';
+import { createLocalVue } from '@vue/test-utils';
 import * as sinon from 'sinon';
 import VueRouter from 'vue-router';
+import { Subject } from 'rxjs';
+
+import TrackerService from '@/admin/tracker/tracker.service';
+import * as config from '@/shared/config/config';
+import { defaultAccountState } from '@/shared/config/store/account-store';
+
+const localVue = createLocalVue();
+const store = config.initVueXStore(localVue);
 
 describe('Tracker Service', () => {
   let trackerService: TrackerService;
   let routerStub: any;
 
+  let mockStomp: any;
+
   beforeEach(() => {
+    store.replaceState({
+      ...store.state,
+      accountStore: { ...defaultAccountState },
+    });
     routerStub = sinon.createStubInstance<VueRouter>(VueRouter);
+    sinon.stub(routerStub, 'currentRoute').get(() => ({ fullPath: '/' }));
     routerStub.afterEach = sinon.spy();
-    
-    trackerService = new TrackerService(routerStub<%_ if (authenticationTypeSession) { _%>,{ get: jest.fn()}<%_ } %>);
-  });
 
-  it('Should connetion and listener be initialized', () => {
-    expect(trackerService.connection).toBeDefined();
-    expect(trackerService.listener).toBeDefined();
-  });
+    trackerService = new TrackerService(routerStub, store<%_ if (authenticationTypeSession) { _%>,{ get: jest.fn()}<%_ } %>);
 
-  it('Should return listener', () => {
-    // WHEN
-    const receiveResult = trackerService.receive();
+    const watch$ = new Subject<any>();
 
-    // THEN
-    expect(receiveResult).toBe(trackerService.listener);
-  });
-
-  it('Should not send activity for disconnected client', () => {
-    // GIVEN
-    const stompClientStub: any = sinon.stub();
-    stompClientStub.send = sinon.spy();
-    trackerService.stompClient = stompClientStub;
-
-    // WHEN
-    trackerService.sendActivity();
+    mockStomp = {
+      publish: sinon.stub(),
+      watch: sinon.stub().callsFake(() => watch$),
+      configure: sinon.stub(),
+      activate: sinon.stub(),
+      deactivate: sinon.stub(),
+      connected$: new Subject<any>(),
+    };
 
-    // THEN
-    expect(stompClientStub.send.notCalled).toBeTruthy();
+    trackerService.stomp = mockStomp;
+    trackerService['buildUrl'] = () => '';
   });
 
-  it('Should send activity', () => {
-    // GIVEN
-    const stompClientStub: any = sinon.stub();
-    stompClientStub.connected = true;
-    stompClientStub.send = sinon.spy();
-    trackerService.stompClient = stompClientStub;
-    sinon.stub(routerStub, 'currentRoute').get(() => ({ fullPath: '/admin' }));
-
-    // WHEN
-    trackerService.sendActivity();
-
-    // THEN
-    expect(stompClientStub.send.calledOnce).toBeTruthy();
-    expect(stompClientStub.send.calledOnceWithExactly('/topic/activity',
-      JSON.stringify({ page: '/admin' }), {})).toBeTruthy();
-  });
-
-  it('Should connected for the first time', () => {
-    // GIVEN
-    const connectedPromise = sinon.spy();
-    trackerService.connectedPromise = connectedPromise;
-
-    // WHEN
-    trackerService.afterConnect();
-
-    // THEN
-    expect(connectedPromise.calledOnceWith('success'));
-    expect(trackerService.alreadyConnectedOnce).toBeTruthy();
-    expect(trackerService.connectedPromise).toBeNull();
+  it('Should subscribe router activity', async () => {
     expect(routerStub.afterEach.calledOnce).toBeTruthy();
   });
 
-  it('Should connected for the second time', () => {
-    // GIVEN
-    const connectedPromise = sinon.spy();
-    trackerService.connectedPromise = connectedPromise;
-    trackerService.alreadyConnectedOnce = true;
-
+  it('Should call activate on authenticated', async () => {
     // WHEN
-    trackerService.afterConnect();
+    store.commit('authenticated', {});
+    await localVue.nextTick();
 
     // THEN
-    expect(connectedPromise.calledOnceWith('success'));
-    expect(trackerService.alreadyConnectedOnce).toBeTruthy();
-    expect(trackerService.connectedPromise).toBeNull();
-    expect(routerStub.afterEach.calledOnce).toBeFalsy();
+    expect(mockStomp.activate.calledOnce).toBeTruthy();
   });
 
-  it('Should unsubscribe', () => {
+  it('Should send activity on connected', async () => {
     // GIVEN
-    const subscriberStub: any = sinon.stub();
-    subscriberStub.unsubscribe = sinon.spy();
-    trackerService.listener = null;
-    trackerService.subscriber = subscriberStub;
+    sinon.stub(routerStub, 'currentRoute').get(() => ({ fullPath: '/admin' }));
 
     // WHEN
-    trackerService.unsubscribe();
+    mockStomp.connected$.next({});
 
     // THEN
-    expect(subscriberStub.unsubscribe.calledOnce).toBeTruthy();
-    expect(trackerService.listener).toBeDefined();
+    expect(mockStomp.publish.callCount).toBe(1);
+    expect(
+      mockStomp.publish.calledOnceWithExactly({ destination: '/topic/activity', body: JSON.stringify({ page: '/admin' }) })
+    ).toBeTruthy();
   });
 
-  it('Should disconnect', () => {
+  it('Should disconnect on logout', async () => {
     // GIVEN
-    const stompClientStub: any = sinon.stub();
-    stompClientStub.disconnect = sinon.spy();
-    trackerService.stompClient = stompClientStub;
+    store.commit('authenticated', {});
+    await localVue.nextTick();
 
     // WHEN
-    trackerService.disconnect();
+    store.commit('logout');
+    await localVue.nextTick();
 
     // THEN
-    expect(routerStub.afterEach.calledOnce).toBeTruthy();
-    expect(stompClientStub.disconnect.calledOnce).toBeTruthy();
-    expect(trackerService.stompClient).toBeNull();
-    expect(trackerService.alreadyConnectedOnce).toBeFalsy();
+    expect(mockStomp.deactivate.calledOnce).toBeTruthy();
   });
-
 });

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

@@ -45,7 +45,7 @@ describe('UserManagementEdit Component', () => {
 <%_ } _%>
       localVue,
       provide: {
-        userService: () => new UserManagementService(),
+        userManagementService: () => new UserManagementService(),
         alertService: () => new AlertService(),
       }
     });
@@ -87,8 +87,8 @@ describe('UserManagementEdit Component', () => {
       // GIVEN
       axiosStub.put.resolves({
         headers: {
-          'x-jhipsterapp-alert': '',
-          'x-jhipsterapp-params': '',
+          'x-<%= frontendAppName.toLowerCase() %>-alert': '',
+          'x-<%= frontendAppName.toLowerCase() %>-params': '',
         },
       });
       userManagementEdit.userAccount = { id: <%- tsKeyId %>, authorities: [] };
@@ -106,8 +106,8 @@ describe('UserManagementEdit Component', () => {
       // GIVEN
       axiosStub.post.resolves({
         headers: {
-          'x-jhipsterapp-alert': '',
-          'x-jhipsterapp-params': '',
+          'x-<%= frontendAppName.toLowerCase() %>-alert': '',
+          'x-<%= frontendAppName.toLowerCase() %>-params': '',
         },
       });
       userManagementEdit.userAccount = { authorities: [] };

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

@@ -33,7 +33,7 @@ describe('UserManagementView Component', () => {
   let userManagementView: UserManagementViewClass;
 
   beforeEach(() => {
-    wrapper = shallowMount<UserManagementViewClass>(UserManagementView, { store, <% if (enableTranslation) { %>i18n, <% } %>localVue, provide: { userService: () => new UserManagementService(), alertService: () => new AlertService(), } });
+    wrapper = shallowMount<UserManagementViewClass>(UserManagementView, { store, <% if (enableTranslation) { %>i18n, <% } %>localVue, provide: { userManagementService: () => new UserManagementService(), alertService: () => new AlertService(), } });
     userManagementView = wrapper.vm;
   });
 

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

@@ -60,7 +60,7 @@ describe('UserManagement Component', () => {
         bModal: true
       },
       provide: {
-        userService: () => new UserManagementService(),
+        userManagementService: () => new UserManagementService(),
         alertService: () => new AlertService(),
       }
     });
@@ -98,8 +98,8 @@ describe('UserManagement Component', () => {
       // GIVEN
       axiosStub.delete.resolves({
         headers: {
-          'x-jhipsterapp-alert': '',
-          'x-jhipsterapp-params': '',
+          'x-<%= frontendAppName.toLowerCase() %>-alert': '',
+          'x-<%= frontendAppName.toLowerCase() %>-params': '',
         },
       });
 

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.

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

@@ -63,8 +63,6 @@ module.exports = async (env, options) => {
               '/api',
               '/services',
               '/management',
-              '/swagger-resources',
-              '/v2/api-docs',
               '/v3/api-docs',
               '/h2-console',
 <%_ if (authenticationTypeOauth2) { _%>

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.
@@ -43,9 +43,7 @@ module.exports = (env, options) => {
         port: 9000,
         proxy: {
           target: `http://localhost:${options.watch ? '<%= this.applicationTypeMicroservice ? gatewayServerPort : serverPort %>' : '<%= devServerPort %>'}`,
-<%_ if (communicationSpringWebsocket) { _%>
           ws: true,
-<%_ } _%>
         },
         socket: {
           clients: {

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.

package/generators/cloudfoundry/esm.mjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * 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.
@@ -16,6 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';

package/generators/cloudfoundry/index.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * 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.
@@ -20,8 +20,12 @@ const os = require('os');
 const childProcess = require('child_process');
 const chalk = require('chalk');
 const glob = require('glob');
-const prompts = require('./prompts');
+
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
+const { INITIALIZING_PRIORITY, PROMPTING_PRIORITY, CONFIGURING_PRIORITY, DEFAULT_PRIORITY, END_PRIORITY } =
+  require('../../lib/constants/priorities.cjs').compat;
+
+const prompts = require('./prompts');
 const statistics = require('../statistics');
 const { MEMCACHED } = require('../../jdl/jhipster/cache-types');
 const { GRADLE, MAVEN } = require('../../jdl/jhipster/build-tool-types');
@@ -65,7 +69,7 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  get initializing() {
+  get [INITIALIZING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
@@ -74,7 +78,7 @@ module.exports = class extends BaseBlueprintGenerator {
     return prompts.prompting;
   }
 
-  get prompting() {
+  get [PROMPTING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
@@ -114,7 +118,7 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  get configuring() {
+  get [CONFIGURING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
@@ -181,7 +185,7 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  get default() {
+  get [DEFAULT_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._default();
   }
@@ -231,7 +235,7 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  get end() {
+  get [END_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._end();
   }

package/generators/cloudfoundry/prompts.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * 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.

package/generators/cloudfoundry/templates/application-cloudfoundry.yml.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.

package/generators/cloudfoundry/templates/manifest.yml.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.

package/generators/common/esm.mjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * 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.
@@ -16,6 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';
+export { files } from './files.js';