generator-jhipster 7.4.1 → 7.5.0

package/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.ts.ejs

@@ -18,7 +18,7 @@
 -%>
 import { Pipe, PipeTransform } from '@angular/core';
 
-import * as dayjs from 'dayjs';
+import dayjs from 'dayjs/esm';
 
 @Pipe({
   name: 'formatMediumDate',

package/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import * as dayjs from 'dayjs';
+import dayjs from 'dayjs/esm';
 
 import { FormatMediumDatetimePipe } from './format-medium-datetime.pipe';
 

package/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts.ejs

@@ -18,7 +18,7 @@
 -%>
 import { Pipe, PipeTransform } from '@angular/core';
 
-import * as dayjs from 'dayjs';
+import dayjs from 'dayjs/esm';
 
 @Pipe({
   name: 'formatMediumDatetime',

package/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.ts.ejs

@@ -33,7 +33,7 @@ export class TranslateDirective implements OnChanges, OnInit, OnDestroy {
   @Input() <%= jhiPrefix %>Translate!: string;
   @Input() translateValues?: { [key: string]: unknown };
 
-  private readonly directiveDestroyed = new Subject<never>();
+  private readonly directiveDestroyed = new Subject();
 
   constructor(private el: ElementRef, private translateService: TranslateService) {}
 
@@ -51,7 +51,7 @@ export class TranslateDirective implements OnChanges, OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
-    this.directiveDestroyed.next();
+    this.directiveDestroyed.next(null);
     this.directiveDestroyed.complete();
   }
 
@@ -59,11 +59,11 @@ export class TranslateDirective implements OnChanges, OnInit, OnDestroy {
     this.translateService
       .get(this.<%= jhiPrefix %>Translate, this.translateValues)
       .pipe(takeUntil(this.directiveDestroyed))
-      .subscribe(
-        value => {
+      .subscribe({
+        next: value => {
           this.el.nativeElement.innerHTML = value;
         },
-        () => `${translationNotFoundMessage}[${this.<%= jhiPrefix %>Translate}]`
-      );
+        error: () => `${translationNotFoundMessage}[${this.<%= jhiPrefix %>Translate}]`
+      });
   }
 }

package/generators/client/templates/angular/src/main/webapp/app/shared/language/translation.module.ts.ejs

@@ -0,0 +1,83 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+import { NgModule } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { TranslateModule, TranslateService, TranslateLoader, MissingTranslationHandler } from '@ngx-translate/core';
+<%_ if (applicationTypeMicroservice) { _%>import { TranslateHttpLoader } from '@ngx-translate/http-loader';<%_ } _%>
+import { translatePartialLoader, missingTranslationHandler } from 'app/config/translation.config';
+import { SessionStorageService } from 'ngx-webstorage';
+
+<%_ if (applicationTypeMicroservice) { _%>
+function lazyTranslatePartialLoader(http: HttpClient): TranslateLoader {
+  return new TranslateHttpLoader(http, 'services/<%= lowercaseBaseName %>/i18n/', `.json?_=${I18N_HASH}`);
+}
+
+@NgModule({
+  imports: [
+    TranslateModule.forChild({
+      loader: {
+        provide: TranslateLoader,
+        useFactory: (lazyTranslatePartialLoader),
+        deps: [HttpClient]
+      },
+      isolate: false,
+      extend: true,
+    }),
+  ],
+})
+export class LazyTranslationModule {
+  constructor(
+    private translateService: TranslateService,
+    private translateLoader: TranslateLoader,
+    sessionStorageService: SessionStorageService
+  ) {
+    const currentLang = translateService.store.currentLang;
+    this.translateLoader.getTranslation(currentLang).subscribe(translation => {
+      this.translateService.setTranslation(currentLang, translation);
+    });
+  }
+}
+<%_ } _%>
+
+@NgModule({
+  imports: [
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useFactory: translatePartialLoader,
+        deps: [HttpClient],
+      },
+      missingTranslationHandler: {
+        provide: MissingTranslationHandler,
+        useFactory: missingTranslationHandler,
+      },
+    }),
+  ],
+})
+export class TranslationModule {
+  constructor(
+    private translateService: TranslateService,
+    sessionStorageService: SessionStorageService
+  ) {
+    translateService.setDefaultLang('<%= nativeLanguage %>');
+    // if user have changed language and navigates away from the application and back to the application then use previously choosed language
+    const langKey = sessionStorageService.retrieve('locale') ?? '<%= nativeLanguage %>';
+    translateService.use(langKey);
+  }
+}

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

@@ -4,9 +4,23 @@ declare const I18N_HASH: string;
 <%_ } _%>
 <%_ if (applicationTypeGateway && microfrontend) { _%>
 
-    <%_ for (const entity of Object.values(this.configOptions.sharedEntities).filter(entity => entity.microserviceName)) { _%>
+  <%_ for (const remote of microfrontends) { _%>
+declare module '<%= remote.lowercaseBaseName %>/entity-routing' {
+  export class EntityRoutingModule {}
+}
+declare module '<%= remote.lowercaseBaseName %>/entity-navbar-items' {
+  export const EntityNavbarItems : []
+}
+<%_ if (enableTranslation) { _%>
+declare module '<%= remote.lowercaseBaseName %>/translation-module' {
+  export class LazyTranslationModule {}
+}
+<%_ } _%>
+
+  <%_ } _%>
+  <%_ for (const entity of Object.values(this.configOptions.sharedEntities).filter(entity => entity.microserviceName)) { _%>
 declare module '<%= entity.microserviceName %>/<%= entity.entityFileName %>' {
   export class <%= entity.microserviceName ? upperFirstCamelCase(entity.microserviceName) : '' %><%= entity.entityAngularName %>Module {}
 }
-    <%_ } _%>
+  <%_ } _%>
 <%_ } _%>

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

@@ -33,6 +33,8 @@
     "experimentalDecorators": true,
     "moduleResolution": "node",
     "importHelpers": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
     "target": "es2017",
     "module": "es2020",
     "lib": ["es2018", "dom"]

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

@@ -19,7 +19,6 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "emitDecoratorMetadata": true,
     "outDir": "<%= BUILD_DIR %>out-tsc/spec",
     "types": ["jest", "node"]
   },

package/generators/client/templates/angular/webpack/proxy.conf.js.ejs

@@ -23,8 +23,6 @@ function setupProxy({ tls }) {
         '/api',
         '/services',
         '/management',
-        '/swagger-resources',
-        '/v2/api-docs',
         '/v3/api-docs',
         '/h2-console',
 <%_ if (authenticationTypeOauth2) { _%>

package/generators/client/templates/angular/webpack/webpack.custom.js.ejs

@@ -42,22 +42,6 @@ module.exports = async (config, options, targetOptions) => {
   });
 
 <%_ } _%>
-  config.cache = {
-    // 1. Set cache type to filesystem
-    type: 'filesystem',
-    cacheDirectory: path.resolve(__dirname, '../<%= buildDir %>webpack'),
-    buildDependencies: {
-      // 2. Add your config as buildDependency to get cache invalidation on config change
-      config: [
-        __filename,
-        path.resolve(__dirname, 'webpack.custom.js'),
-        path.resolve(__dirname, '../angular.json'),
-        path.resolve(__dirname, '../tsconfig.app.json'),
-        path.resolve(__dirname, '../tsconfig.json')
-      ],
-    },
-  };
-
   // PLUGINS
   if (config.mode === 'development') {
     config.plugins.push(

package/generators/client/templates/angular/webpack/webpack.microfrontend.js.ejs

@@ -28,16 +28,21 @@ module.exports = (config, options, targetOptions) => {
         name: '<%= lowercaseBaseName %>',
         filename: 'remoteEntry.js',
         exposes: {
-    <%_ for (entity of Object.values(this.configOptions.sharedEntities || {}).filter(e => e.microserviceName)) { _%>
+  <%_ if (enableTranslation) { _%>
+          './translation-module': 'app/shared/language/translation.module.ts',
+  <%_ } _%>
+          './entity-navbar-items': 'app/entities/entity-navbar-items.ts',
+          './entity-routing': 'app/entities/entity-routing.module.ts',
+  <%_ for (entity of Object.values(this.configOptions.sharedEntities || {}).filter(e => e.microserviceName)) { _%>
           './<%= entity.entityFileName %>': 'app/entities/<%= entity.entityFolderName %>/<%= entity.entityFileName %>.module.ts',
-    <%_ } _%>
+  <%_ } _%>
         },
 <%_ } _%>
 <%_ if (applicationTypeGateway) { _%>
         remotes: {
-          <%_ for ([microserviceName, microserviceConfig] of Object.entries(jhipsterConfig.applications || {})) { _%>
-          '<%= microserviceName %>': `<%= microserviceName %>@${targetOptions.target !== 'serve' ? '/services/<%= microserviceName %>' : 'http://localhost:<%= microserviceConfig.applicationIndex + devServerBasePort %>'}/remoteEntry.js`,
-          <%_ } _%>
+  <%_ for (const remote of microfrontends) { _%>
+          '<%= remote.lowercaseBaseName %>': `<%= remote.lowercaseBaseName %>@/<%= remote.endpointPrefix %>/remoteEntry.js`,
+  <%_ } _%>
         },
 <%_ } _%>
         shared: {
@@ -141,6 +146,8 @@ module.exports = (config, options, targetOptions) => {
     ],
     output: {
       publicPath: 'auto',
+      uniqueName: '<%= lowercaseBaseName %>',
+      scriptType: 'text/javascript',
     },
     optimization: {
       runtimeChunk: false,

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

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

package/generators/client/templates/common/src/main/webapp/robots.txt.ejs

@@ -27,5 +27,4 @@ Disallow: /api/account/sessions
 Disallow: /api/logs/
 Disallow: /api/users/
 Disallow: /management/
-Disallow: /v2/api-docs/
 Disallow: /v3/api-docs/

package/generators/client/templates/common/src/main/webapp/swagger-ui/index.html.ejs

@@ -48,7 +48,8 @@
           },
         };
       };
-      window.onload = function () {
+
+      window.onload = async function () {
 <%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>
         function getCSRF() {
           var name = 'XSRF-TOKEN=';
@@ -60,14 +61,66 @@
           }
           return '';
         }
+        const axiosConfig = { timeout: 5000 };
+<%_ } else { _%>
+        const getBearerToken = () => {
+          var authToken = localStorage.getItem('jhi-authenticationToken') || sessionStorage.getItem('jhi-authenticationToken');
+          if (authToken) {
+<%_ if (clientFrameworkAngular || clientFrameworkReact) { _%>
+            authToken = JSON.parse(authToken);
+<%_ } _%>
+            return `Bearer ${authToken}`;
+          }
+          return null;
+        };
+        const axiosConfig = {
+          headers: { timeout: 5000, Authorization: getBearerToken() },
+        };
 <%_ } _%>
 
-        var urls = [];
-        axios.get('/swagger-resources').then(function (response) {
-          response.data.forEach(function (resource) {
-            urls.push({ name: resource.name, url: resource.location });
-          });
+        const baseUrl = '/v3/api-docs';
+        let services;
+        try {
+          const response = await axios.get('/management/health/discoveryComposite', axiosConfig);
+          services = response.data?.components?.discoveryClient?.details?.services;
+          console.log(`Services`, services);
+        } catch (error) {
+          console.log(error);
+        }
+
+        let urls;
+        try {
+          if (services && services.length > 0) {
+            urls = (
+              await Promise.allSettled(
+                services.map(async service => {
+                  const response = await axios.get(`/services/${service}/management/jhiopenapigroups`, axiosConfig);
+                  if (Array.isArray(response.data)) {
+                    return response.data.map(({ group, description }) => ({
+                      name: description,
+                      url: `/services/${service}${baseUrl}/${group}`,
+                    }));
+                  }
+                  return undefined;
+                })
+              )
+            )
+              .filter(settled => settled.status === 'fulfilled')
+              .map(settled => settled.value)
+              .filter(Array.isArray)
+              .flat();
+          } else {
+            const response = await axios.get('/management/jhiopenapigroups', axiosConfig);
+            if (Array.isArray(response.data)) {
+              urls = response.data.map(({ group, description }) => ({ name: description, url: `${baseUrl}/${group}` }));
+            }
+          }
+          console.log(`Swagger urls`, urls);
+        } catch (error) {
+          console.log(error);
+        }
 
+        if (urls) {
           urls.sort(function (a, b) {
             var x = a.name.toLowerCase(),
               y = b.name.toLowerCase();
@@ -77,60 +130,37 @@
             if (y.includes('(management)')) return 1;
             return x < y ? -1 : x > y ? 1 : 0;
           });
+        }
 
-          // Build a system
-          var ui = SwaggerUIBundle({
-            urls: urls,
-            dom_id: '#swagger-ui',
-            deepLinking: true,
-            filter: true,
-            layout: 'StandaloneLayout',
-            withCredentials: true,
-            presets: [
-              SwaggerUIBundle.presets.apis,
-              SwaggerUIStandalonePreset
-            ],
-            plugins: [
-              SwaggerUIBundle.plugins.DownloadUrl,
-              AlwaysEnableTryItOutPlugin
-            ],
+        // Build a system
+        var ui = SwaggerUIBundle({
+          urls: urls,
+          url: baseUrl,
+          dom_id: '#swagger-ui',
+          deepLinking: true,
+          filter: true,
+          layout: 'StandaloneLayout',
+          withCredentials: true,
+          presets: [SwaggerUIBundle.presets.apis, SwaggerUIStandalonePreset],
+          plugins: [SwaggerUIBundle.plugins.DownloadUrl, AlwaysEnableTryItOutPlugin],
+          requestInterceptor: function (req) {
 <%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>
-            requestInterceptor: function(req) {
-              req.headers['X-XSRF-TOKEN'] = getCSRF();
-              // Remove the sample Swagger UI request body if present
-              if (
-                req.method === 'GET' &&
-                req.body === '{"additionalProp1":"string","additionalProp2":"string","additionalProp3":"string"}'
-              ) {
-                req.body = undefined;
-              }
-              return req;
-            },
-<%_ } _%>
-<%_ if (authenticationTypeJwt) { _%>
-            requestInterceptor: function (req) {
-              var authToken =
-                localStorage.getItem('<%= jhiPrefixDashed %>-authenticationToken') || sessionStorage.getItem('<%= jhiPrefixDashed %>-authenticationToken');
-              if (authToken) {
-<%_ if (clientFrameworkAngular || clientFrameworkReact) { _%>
-                authToken = JSON.parse(authToken);
-<%_ } _%>
-                req.headers['Authorization'] = 'Bearer ' + authToken;
-              }
-              // Remove the sample Swagger UI request body if present
-              if (
-                req.method === 'GET' &&
-                req.body === '{"additionalProp1":"string","additionalProp2":"string","additionalProp3":"string"}'
-              ) {
-                req.body = undefined;
-              }
-              return req;
-            },
+            req.headers['X-XSRF-TOKEN'] = getCSRF();
+<%_ } else { _%>
+            req.headers['Authorization'] = getBearerToken();
 <%_ } _%>
-          });
-
-          window.ui = ui;
+            // Remove the sample Swagger UI request body if present
+            if (
+              req.method === 'GET' &&
+              req.body === '{"additionalProp1":"string","additionalProp2":"string","additionalProp3":"string"}'
+            ) {
+              req.body = undefined;
+            }
+            return req;
+          },
         });
+
+        window.ui = ui;
       };
     </script>
   </body>

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

@@ -3,7 +3,7 @@
     "@fortawesome/fontawesome-svg-core": "1.2.36",
     "@fortawesome/free-solid-svg-icons": "5.15.4",
     "@fortawesome/react-fontawesome": "0.1.16",
-    "@reduxjs/toolkit": "1.6.2",
+    "@reduxjs/toolkit": "1.7.1",
     "axios": "0.24.0",
     "bootstrap": "5.1.3",
     "bootswatch": "5.1.3",
@@ -11,7 +11,7 @@
     "path-browserify": "1.0.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "react-hook-form": "7.20.5",
+    "react-hook-form": "7.22.5",
     "react-jhipster": "0.18.0",
     "react-loadable": "5.5.0",
     "react-redux": "7.2.6",
@@ -28,62 +28,62 @@
   },
   "devDependencies": {
     "@testing-library/react": "12.1.2",
-    "@types/jest": "27.0.3",
-    "@types/lodash": "4.14.177",
-    "@types/node": "16.11.11",
-    "@types/react": "17.0.37",
+    "@types/jest": "27.4.0",
+    "@types/lodash": "4.14.178",
+    "@types/node": "16.11.17",
+    "@types/react": "17.0.38",
     "@types/react-dom": "17.0.11",
-    "@types/react-redux": "7.1.20",
+    "@types/react-redux": "7.1.21",
     "@types/react-router-dom": "5.3.2",
     "@types/redux": "3.6.31",
     "@types/webpack-env": "1.16.3",
-    "@typescript-eslint/eslint-plugin": "5.5.0",
-    "@typescript-eslint/parser": "5.5.0",
-    "autoprefixer": "10.4.0",
+    "@typescript-eslint/eslint-plugin": "5.8.1",
+    "@typescript-eslint/parser": "5.8.1",
+    "autoprefixer": "10.4.1",
     "browser-sync": "2.27.7",
     "browser-sync-webpack-plugin": "2.3.0",
-    "copy-webpack-plugin": "10.0.0",
-    "core-js": "3.19.2",
+    "copy-webpack-plugin": "10.2.0",
+    "core-js": "3.20.1",
     "cross-env": "7.0.3",
     "css-loader": "6.5.1",
-    "css-minimizer-webpack-plugin": "3.2.0",
-    "eslint": "8.3.0",
+    "css-minimizer-webpack-plugin": "3.3.1",
+    "eslint": "8.5.0",
     "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-react": "7.27.1",
+    "eslint-plugin-react": "7.28.0",
     "eslint-webpack-plugin": "3.1.1",
     "folder-hash": "4.0.1",
     "fork-ts-checker-webpack-plugin": "6.5.0",
     "html-webpack-plugin": "5.5.0",
     "identity-obj-proxy": "3.0.0",
-    "jest": "27.4.3",
+    "jest": "27.4.5",
     "jest-junit": "13.0.0",
     "jest-sonar-reporter": "2.0.0",
     "json-loader": "0.5.7",
     "merge-jsons-webpack-plugin": "2.0.1",
     "mini-css-extract-plugin": "2.4.5",
     "postcss-loader": "6.2.1",
-    "postcss-rtlcss": "3.5.0",
+    "postcss-rtlcss": "3.5.1",
     "react-infinite-scroll-component": "6.1.0",
     "redux-mock-store": "1.5.4",
     "rimraf": "3.0.2",
-    "sass": "1.44.0",
-    "sass-loader": "12.3.0",
+    "sass": "1.45.2",
+    "sass-loader": "12.4.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.2",
-    "terser-webpack-plugin": "5.2.5",
+    "swagger-ui-dist": "4.1.3",
+    "terser-webpack-plugin": "5.3.0",
     "thread-loader": "3.0.4",
-    "ts-jest": "27.0.7",
+    "ts-jest": "27.1.2",
     "ts-loader": "9.2.6",
-    "typescript": "4.5.2",
-    "webpack": "5.64.4",
+    "typescript": "4.5.4",
+    "webpack": "5.65.0",
     "webpack-cli": "4.9.1",
-    "webpack-dev-server": "4.6.0",
+    "webpack-dev-server": "4.7.2",
     "webpack-merge": "5.8.0",
-    "webpack-notifier": "1.14.1",
-    "workbox-webpack-plugin": "6.4.1"
+    "webpack-notifier": "1.15.0",
+    "workbox-webpack-plugin": "6.4.2"
   }
 }

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

@@ -179,6 +179,8 @@
     "lint:fix": "<%= clientPackageManager %> run lint -- --fix",
     "cleanup": "rimraf <%= DIST_DIR %>",
     "clean-www": "rimraf <%= DIST_DIR %>app/{src,<%= BUILD_DIR %>}",
+    "build": "<%= clientPackageManager %> run webapp:prod --",
+    "build-watch": "concurrently 'npm run webapp:build:dev -- --watch'<% if(!skipServer) { %> npm:backend:start<% } %>",
 <%_ if (protractorTests && !cypressTests) { _%>
     "e2e": "<%= clientPackageManager %> run e2e:protractor --",
     "e2e:headless": "<%= clientPackageManager %> run e2e:protractor:headless --",

package/generators/client/templates/react/src/main/webapp/app/config/axios-interceptor.spec.ts.ejs

@@ -36,13 +36,14 @@ describe('Axios Interceptor', () => {
       expect((client.interceptors.response as any).handlers[0].fulfilled({ data: 'foo' })).toEqual({ data: 'foo' });
     });
     it('onResponseError is called on rejected response', () => {
-      (client.interceptors.response as any).handlers[0].rejected({
+      const rejectError = {
         response: {
           statusText: 'NotFound',
           status: 403,
           data: { message: 'Page not found' }
         }
-      });
+      };
+      expect((client.interceptors.response as any).handlers[0].rejected(rejectError)).rejects.toEqual(rejectError);
       expect(onUnauthenticated.calledOnce).toBe(true);
     });
   });

package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.scss.ejs

@@ -95,6 +95,15 @@ Navbar styles
   }
 }
 <%_ } _%>
+.navbar-brand {
+  overflow: hidden;
+}
+
+.jh-navbar .navbar-nav .nav-link {
+  padding-right: 0;
+  padding-left: 0;
+}
+
 .navbar-version {
   font-size: 10px;
   color: $header-color-secondary;

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

@@ -89,7 +89,7 @@ const Header = (props: IHeaderProps) => {
     <div id="app-header">
       {renderDevRibbon()}
       <LoadingBar className="loading-bar"/>
-      <Navbar data-cy="navbar" <% if (clientThemeNone || !clientThemeLight) { %>dark<% } else { %>light<% } %> expand="sm" fixed="top" className="<%_ if (clientThemeNone) { _%>jh-navbar<%_ } else { _%>bg-<%= clientThemeVariant %><%_ } _%>">
+      <Navbar data-cy="navbar" <% if (clientThemeNone || !clientThemeLight) { %>dark<% } else { %>light<% } %> expand="md" fixed="top" className="<%_ if (clientThemeNone) { _%>jh-navbar<%_ } else { _%>bg-<%= clientThemeVariant %><%_ } _%>">
         <NavbarToggler aria-label="Menu" onClick={toggleMenu} />
         <Brand />
         <Collapse isOpen={menuOpen} navbar>

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

@@ -218,7 +218,7 @@ describe('Authentication reducer tests', () => {
           type: getAccount.fulfilled.type,
           payload: resolvedObject
         },
-        updateLocale('en'),
+        updateLocale('<%= nativeLanguage %>'),
         <%_ } _%>
       ];
       await store.dispatch(getSession());

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

@@ -82,8 +82,6 @@ module.exports = async (options) => webpackMerge(await commonConfig({ env: ENV }
         '/api',
         '/services',
         '/management',
-        '/swagger-resources',
-        '/v2/api-docs',
         '/v3/api-docs',
         '/h2-console',<% if (authenticationTypeOauth2) { %>
         '/oauth2',