generator-jhipster 7.6.0 → 7.8.1

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

@@ -18,8 +18,16 @@
 -%>
 {
   "extends": "./tsconfig",
+  "include": ["<%= MAIN_SRC_DIR %>app", "<%= MAIN_SRC_DIR %>microfrontend"],
   "compilerOptions": {
-    "module": "commonjs",
+    "paths": {
+<%_ if (microfrontend && applicationTypeGateway) { _%>
+  <%_ for (const remote of microfrontends) { _%>
+      "@<%= remote.lowercaseBaseName %>/*": ["<%= CLIENT_MAIN_SRC_DIR %>microfrontends/*"],
+  <%_ } _%>
+<%_ } _%>
+      "app/*": ["<%= CLIENT_MAIN_SRC_DIR %>app/*"]
+   },
     "types": ["jest", "webpack-env"]
   }
 }

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

@@ -113,17 +113,6 @@ return merge(
   stats: {
     children: false
   },
-  optimization: {
-    splitChunks: {
-      cacheGroups: {
-        commons: {
-          test: /[\\/]node_modules[\\/]/,
-          name: 'vendors',
-          chunks: 'all'
-        }
-      }
-    }
-  },
   plugins: [
     new webpack.EnvironmentPlugin({
       // react-jhipster requires LOG_LEVEL config.
@@ -145,12 +134,16 @@ return merge(
       patterns: [
 <%_ if (applicationTypeGateway || applicationTypeMonolith) { _%>
         {
-          context: './node_modules/swagger-ui-dist/',
+          // https://github.com/swagger-api/swagger-ui/blob/v4.6.1/swagger-ui-dist-package/README.md
+          context: require('swagger-ui-dist').getAbsoluteFSPath(),
           from: '*.{js,css,html,png}',
           to: 'swagger-ui/',
           globOptions: { ignore: ['**/index.html'] },
         },
-        { from: './node_modules/axios/dist/axios.min.js', to: 'swagger-ui/' },
+        {
+          from: require.resolve('axios/dist/axios.min.js'), 
+          to: 'swagger-ui/',
+        },
         { from: './<%= MAIN_SRC_DIR %>swagger-ui/', to: 'swagger-ui/' },
 <%_ } _%>
         { from: './<%= MAIN_SRC_DIR %>content/', to: 'content/' },

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

@@ -36,12 +36,12 @@ module.exports = async (options) => webpackMerge(await commonConfig({ env: ENV }
   devtool: 'cheap-module-source-map', // https://reactjs.org/docs/cross-origin-errors.html
   mode: ENV,
   entry: [
-    './<%= CLIENT_MAIN_SRC_DIR %>app/index'
+    './<%= CLIENT_MAIN_SRC_DIR %>app/<%= microfrontend ? 'main' : 'index' %>'
   ],
   output: {
     path: utils.root('<%= DIST_DIR %>'),
-    filename: 'app/[name].bundle.js',
-    chunkFilename: 'app/[id].chunk.js'
+    filename: '[name].[contenthash:8].js',
+    chunkFilename: '[name].[chunkhash:8].chunk.js'
   },
   optimization: {
     moduleIds: 'named',
@@ -72,7 +72,7 @@ module.exports = async (options) => webpackMerge(await commonConfig({ env: ENV }
     ]
   },
   devServer: {
-    hot: true,
+    hot: <%= !microfrontend %>,
     static: {
       directory: './<%= DIST_DIR %>',
     },
@@ -88,14 +88,14 @@ module.exports = async (options) => webpackMerge(await commonConfig({ env: ENV }
         '/login',<% } %>
         '/auth'
       ],
-      target: `http${options.tls ? 's' : ''}://localhost:<%= serverPort %>`,
+      target: `http${options.tls ? 's' : ''}://localhost:<%= applicationTypeMicroservice ? gatewayServerPort : serverPort %>`,
       secure: false,
       changeOrigin: options.tls
     }<% if (communicationSpringWebsocket) { %>,{
       context: [
         '/websocket'
       ],
-      target: 'ws://127.0.0.1:<%= serverPort %>',
+      target: 'ws://127.0.0.1:<%= applicationTypeMicroservice ? gatewayServerPort : serverPort %>',
       ws: true
     }<% } %>],
     https: options.tls,
@@ -114,7 +114,7 @@ module.exports = async (options) => webpackMerge(await commonConfig({ env: ENV }
         host: 'localhost',
         port: 9000,
         proxy: {
-          target: `http${options.tls ? 's' : ''}://localhost:<%= devServerPort %>`,
+          target: `http${options.tls ? 's' : ''}://localhost:${options.watch ? '<%= this.applicationTypeMicroservice ? gatewayServerPort : serverPort %>' : '<%= devServerPort %>'}`,
           ws: true,
           proxyOptions: {
               changeOrigin: false  //pass the Host header to the backend unchanged  https://github.com/Browsersync/browser-sync/issues/430
@@ -135,7 +135,6 @@ module.exports = async (options) => webpackMerge(await commonConfig({ env: ENV }
     }, {
       reload: false
     }),
-    new webpack.HotModuleReplacementPlugin(),
     new WebpackNotifierPlugin({
       title: '<%= humanizedBaseName %>',
       contentImage: path.join(__dirname, 'logo-jhipster.png')

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

@@ -0,0 +1,99 @@
+<%#
+ 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.
+-%>
+<&_ if (fragment.importsSection) { -&>
+<%_ if (applicationTypeMicroservice) { _%>
+const { DefinePlugin } = require('webpack');
+<%_ } _%>
+<&_ } -&>
+<&_ if (fragment.moduleFederationSection) { -&>
+<%_ if (applicationTypeGateway) { _%>
+        remotes: {
+  <%_ for (const remote of remotes) { _%>
+          '@<%= remote.lowercaseBaseName %>': `<%= remote.lowercaseBaseName %>@/<%= remote.endpointPrefix %>/remoteEntry.js`,
+  <%_ } _%>
+        },
+<%_ } _%>
+<%_ if (applicationTypeMicroservice) { _%>
+        exposes: {
+          './entities-menu': './<%= CLIENT_MAIN_SRC_DIR %>app/entities/menu',
+          './entities-routes': './<%= CLIENT_MAIN_SRC_DIR %>app/entities/routes',
+        },
+<%_ } _%>
+        shared: {
+          ...Object.fromEntries(Object.entries(packageJson.dependencies).map(([module]) => ([module, { singleton: true, shareScope: 'default' }]))),
+          'app/config/constants': {
+            singleton: true,
+            import: 'app/config/constants',
+            requiredVersion: appVersion,
+          },
+          'app/config/store': {
+            singleton: true,
+            import: 'app/config/store',
+            requiredVersion: appVersion,
+          },
+          'app/shared/error/error-boundary-route': {
+            singleton: true,
+            import: 'app/shared/error/error-boundary-route',
+            requiredVersion: appVersion,
+          },
+          'app/shared/layout/menus/menu-components': {
+            singleton: true,
+            import: 'app/shared/layout/menus/menu-components',
+            requiredVersion: appVersion,
+          },
+          'app/shared/layout/menus/menu-item': {
+            singleton: true,
+            import: 'app/shared/layout/menus/menu-item',
+            requiredVersion: appVersion,
+          },
+          'app/shared/reducers': {
+            singleton: true,
+            import: 'app/shared/reducers',
+            requiredVersion: appVersion,
+          },
+          'app/shared/reducers/locale': {
+            singleton: true,
+            import: 'app/shared/reducers/locale',
+            requiredVersion: appVersion,
+          },
+          'app/shared/reducers/reducer.utils': {
+            singleton: true,
+            import: 'app/shared/reducers/reducer.utils',
+            requiredVersion: appVersion,
+          },
+          'app/shared/util/date-utils': {
+            singleton: true,
+            import: 'app/shared/util/date-utils',
+            requiredVersion: appVersion,
+          },
+          'app/shared/util/entity-utils': {
+            singleton: true,
+            import: 'app/shared/util/entity-utils',
+            requiredVersion: appVersion,
+          },
+        },
+<&_ } -&>
+<&_ if (fragment.pluginsSection) { -&>
+<%_ if (applicationTypeMicroservice) { _%>
+      new DefinePlugin({
+        <%= _.upperCase(baseName) %>_I18N_RESOURCES_PREFIX: JSON.stringify(''),
+      }),
+<%_ } _%>
+<&_ } -&>
+

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

@@ -36,12 +36,12 @@ module.exports = async () => webpackMerge(await commonConfig({ env: ENV }), {
   // devtool: 'source-map', // Enable source maps. Please note that this will slow down the build
   mode: ENV,
   entry: {
-    main: './<%= MAIN_SRC_DIR %>app/index'
+    main: './<%= MAIN_SRC_DIR %>app/<%= microfrontend ? 'main' : 'index' %>'
   },
   output: {
     path: utils.root('<%= DIST_DIR %>'),
-    filename: 'app/[name].[contenthash].bundle.js',
-    chunkFilename: 'app/[name].[chunkhash].chunk.js'
+    filename: '[name].[contenthash:8].js',
+    chunkFilename: '[name].[chunkhash:8].chunk.js'
   },
   module: {
     rules: [
@@ -77,30 +77,40 @@ module.exports = async () => webpackMerge(await commonConfig({ env: ENV }), {
     runtimeChunk: false,
     minimizer: [
       new TerserPlugin({
-        parallel: true,
-        // sourceMap: true, // Enable source maps. Please note that this will slow down the build
         terserOptions: {
-          ecma: 6,
-          toplevel: true,
-          module: true,
+          parse: {
+            // We want terser to parse ecma 8 code. However, we don't want it
+            // to apply any minification steps that turns valid ecma 5 code
+            // into invalid ecma 5 code. This is why the 'compress' and 'output'
+            // sections only apply transformations that are ecma 5 safe
+            // https://github.com/facebook/create-react-app/pull/4234
+            ecma: 8,
+          },
           compress: {
+            ecma: 5,
             warnings: false,
-            ecma: 6,
-            module: true,
-            toplevel: true
+            // Disabled because of an issue with Uglify breaking seemingly valid code:
+            // https://github.com/facebook/create-react-app/issues/2376
+            // Pending further investigation:
+            // https://github.com/mishoo/UglifyJS2/issues/2011
+            comparisons: false,
+            // Disabled because of an issue with Terser breaking valid code:
+            // https://github.com/facebook/create-react-app/issues/5250
+            // Pending further investigation:
+            // https://github.com/terser-js/terser/issues/120
+            inline: 2,
+          },
+          mangle: {
+            safari10: true,
           },
           output: {
-              comments: false,
-              beautify: false,
-              indent_level: 2,
-              ecma: 6
+            ecma: 5,
+            comments: false,
+            // Turned on because emoji and regex is not minified properly using default
+            // https://github.com/facebook/create-react-app/issues/2488
+            ascii_only: true,
           },
-          mangle: {
-            keep_fnames: true,
-            module: true,
-            toplevel: true
-          }
-        }
+        },
       }),
       new CssMinimizerPlugin({
         parallel: true,

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

@@ -1,71 +1,70 @@
 {
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "1.2.36",
-    "@fortawesome/free-solid-svg-icons": "5.15.4",
+    "@fortawesome/fontawesome-svg-core": "6.1.1",
+    "@fortawesome/free-solid-svg-icons": "6.1.1",
     "@fortawesome/vue-fontawesome": "2.0.6",
-    "axios": "0.25.0",
+    "axios": "0.26.1",
     "bootstrap": "4.6.1",
     "bootstrap-vue": "2.21.2",
     "bootswatch": "5.1.3",
-    "swagger-ui-dist": "4.2.1",
     "vue": "2.6.14",
     "vue-class-component": "7.2.6",
     "vue-cookie": "1.1.4",
     "vue-infinite-loading": "2.4.5",
     "vue-router": "3.5.3",
-    "vue-i18n": "8.27.0",
+    "vue-i18n": "8.27.1",
     "vue-property-decorator": "9.1.2",
     "vuelidate": "0.7.7",
     "vuex": "3.6.2",
     "vue2-filters": "0.14.0"
   },
   "devDependencies": {
-    "@rushstack/eslint-patch": "1.1.0",
-    "@types/jest": "27.4.0",
-    "@types/node": "16.11.21",
-    "@types/sinon": "10.0.8",
+    "@rushstack/eslint-patch": "1.1.1",
+    "@types/jest": "27.4.1",
+    "@types/node": "16.11.26",
+    "@types/sinon": "10.0.11",
     "@types/vuelidate": "0.7.15",
     "@vue/eslint-config-prettier": "7.0.0",
     "@vue/eslint-config-typescript": "10.0.0",
     "@vue/vue2-jest": "27.0.0-alpha.3",
     "@vue/test-utils": "1.3.0",
     "axios-mock-adapter": "1.20.0",
-    "autoprefixer": "10.4.2",
+    "autoprefixer": "10.4.4",
     "browser-sync-webpack-plugin": "2.3.0",
-    "copy-webpack-plugin": "10.2.1",
-    "css-loader": "6.5.1",
+    "copy-webpack-plugin": "10.2.4",
+    "css-loader": "6.7.1",
     "css-minimizer-webpack-plugin": "3.4.1",
-    "folder-hash": "4.0.1",
-    "fork-ts-checker-webpack-plugin": "6.5.0",
+    "folder-hash": "4.0.2",
+    "fork-ts-checker-webpack-plugin": "7.2.3",
     "html-webpack-plugin": "5.5.0",
-    "jest": "27.4.7",
-    "jest-junit": "13.0.0",
+    "jest": "27.5.1",
+    "jest-junit": "13.1.0",
     "jest-serializer-vue": "2.0.2",
     "jest-sonar-reporter": "2.0.0",
     "jest-vue-preprocessor": "1.7.1",
     "merge-jsons-webpack-plugin": "2.0.1",
-    "mini-css-extract-plugin": "2.5.2",
+    "mini-css-extract-plugin": "2.6.0",
     "numeral": "2.0.6",
-    "postcss-import": "14.0.2",
+    "postcss-import": "14.1.0",
     "postcss-loader": "6.2.1",
     "postcss-url": "10.1.3",
     "rimraf": "3.0.2",
-    "sass": "1.49.0",
-    "sass-loader": "12.4.0",
-    "sinon": "12.0.1",
-    "terser-webpack-plugin": "5.3.0",
-    "ts-jest": "27.1.3",
-    "ts-loader": "9.2.6",
-    "eslint": "8.7.0",
+    "sass": "1.49.11",
+    "sass-loader": "12.6.0",
+    "sinon": "13.0.1",
+    "terser-webpack-plugin": "5.3.1",
+    "ts-jest": "27.1.4",
+    "ts-loader": "9.2.8",
+    "eslint": "8.12.0",
     "eslint-plugin-prettier": "4.0.0",
-    "eslint-plugin-vue": "8.3.0",
-    "typescript": "4.5.5",
-    "webpack": "5.66.0",
+    "eslint-plugin-vue": "8.5.0",
+    "typescript": "4.6.3",
+    "webpack": "5.71.0",
     "webpack-bundle-analyzer": "4.5.0",
-    "webpack-cli": "4.9.1",
-    "webpack-dev-server": "4.7.3",
+    "webpack-cli": "4.9.2",
+    "webpack-dev-server": "4.8.0",
     "webpack-merge": "5.8.0",
-    "workbox-webpack-plugin": "6.4.2",
+    "workbox-webpack-plugin": "6.5.2",
     "vue-jest": "3.0.7",
     "vue-loader": "15.9.8"
   }

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

@@ -36,7 +36,6 @@
     "bootswatch": "<%= dependabotPackageJson.dependencies['bootswatch'] %>",
 <%_ } _%>
     "dayjs": "<%= dependabotPackageJson.dependencies['dayjs'] %>",
-    "swagger-ui-dist": "<%= dependabotPackageJson.dependencies['swagger-ui-dist'] %>",
 <%_ if (communicationSpringWebsocket) { _%>
     "sockjs-client": "1.5.2",
     "@stomp/rx-stomp": "1.1.4",
@@ -115,6 +114,7 @@
     "sass": "<%= dependabotPackageJson.devDependencies['sass'] %>",
     "sass-loader": "<%= dependabotPackageJson.devDependencies['sass-loader'] %>",
     "sinon": "<%= dependabotPackageJson.devDependencies['sinon'] %>",
+    "swagger-ui-dist": "<%= dependabotPackageJson.devDependencies['swagger-ui-dist'] %>",
     "terser-webpack-plugin": "<%= dependabotPackageJson.devDependencies['terser-webpack-plugin'] %>",
     "ts-jest": "<%= dependabotPackageJson.devDependencies['ts-jest'] %>",
     "ts-loader": "<%= dependabotPackageJson.devDependencies['ts-loader'] %>",

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

@@ -27,7 +27,7 @@ export default class JhiNavbar extends Vue {
   public version = 'v' + VERSION;
   private currentLanguage = this.$store.getters.currentLanguage;
   private languages: any = this.$store.getters.languages;
-  private hasAnyAuthorityValue = false;
+  private hasAnyAuthorityValues = {};
 
   created() {
 <%_ if (enableTranslation) { _%>
@@ -58,6 +58,7 @@ export default class JhiNavbar extends Vue {
     return this.loginService().logout().then(response => {
       this.$store.commit('logout');
   <%_ if (authenticationTypeOauth2) { _%>
+      window.location.href = response.data.logoutUrl;
       const next = response.data?.logoutUrl ?? '/';
       if (this.$route.path !== next) {
         return this.$router.push(next);
@@ -93,9 +94,9 @@ export default class JhiNavbar extends Vue {
 
   public hasAnyAuthority(authorities: any): boolean {
     this.accountService().hasAnyAuthorityAndCheckAuth(authorities).then(value => {
-      this.hasAnyAuthorityValue = value;
+      this.hasAnyAuthorityValues[authorities] = value;
     });
-    return this.hasAnyAuthorityValue;
+    return this.hasAnyAuthorityValues[authorities] ?? false;
   }
 
   public get openAPIEnabled() : boolean {

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

@@ -2,6 +2,8 @@
 // (runtime-only or standalone) has been set in webpack.common with an alias.
 import Vue from 'vue';
 import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome';
+import { setupAxiosInterceptors } from '@/shared/config/axios-interceptor';
+
 import App from './app.vue';
 import Vue2Filters from 'vue2-filters';
 import { ToastPlugin } from 'bootstrap-vue';
@@ -93,7 +95,7 @@ router.beforeEach(async (to, from, next) => {
 });
 
 /* tslint:disable */
-new Vue({
+<% if (!authenticationTypeOauth2) { %>const vue = <% } %>new Vue({
   el: '#app',
   components: { App },
   template: '<App/>',
@@ -132,3 +134,29 @@ new Vue({
 <%_ } _%>
   store,
 });
+
+setupAxiosInterceptors(
+  error => {
+	const url = error.response?.config?.url;
+    const status = error.status || error.response.status;
+    if (status === 401) {
+      // Store logged out state.
+      store.commit('logout');
+      if (!url.endsWith('api/account') && !url.endsWith('api/<% if (authenticationTypeSession) { %>authentication<% } else { %>authenticate<% } %>')) {
+        // Ask for a new authentication
+<%_ if (authenticationTypeOauth2) { _%>
+        window.location.reload();
+<%_ } else { _%>
+        loginService.openLogin(vue);
+<%_ } _%>
+        return;
+      }
+    }
+    console.log('Unauthorized!');
+    return Promise.reject(error);
+  },
+  error => {
+    console.log('Server error!');
+    return Promise.reject(error);
+  }
+);

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

@@ -37,10 +37,10 @@ const setupAxiosInterceptors = (onUnauthenticated, onServerError) => {
   const onResponseError = err => {
     const status = err.status || err.response.status;
     if (status === 403 || status === 401) {
-      onUnauthenticated();
+      return onUnauthenticated(err);
     }
     if (status >= 500) {
-      onServerError();
+      return onServerError(err);
     }
     return Promise.reject(err);
   };

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

@@ -3,7 +3,6 @@ import Vuex from 'vuex';
 import VueI18n, { DateTimeFormats } from 'vue-i18n';
 import <%=jhiPrefixCapitalized%>Formatter from './formatter';
 <%_ } _%>
-import { setupAxiosInterceptors } from '@/shared/config/axios-interceptor';
 
 import { library } from '@fortawesome/fontawesome-svg-core';
 import { faArrowLeft } from '@fortawesome/free-solid-svg-icons/faArrowLeft';
@@ -64,9 +63,6 @@ export function initVueApp(vue) {
   vue.use(VueCookie);
   vue.use(Vuelidate);
   vue.use(Vue2Filters);
-  setupAxiosInterceptors(
-    () => console.log('Unauthorized!'),
-    () => console.log('Server error!'));
   filters.initFilters();
 }
 

package/generators/client/templates/vue/src/main/webapp/app/shared/data/data-utils.service.ts.ejs

@@ -67,7 +67,7 @@ export default class JhiDataUtils extends Vue {
     const fileReader = new FileReader();
     fileReader.readAsDataURL(file);
     fileReader.onload = (e: any) => {
-      const base64Data = e.target.result.substr(e.target.result.indexOf('base64,') + 'base64,'.length);
+      const base64Data = e.target.result.substring(e.target.result.indexOf('base64,') + 'base64,'.length);
       cb(base64Data);
     };
   }

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

@@ -1,4 +1,4 @@
-const { pathsToModuleNameMapper } = require('ts-jest/utils');
+const { pathsToModuleNameMapper } = require('ts-jest');
 const config = require('../../../webpack/config');
 const { compilerOptions: { paths = {}, baseUrl = './' } } = require('../../../tsconfig.json');
 
@@ -27,7 +27,7 @@ module.exports = {
   ],
   testResultsProcessor: 'jest-sonar-reporter',
   testMatch: ['<rootDir>/<%= CLIENT_TEST_SRC_DIR %>spec/**/@(*.)@(spec.ts)'],
-  snapshotSerializers: ['<rootDir>/node_modules/jest-serializer-vue'],
+  snapshotSerializers: ['jest-serializer-vue'],
   globals: {
 <%_ if (enableTranslation) { _%>
     I18N_HASH: 'generated_hash',

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

@@ -11,9 +11,6 @@
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "lib": ["es7", "dom"],
-        "typeRoots": [
-            "node_modules/@types"
-        ],
         "paths": {
             "@/*": ["*"]
         },

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

@@ -149,12 +149,16 @@ module.exports = async (env, options) => {
         new CopyWebpackPlugin({
           patterns: [
             {
-              context: './node_modules/swagger-ui-dist/',
+              // https://github.com/swagger-api/swagger-ui/blob/v4.6.1/swagger-ui-dist-package/README.md
+              context: require('swagger-ui-dist').getAbsoluteFSPath(),
               from: '*.{js,css,html,png}',
               to: 'swagger-ui/',
               globOptions: { ignore: ['**/index.html'] },
             },
-            { from: './node_modules/axios/dist/axios.min.js', to: 'swagger-ui/' },
+            {
+              from: require.resolve('axios/dist/axios.min.js'), 
+              to: 'swagger-ui/',
+            },
             { from: './<%= CLIENT_MAIN_SRC_DIR %>swagger-ui/', to: 'swagger-ui/' },
             { from: './<%= CLIENT_MAIN_SRC_DIR %>content/', to: 'content/' },
             { from: './<%= CLIENT_MAIN_SRC_DIR %>favicon.ico', to: 'favicon.ico' },

package/generators/cloudfoundry/esm.mjs

@@ -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/common/esm.mjs

@@ -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';

package/generators/common/files.js

@@ -62,8 +62,6 @@ const commonFiles = {
         '.lintstagedrc.js',
         {
           file: '.husky/pre-commit',
-          method: 'copy',
-          noEjs: true,
         },
       ],
     },
@@ -82,4 +80,5 @@ module.exports = {
   writeFiles,
   prettierConfigFiles,
   commonFiles,
+  files: commonFiles,
 };

package/generators/common/index.js

@@ -174,6 +174,12 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
             this.removeFile('.huskyrc');
           }
         }
+        if (this.isJhipsterVersionLessThan('7.6.1')) {
+          if (this.skipClient) {
+            this.removeFile('npmw');
+            this.removeFile('npmw.cmd');
+          }
+        }
       },
       writePrettierConfig() {
         // Prettier configuration needs to be the first written files - all subgenerators considered - for prettier transform to work

package/generators/common/templates/.husky/{pre-commit → pre-commit.ejs}

@@ -2,4 +2,8 @@
 . "$(dirname "$0")/_/husky.sh"
 
 
+<%_ if (skipClient || skipServer) { _%>
+npx --no-install lint-staged
+<%_ } else { _%>
 "$(dirname "$0")/../npmw" exec --no-install lint-staged
+<%_ } _%>