generator-jhipster 7.9.2 → 7.9.4

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

@@ -112,7 +112,7 @@
     "jest": "<%= dependabotPackageJson.devDependencies['jest'] %>",
     "jest-environment-jsdom": "<%= dependabotPackageJson.devDependencies['jest-environment-jsdom'] %>",
     "jest-junit": "<%= dependabotPackageJson.devDependencies['jest-junit'] %>",
-    "jest-sonar-reporter": "<%= dependabotPackageJson.devDependencies['jest-sonar-reporter'] %>",
+    "jest-sonar": "<%= dependabotPackageJson.devDependencies['jest-sonar'] %>",
     "json-loader": "<%= dependabotPackageJson.devDependencies['json-loader'] %>",
 <%_ if (enableTranslation) { _%>
     "folder-hash": "<%= dependabotPackageJson.devDependencies['folder-hash'] %>",
@@ -173,8 +173,8 @@
     "default_environment": "prod"
   },
   "scripts": {
-    "prettier:check": "prettier --check \"{,src/**/,webpack/}*.{<%= getPrettierExtensions() %>}\"",
-    "prettier:format": "prettier --write \"{,src/**/,webpack/}*.{<%= getPrettierExtensions() %>}\"",
+    "prettier:check": "prettier --check \"{,src/**/,webpack/,.blueprint/**/}*.{<%= getPrettierExtensions() %>}\"",
+    "prettier:format": "prettier --write \"{,src/**/,webpack/,.blueprint/**/}*.{<%= getPrettierExtensions() %>}\"",
     "lint": "eslint . --ext .js,.ts,.jsx,.tsx",
     "lint:fix": "<%= clientPackageManager %> run lint -- --fix",
     "cleanup": "rimraf <%= DIST_DIR %>",
@@ -221,9 +221,5 @@
     "webapp:prod": "<%= clientPackageManager %> run clean-www && <%= clientPackageManager %> run webapp:build:prod --",
     "webapp:test": "<%= clientPackageManager %> run test --",
     "webpack-dev-server": "webpack serve"
-  },
-  "jestSonar": {
-    "reportPath": "<%= BUILD_DIR %>test-results/jest",
-    "reportFile": "TESTS-results-sonar.xml"
   }
 }

package/generators/client/templates/react/src/main/webapp/app/config/store.ts.ejs

@@ -38,9 +38,6 @@ import loggerMiddleware from './logger-middleware';
 <%_ if (communicationSpringWebsocket) { _%>
 import websocketMiddleware from './websocket-middleware';
 <%_ } _%>
-<%_ if (enableTranslation) { _%>
-import translationMiddleware from './translation-middleware';
-<%_ } _%>
 
 const store = configureStore({
   reducer: sharedReducers,
@@ -56,9 +53,6 @@ const store = configureStore({
       loadingBarMiddleware(),
 <%_ if (communicationSpringWebsocket) { _%>
       websocketMiddleware,
-<%_ } _%>
-<%_ if (enableTranslation) { _%>
-      translationMiddleware,
 <%_ } _%>
       loggerMiddleware
     ),

package/generators/client/templates/react/src/main/webapp/app/modules/administration/administration.reducer.spec.ts.ejs

@@ -23,7 +23,7 @@ import thunk from 'redux-thunk';
 import sinon from 'sinon';
 
 import administration, {
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
   getGatewayRoutes,
 <%_ } _%>
 <%_ if (withAdminUi) { _%>
@@ -56,7 +56,7 @@ describe('Administration reducer tests', () => {
       errorMessage: null,
       totalItems: 0
     });
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
     expect(isEmpty(state.gateway.routes));
 <%_ } _%>
 <%_ if (withAdminUi) { _%>
@@ -84,7 +84,7 @@ describe('Administration reducer tests', () => {
     it('should set state to loading', () => {
       testMultipleTypes(
         [
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
           getGatewayRoutes.pending.type,
 <%_ } _%>
 <%_ if (withAdminUi) { _%>
@@ -111,7 +111,7 @@ describe('Administration reducer tests', () => {
     it('should set state to failed and put an error message in errorMessage', () => {
       testMultipleTypes(
         [
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
           getGatewayRoutes.rejected.type,
 <%_ } _%>
 <%_ if (withAdminUi) { _%>
@@ -138,7 +138,7 @@ describe('Administration reducer tests', () => {
   });
 
   describe('Success', () => {
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
     it('should update state according to a successful fetch gateway routes request', () => {
       const payload = { data: [] };
       const toTest = administration(undefined, { type: getGatewayRoutes.fulfilled.type, payload });
@@ -264,7 +264,7 @@ describe('Administration reducer tests', () => {
     let store;
 
     const resolvedObject = { value: 'whatever' };
-<%_ if (applicationTypeGateway && serviceDiscoveryType || withAdminUi) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny || withAdminUi) { _%>
     beforeEach(() => {
       const mockStore = configureStore([thunk]);
       store = mockStore({});
@@ -272,7 +272,7 @@ describe('Administration reducer tests', () => {
       axios.post = sinon.stub().returns(Promise.resolve(resolvedObject));
     });
 <%_ } _%>
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
     it('dispatches FETCH_GATEWAY_ROUTE_PENDING and FETCH_GATEWAY_ROUTE_FULFILLED actions', async () => {
       const expectedActions = [
         {

package/generators/client/templates/react/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs

@@ -25,7 +25,7 @@ import { AppThunk } from 'app/config/store';
 const initialState = {
   loading: false,
   errorMessage: null,
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
   gateway: {
     routes: []
   },
@@ -53,7 +53,7 @@ const initialState = {
 export type AdministrationState =  Readonly<typeof initialState>;
 
 // Actions
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
 export const getGatewayRoutes = createAsyncThunk('administration/fetch_gateway_route', async () => axios.get<any>('api/gateway/routes'), {
   serializeError: serializeAxiosError,
 });
@@ -113,9 +113,9 @@ export const AdministrationSlice = createSlice({
     <%_ } _%>
   },
   extraReducers(builder) {
-<%_ if (withAdminUi || (applicationTypeGateway && serviceDiscoveryType)) { _%>
+<%_ if (withAdminUi || (applicationTypeGateway && serviceDiscoveryAny)) { _%>
     builder
-      <%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+      <%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
       .addCase(getGatewayRoutes.fulfilled, (state, action) => {
         state.loading = false;
         state.gateway = {
@@ -159,7 +159,7 @@ export const AdministrationSlice = createSlice({
       <%_ } _%>
       .addMatcher(
         isPending(
-          <%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+          <%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
           getGatewayRoutes,
           <%_ } _%>
           <%_ if (withAdminUi) { _%>
@@ -178,7 +178,7 @@ export const AdministrationSlice = createSlice({
       )
       .addMatcher(
         isRejected(
-          <%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+          <%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
           getGatewayRoutes,
           <%_ } _%>
           <%_ if (withAdminUi) { _%>

package/generators/client/templates/react/src/main/webapp/app/modules/administration/index.tsx.ejs

@@ -30,7 +30,7 @@ import Metrics from './metrics/metrics';
 import Configuration from './configuration/configuration';
 <%_ } _%>
 import Docs from './docs/docs';
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
 import Gateway from './gateway/gateway';
 <%_ } _%>
 <%_ if (communicationSpringWebsocket) { _%>
@@ -46,7 +46,7 @@ const AdministrationRoutes = () => (
 <%_ if (communicationSpringWebsocket) { _%>
       <Route path="tracker" element={<Tracker />} />
 <%_ } _%>
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
       <Route path="gateway" element={<Gateway />} />
 <%_ } _%>
 <%_ if (withAdminUi) { _%>

package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs

@@ -27,7 +27,7 @@ import { Translate, translate } from 'react-jhipster';
 
 const adminMenuItems = () => (
   <>
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
     <MenuItem icon="road" to="/admin/gateway"><Translate contentKey="global.menu.admin.gateway">Gateway</Translate></MenuItem>
 <%_ } _%>
 <%_ if (!skipUserManagement) { _%>

package/generators/client/templates/react/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs

@@ -40,7 +40,9 @@ import authentication, {
   clearAuth,
   initialState,
 } from 'app/shared/reducers/authentication';
-<% if (enableTranslation) { %>import { updateLocale } from 'app/shared/reducers/locale';<% } %>
+<%_ if (enableTranslation) { _%>
+import { updateLocale, setLocale } from 'app/shared/reducers/locale';
+<%_ } _%>
 
 describe('Authentication reducer tests', () => {
   function isAccountEmpty(state): boolean {
@@ -204,7 +206,11 @@ describe('Authentication reducer tests', () => {
     const resolvedObject = { value: 'whatever' };
     beforeEach(() => {
       const mockStore = configureStore([thunk]);
-      store = mockStore({ authentication: { account: { <%_ if (enableTranslation) { _%> langKey: '<%= nativeLanguage %>' <% } %> } } });
+<%_ if (enableTranslation) { _%>
+      store = mockStore({ authentication: { account: { langKey: '<%= nativeLanguage %>' } }, locale: { loadedLocales: ['<%= nativeLanguage %>'] } });
+<%_ } else { _%>
+      store = mockStore({ authentication: { account: { } } });
+<%_ } _%>
       axios.get = sinon.stub().returns(Promise.resolve(resolvedObject));
     });
 
@@ -218,15 +224,18 @@ describe('Authentication reducer tests', () => {
           type: getAccount.fulfilled.type,
           payload: resolvedObject
         },
-        updateLocale('<%= nativeLanguage %>'),
+        {
+          type: setLocale.pending.type,
+        },
+        updateLocale('en'),
+        {
+          type: setLocale.fulfilled.type,
+          payload: 'en',
+        },
         <%_ } _%>
       ];
       await store.dispatch(getSession());
-      expect(store.getActions()[0]).toMatchObject(expectedActions[0]);
-      <%_ if (enableTranslation) { _%>
-      expect(store.getActions()[1]).toMatchObject(expectedActions[1]);
-      expect(store.getActions()[2]).toMatchObject(expectedActions[2]);
-      <%_ } _%>
+      expect(store.getActions()).toMatchObject(expectedActions);
     });
 
     it('dispatches LOGOUT actions', async () => {

package/generators/client/templates/react/src/main/webapp/app/shared/reducers/authentication.ts.ejs

@@ -56,7 +56,7 @@ export const getSession = (): AppThunk => <% if (enableTranslation) { %>async<%
   const { account } = getState().authentication;
   if (account && account.langKey) {
     const langKey = Storage.session.get('locale', account.langKey);
-    dispatch(setLocale(langKey));
+    await dispatch(setLocale(langKey));
   }
 <%_ } else { _%>
   dispatch(getAccount());

package/generators/client/templates/react/src/main/webapp/app/shared/reducers/locale.spec.ts.ejs

@@ -4,7 +4,9 @@ import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { TranslatorContext } from 'react-jhipster';
 
-import locale, { setLocale, updateLocale } from 'app/shared/reducers/locale';
+import locale, { setLocale, updateLocale, loaded, addTranslationSourcePrefix } from 'app/shared/reducers/locale';
+
+const defaultLocale = '<%= nativeLanguage %>';
 
 describe('Locale reducer tests', () => {
   it('should return the initial state', () => {
@@ -15,19 +17,19 @@ describe('Locale reducer tests', () => {
   });
 
   it('should correctly set the first time locale', () => {
-    const localeState = locale(undefined, updateLocale('en'));
+    const localeState = locale(undefined, updateLocale(defaultLocale));
     expect(localeState).toMatchObject({
-      currentLocale: 'en'
+      currentLocale: defaultLocale
     });
-    expect(TranslatorContext.context.locale).toEqual('en');
+    expect(TranslatorContext.context.locale).toEqual(defaultLocale);
   });
 
   it('should correctly detect update in current locale state', () => {
-    TranslatorContext.setLocale('en');
-    expect(TranslatorContext.context.locale).toEqual('en');
+    TranslatorContext.setLocale(defaultLocale);
+    expect(TranslatorContext.context.locale).toEqual(defaultLocale);
     const localeState = locale(
       {
-        currentLocale: 'en',
+        currentLocale: defaultLocale,
         sourcePrefixes: [],
         lastChange: new Date().getTime(),
         loadedKeys: [],
@@ -40,22 +42,177 @@ describe('Locale reducer tests', () => {
     expect(TranslatorContext.context.locale).toEqual('es');
   });
 
-  describe('Locale actions', () => {
-    let store;
-    beforeEach(() => {
-      store = configureStore([thunk])({});
-      axios.get = sinon.stub().returns(Promise.resolve({ key: 'value' }));
+  describe('setLocale reducer', () => {
+    describe('with default language loaded', () => {
+      let store;
+      beforeEach(() => {
+        store = configureStore([thunk])({ locale: { loadedLocales: [defaultLocale], loadedKeys: [] } });
+        axios.get = sinon.stub().returns(Promise.resolve({ key: 'value' }));
+      });
+
+      it('dispatches updateLocale action for default locale', async () => {
+        TranslatorContext.setDefaultLocale(defaultLocale);
+        expect(Object.keys(TranslatorContext.context.translations)).not.toContainEqual(defaultLocale);
+
+        const expectedActions = [
+          {
+            type: setLocale.pending.type,
+          },
+          updateLocale(defaultLocale),
+          {
+            type: setLocale.fulfilled.type,
+            payload: defaultLocale,
+          },
+        ];
+
+        await store.dispatch(setLocale(defaultLocale));
+        expect(store.getActions()).toMatchObject(expectedActions);
+      });
+    });
+
+    describe('with no language loaded', () => {
+      let store;
+      beforeEach(() => {
+        store = configureStore([thunk])({ locale: { sourcePrefixes: [], loadedLocales: [], loadedKeys: [] } });
+        axios.get = sinon.stub().returns(Promise.resolve({ key: 'value' }));
+      });
+
+      it('dispatches loaded and updateLocale action for default locale', async () => {
+        TranslatorContext.setDefaultLocale(defaultLocale);
+        expect(Object.keys(TranslatorContext.context.translations)).not.toContainEqual(defaultLocale);
+
+        const expectedActions = [
+          {
+            type: setLocale.pending.type,
+          },
+          loaded({ keys: [defaultLocale], locale: defaultLocale }),
+          updateLocale(defaultLocale),
+          {
+            type: setLocale.fulfilled.type,
+            payload: defaultLocale,
+          },
+        ];
+
+        await store.dispatch(setLocale(defaultLocale));
+        expect(store.getActions()).toMatchObject(expectedActions);
+      });
+    });
+  });
+
+  describe('addTranslationSourcePrefix reducer', () => {
+    const sourcePrefix = 'foo/';
+
+    describe('with no prefixes and keys loaded', () => {
+      let store;
+      beforeEach(() => {
+        store = configureStore([thunk])({
+          locale: { currentLocale: defaultLocale, sourcePrefixes: [], loadedLocales: [], loadedKeys: [] },
+        });
+        axios.get = sinon.stub().returns(Promise.resolve({ key: 'value' }));
+      });
+
+      it('dispatches loaded action with keys and sourcePrefix', async () => {
+        const expectedActions = [
+          {
+            type: addTranslationSourcePrefix.pending.type,
+          },
+          loaded({ keys: [`${sourcePrefix}${defaultLocale}`], sourcePrefix }),
+          {
+            type: addTranslationSourcePrefix.fulfilled.type,
+            payload: `${sourcePrefix}${defaultLocale}`,
+          },
+        ];
+
+        await store.dispatch(addTranslationSourcePrefix(sourcePrefix));
+        expect(store.getActions()).toMatchObject(expectedActions);
+      });
     });
 
-    it('dispatches SET_LOCALE action for default locale', async () => {
-      TranslatorContext.setDefaultLocale('en');
-      const defaultLocale = TranslatorContext.context.defaultLocale;
-      expect(Object.keys(TranslatorContext.context.translations)).not.toContainEqual(defaultLocale);
+    describe('with prefix already added', () => {
+      let store;
+      beforeEach(() => {
+        store = configureStore([thunk])({
+          locale: { currentLocale: defaultLocale, sourcePrefixes: [sourcePrefix], loadedLocales: [], loadedKeys: [] },
+        });
+        axios.get = sinon.stub().returns(Promise.resolve({ key: 'value' }));
+      });
+
+      it("doesn't dispatches loaded action", async () => {
+        const expectedActions = [
+          {
+            type: addTranslationSourcePrefix.pending.type,
+          },
+          {
+            type: addTranslationSourcePrefix.fulfilled.type,
+            payload: `${sourcePrefix}${defaultLocale}`,
+          },
+        ];
+
+        await store.dispatch(addTranslationSourcePrefix(sourcePrefix));
+        expect(store.getActions()).toMatchObject(expectedActions);
+      });
+    });
+
+    describe('with key already loaded', () => {
+      let store;
+      beforeEach(() => {
+        store = configureStore([thunk])({
+          locale: { currentLocale: defaultLocale, sourcePrefixes: [], loadedLocales: [], loadedKeys: [`${sourcePrefix}${defaultLocale}`] },
+        });
+        axios.get = sinon.stub().returns(Promise.resolve({ key: 'value' }));
+      });
+
+      it("doesn't dispatches loaded action", async () => {
+        const expectedActions = [
+          {
+            type: addTranslationSourcePrefix.pending.type,
+          },
+          {
+            type: addTranslationSourcePrefix.fulfilled.type,
+            payload: `${sourcePrefix}${defaultLocale}`,
+          },
+        ];
+
+        await store.dispatch(addTranslationSourcePrefix(sourcePrefix));
+        expect(store.getActions()).toMatchObject(expectedActions);
+      });
+    });
+  });
+
+  describe('loaded reducer', () => {
+    describe('with empty state', () => {
+      let initialState;
+      beforeEach(() => {
+        initialState = { currentLocale: defaultLocale, sourcePrefixes: [], loadedLocales: [], loadedKeys: [] };
+      });
+
+      it("and empty parameter, don't adds anything", () => {
+        const expectedState = { currentLocale: defaultLocale, sourcePrefixes: [], loadedLocales: [], loadedKeys: [] };
+
+        const localeState = locale(initialState, loaded({}));
+        expect(localeState).toMatchObject(expectedState);
+      });
+
+      it('and keys parameter, adds to loadedKeys', () => {
+        const expectedState = { currentLocale: defaultLocale, sourcePrefixes: [], loadedLocales: [], loadedKeys: ['foo'] };
+
+        const localeState = locale(initialState, loaded({ keys: ['foo'] }));
+        expect(localeState).toMatchObject(expectedState);
+      });
+
+      it('and sourcePrefix parameter, adds to sourcePrefixes', () => {
+        const expectedState = { currentLocale: defaultLocale, sourcePrefixes: ['foo'], loadedLocales: [], loadedKeys: [] };
+
+        const localeState = locale(initialState, loaded({ sourcePrefix: 'foo' }));
+        expect(localeState).toMatchObject(expectedState);
+      });
 
-      const expectedActions = [updateLocale(defaultLocale)];
+      it('and locale parameter, adds to loadedLocales', () => {
+        const expectedState = { currentLocale: defaultLocale, sourcePrefixes: [], loadedLocales: ['foo'], loadedKeys: [] };
 
-      await store.dispatch(setLocale(defaultLocale));
-      expect(store.getActions()).toEqual(expectedActions);
+        const localeState = locale(initialState, loaded({ locale: 'foo' }));
+        expect(localeState).toMatchObject(expectedState);
+      });
     });
   });
 });

package/generators/client/templates/react/src/main/webapp/app/shared/reducers/locale.ts.ejs

@@ -18,9 +18,8 @@
 -%>
 import axios from 'axios';
 import dayjs from 'dayjs';
-import { createSlice } from '@reduxjs/toolkit';
+import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 
-import { AppThunk } from 'app/config/store';
 import { TranslatorContext } from 'react-jhipster';
 
 const initialState = {
@@ -28,20 +27,51 @@ const initialState = {
   sourcePrefixes: [],
   lastChange: TranslatorContext.context.lastChange,
   loadedKeys: [],
+  loadedLocales: [],
 };
 
 export type LocaleState =  Readonly<typeof initialState>;
 
-export const loadLocale = async (locale: string, prefix: string) => {
+const loadLocaleAndRegisterLocaleFile = async (locale: string, prefix: string) => {
   if (prefix || !Object.keys(TranslatorContext.context.translations).includes(locale)) {
     const response = await axios.get(`${prefix}i18n/${locale}.json?_=${I18N_HASH}`, { baseURL: '' });
     TranslatorContext.registerTranslations(locale, response.data);
   }
 };
 
-export const setLocale: (locale: string) => AppThunk = locale => dispatch => {
-  dispatch(updateLocale(locale));
-};
+export const setLocale = createAsyncThunk('locale/setLocale', async (locale: string, thunkAPI: any) => {
+  const { sourcePrefixes, loadedKeys, loadedLocales } = thunkAPI.getState().locale;
+  if (!loadedLocales.includes(locale)) {
+    const keys = (
+      await Promise.all(
+        [''].concat(sourcePrefixes).map(async sourcePrefix => {
+          const key = `${sourcePrefix}${locale}`;
+          if (loadedKeys.includes(key)) return undefined;
+          await loadLocaleAndRegisterLocaleFile(locale, sourcePrefix);
+          return key;
+        })
+      )
+    ).filter(Boolean);
+    thunkAPI.dispatch(loaded({ keys, locale }));
+  }
+  thunkAPI.dispatch(updateLocale(locale));
+  return locale;
+});
+
+export const addTranslationSourcePrefix = createAsyncThunk(
+  'locale/addTranslationSourcePrefix',
+  async (sourcePrefix: string, thunkAPI: any) => {
+    const { currentLocale, loadedKeys, sourcePrefixes } = thunkAPI.getState().locale;
+    const key = `${sourcePrefix}${currentLocale}`;
+    if (!sourcePrefixes.includes(sourcePrefix)) {
+      if (!loadedKeys.includes(key)) {
+        await loadLocaleAndRegisterLocaleFile(currentLocale, sourcePrefix);
+        thunkAPI.dispatch(loaded({ sourcePrefix, keys: [key] }));
+      }
+    }
+    return key;
+  }
+);
 
 export const LocaleSlice = createSlice({
   name: 'locale',
@@ -56,19 +86,22 @@ export const LocaleSlice = createSlice({
       state.currentLocale = currentLocale;
     },
     loaded(state, action) {
-      state.lastChange = TranslatorContext.context.lastChange;
-      state.loadedKeys = state.loadedKeys.concat(action.payload);
-    },
-    addTranslationSourcePrefix(state, action) {
-      const sourcePrefix = action.payload;
-      if (!state.sourcePrefixes.includes(sourcePrefix)) {
+      const { keys, locale, sourcePrefix } = action.payload;
+      if (sourcePrefix && !state.sourcePrefixes.includes(sourcePrefix)) {
         state.sourcePrefixes = state.sourcePrefixes.concat(sourcePrefix);
       }
+      if (locale && !state.loadedLocales.includes(locale)) {
+        state.loadedLocales = state.loadedLocales.concat(locale);
+      }
+      if (keys) {
+        state.loadedKeys = state.loadedKeys.concat(keys);
+      }
+      state.lastChange = TranslatorContext.context.lastChange;
     },
   },
 });
 
-export const { updateLocale, addTranslationSourcePrefix, loaded } = LocaleSlice.actions;
+export const { updateLocale, loaded } = LocaleSlice.actions;
 
 // Reducer
 export default LocaleSlice.reducer;

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

@@ -36,7 +36,7 @@ const { DefinePlugin } = require('webpack');
         },
 <%_ } _%>
         shared: {
-          ...Object.fromEntries(Object.entries(packageJson.dependencies).map(([module]) => ([module, { singleton: true, shareScope: 'default' }]))),
+          ...Object.fromEntries(Object.entries(packageJson.dependencies).map(([module, version]) => ([module, { requiredVersion: version, singleton: true, shareScope: 'default' }]))),
           'app/config/constants': {
             singleton: true,
             import: 'app/config/constants',

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

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "6.1.2",
-    "@fortawesome/free-solid-svg-icons": "6.1.2",
+    "@fortawesome/fontawesome-svg-core": "6.2.0",
+    "@fortawesome/free-solid-svg-icons": "6.2.0",
     "@fortawesome/vue-fontawesome": "2.0.8",
     "axios": "0.27.2",
     "bootstrap": "4.6.2",
@@ -11,7 +11,7 @@
     "vue-class-component": "7.2.6",
     "vue-cookie": "1.1.4",
     "vue-infinite-loading": "2.4.5",
-    "vue-router": "3.5.4",
+    "vue-router": "3.6.4",
     "vue-i18n": "8.27.2",
     "vue-property-decorator": "9.1.2",
     "vuelidate": "0.7.7",
@@ -20,15 +20,15 @@
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "1.1.4",
-    "@types/jest": "28.1.6",
-    "@types/node": "16.11.47",
+    "@types/jest": "28.1.8",
+    "@types/node": "16.11.56",
     "@types/sinon": "10.0.13",
     "@types/vuelidate": "0.7.15",
     "@vue/eslint-config-prettier": "7.0.0",
     "@vue/eslint-config-typescript": "10.0.0",
-    "@vue/vue2-jest": "28.0.1",
+    "@vue/vue2-jest": "28.1.0",
     "@vue/test-utils": "1.3.0",
-    "axios-mock-adapter": "1.21.1",
+    "axios-mock-adapter": "1.21.2",
     "autoprefixer": "10.4.8",
     "browser-sync-webpack-plugin": "2.3.0",
     "copy-webpack-plugin": "11.0.0",
@@ -39,31 +39,31 @@
     "html-webpack-plugin": "5.5.0",
     "jest": "28.1.3",
     "jest-environment-jsdom": "28.1.3",
-    "jest-junit": "14.0.0",
+    "jest-junit": "14.0.1",
     "jest-serializer-vue": "2.0.2",
-    "jest-sonar-reporter": "2.0.0",
+    "jest-sonar": "0.2.12",
     "jest-vue-preprocessor": "1.7.1",
     "merge-jsons-webpack-plugin": "2.0.1",
     "mini-css-extract-plugin": "2.6.1",
     "numeral": "2.0.6",
-    "postcss-import": "14.1.0",
+    "postcss-import": "15.0.0",
     "postcss-loader": "7.0.1",
     "postcss-url": "10.1.3",
     "rimraf": "3.0.2",
-    "sass": "1.54.1",
+    "sass": "1.54.8",
     "sass-loader": "13.0.2",
     "sinon": "14.0.0",
-    "terser-webpack-plugin": "5.3.3",
-    "ts-jest": "28.0.7",
+    "terser-webpack-plugin": "5.3.6",
+    "ts-jest": "28.0.8",
     "ts-loader": "9.3.1",
-    "eslint": "8.21.0",
+    "eslint": "8.23.0",
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-vue": "8.7.1",
-    "typescript": "4.7.4",
+    "typescript": "4.8.2",
     "webpack": "5.74.0",
-    "webpack-bundle-analyzer": "4.5.0",
+    "webpack-bundle-analyzer": "4.6.1",
     "webpack-cli": "4.10.0",
-    "webpack-dev-server": "4.9.3",
+    "webpack-dev-server": "4.10.1",
     "webpack-merge": "5.8.0",
     "workbox-webpack-plugin": "6.5.4",
     "vue-jest": "3.0.7",