generator-jhipster 7.6.0 → 7.7.0

package/generators/client/templates/angular/src/main/webapp/app/login/login.component.html.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <div>
-  <div class="row justify-content-center">
+  <div class="d-flex justify-content-center">
     <div class="col-lg-6 col-md-8 col-sm-10">
       <h1 <%= jhiPrefix %>Translate="login.title" data-cy="loginTitle">Sign in</h1>
       <div
@@ -29,7 +29,7 @@
         <strong>Failed to sign in!</strong> Please check your credentials and try again.
       </div>
       <form class="form" role="form" (ngSubmit)="login()" [formGroup]="loginForm">
-        <div class="form-group">
+        <div class="mb-3">
           <label class="username-label" for="username" <%= jhiPrefix %>Translate="global.form.username.label">Login</label>
           <input
             type="text"
@@ -43,7 +43,7 @@
           />
         </div>
 
-        <div class="form-group">
+        <div class="mb-3">
           <label for="password" <%= jhiPrefix %>Translate="login.form.password">Password</label>
           <input
             type="password"

package/generators/client/templates/angular/src/main/webapp/content/scss/_bootstrap-variables.scss.ejs

@@ -17,11 +17,11 @@
  limitations under the License.
 -%>
 /*
-* Bootstrap overrides https://getbootstrap.com/docs/4.0/getting-started/theming/
-* All values defined in bootstrap source
-* https://github.com/twbs/bootstrap/blob/v4-dev/scss/_variables.scss can be overwritten here
-* Make sure not to add !default to values here
-*/
+ * Bootstrap overrides https://getbootstrap.com/docs/5.1/customize/sass/
+ * All values defined in bootstrap source
+ * https://github.com/twbs/bootstrap/blob/v5.1.3/scss/_variables.scss can be overwritten here
+ * Make sure not to add !default to values here
+ */
 
 <%_ if (clientThemeNone) { _%>
 // Colors:

package/generators/client/templates/angular/src/main/webapp/content/scss/global.scss.ejs

@@ -122,6 +122,10 @@ Generic styles
   word-break: break-all;
 }
 
+.form-control {
+  background-color: #fff;
+}
+
 .readonly {
   background-color: #eee;
   opacity: 1;
@@ -224,4 +228,29 @@ ui bootstrap tweaks
   white-space: nowrap;
 }
 
+.dropdown-menu {
+  padding-left: 0px;
+}
+
+/* ==========================================================================
+angular-cli removes postcss-rtl processed inline css, processed rules must be added here instead
+========================================================================== */
+/* page-ribbon.component.scss */
+.ribbon {
+  left: -3.5em;
+  -moz-transform: rotate(-45deg);
+  -ms-transform: rotate(-45deg);
+  -o-transform: rotate(-45deg);
+  -webkit-transform: rotate(-45deg);
+  transform: rotate(-45deg);
+}
+
+/* navbar.component.scss */
+.navbar {
+  ul.navbar-nav {
+    .nav-item {
+      margin-left: 0.5em;
+    }
+  }
+}
 /* jhipster-needle-scss-add-main JHipster will add new css style */

package/generators/client/templates/angular/src/main/webapp/content/scss/vendor.scss.ejs

@@ -33,8 +33,4 @@ eg $input-color: red;
 @import '~bootswatch/dist/<%= clientTheme %>/bootswatch';
 <%_ } _%>
 
-<%_ if (enableI18nRTL) { _%>
-@import 'content/scss/rtl.scss';
-<%_ } _%>
-
 /* jhipster-needle-scss-add-vendor JHipster will add new css style */

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

@@ -22,6 +22,9 @@ const path = require('path');
 <%_ if (enableTranslation) { _%>
 const { hashElement } = require('folder-hash');
 const MergeJsonWebpackPlugin = require('merge-jsons-webpack-plugin');
+  <%_ if (enableI18nRTL) { _%>
+const postcssRTLCSS = require('postcss-rtlcss');
+  <%_ } _%>
 <%_ } _%>
 const BrowserSyncPlugin = require('browser-sync-webpack-plugin');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
@@ -115,6 +118,22 @@ module.exports = async (config, options, targetOptions) => {
     config.plugins.push(new CopyWebpackPlugin({ patterns }));
   }
 
+<%_ if (enableI18nRTL) { _%>
+  const scssRule = config.module.rules.find(x => x.test && x.test.toString().includes('scss'));
+  const uses = scssRule.rules.flatMap(r => r.use || r.oneOf.flatMap(o => o.use));
+  const postcssLoaderOptions = uses.filter(u => u.loader.includes('postcss-loader')).map(u => u.options);
+  postcssLoaderOptions.forEach(options => {
+    const generateOptions = options.postcssOptions;
+    options.postcssOptions = (loader) => {
+      const postcssOptions = generateOptions(loader);
+      postcssOptions.plugins.push(postcssRTLCSS());
+      return postcssOptions;
+    };
+    // https://github.com/angular/angular-cli/blob/4b9199d97f3bcb10710b5049b04d8a04436e2dd4/packages/angular_devkit/build_angular/src/webpack/configs/styles.ts#L201-L202
+    options.postcssOptions.config = false;
+  });
+
+<%_ } _%>
   config.plugins.push(
     new webpack.DefinePlugin({
 <%_ if (enableTranslation) { _%>

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.3.1",
+    "cypress": "9.5.0",
     "eslint-plugin-cypress": "2.12.1",
     "cypress-audit": "1.1.0",
-    "lighthouse": "9.2.0",
+    "lighthouse": "9.4.0",
     "nyc": "15.1.0"
   },
   "dependencies": {

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

@@ -35,16 +35,9 @@
 
     <script type="text/javascript">
       const AlwaysEnableTryItOutPlugin = function (system) {
-        const OperationContainer = system.getComponents('OperationContainer');
         return {
           components: {
             TryItOutButton: () => null,
-            OperationContainer: class CustomOperationContainer extends OperationContainer {
-              constructor(...args) {
-                super(...args);
-                this.state.tryItOutEnabled = true;
-              }
-            },
           },
         };
       };
@@ -150,6 +143,7 @@
           withCredentials: true,
           presets: [SwaggerUIBundle.presets.apis, SwaggerUIStandalonePreset],
           plugins: [SwaggerUIBundle.plugins.DownloadUrl, AlwaysEnableTryItOutPlugin],
+          tryItOutEnabled: true,
           requestInterceptor: function (req) {
 <%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>
             req.headers['X-XSRF-TOKEN'] = getCSRF();

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

@@ -1,23 +1,23 @@
 {
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "1.2.36",
-    "@fortawesome/free-solid-svg-icons": "5.15.4",
-    "@fortawesome/react-fontawesome": "0.1.16",
-    "@reduxjs/toolkit": "1.7.1",
-    "axios": "0.25.0",
+    "@fortawesome/fontawesome-svg-core": "1.3.0",
+    "@fortawesome/free-solid-svg-icons": "6.0.0",
+    "@fortawesome/react-fontawesome": "0.1.17",
+    "@reduxjs/toolkit": "1.7.2",
+    "axios": "0.26.0",
     "bootstrap": "5.1.3",
     "bootswatch": "5.1.3",
     "lodash": "4.17.21",
     "path-browserify": "1.0.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "react-hook-form": "7.24.2",
-    "react-jhipster": "0.18.0",
+    "react-hook-form": "7.27.1",
+    "react-jhipster": "0.19.0",
     "react-loadable": "5.5.0",
     "react-redux": "7.2.6",
     "react-redux-loading-bar": "5.0.2",
     "react-router-dom": "5.3.0",
-    "react-toastify": "8.1.0",
+    "react-toastify": "8.2.0",
     "react-transition-group": "4.4.2",
     "reactstrap": "9.0.1",
     "redux": "4.1.2",
@@ -27,63 +27,63 @@
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@testing-library/react": "12.1.2",
-    "@types/jest": "27.4.0",
+    "@testing-library/react": "12.1.3",
+    "@types/jest": "27.4.1",
     "@types/lodash": "4.14.178",
-    "@types/node": "16.11.21",
-    "@types/react": "17.0.38",
+    "@types/node": "16.11.26",
+    "@types/react": "17.0.39",
     "@types/react-dom": "17.0.11",
     "@types/react-redux": "7.1.22",
     "@types/react-router-dom": "5.3.3",
     "@types/redux": "3.6.31",
     "@types/webpack-env": "1.16.3",
-    "@typescript-eslint/eslint-plugin": "5.10.0",
-    "@typescript-eslint/parser": "5.10.0",
+    "@typescript-eslint/eslint-plugin": "5.12.1",
+    "@typescript-eslint/parser": "5.12.1",
     "autoprefixer": "10.4.2",
     "browser-sync": "2.27.7",
     "browser-sync-webpack-plugin": "2.3.0",
-    "copy-webpack-plugin": "10.2.1",
-    "core-js": "3.20.3",
+    "copy-webpack-plugin": "10.2.4",
+    "core-js": "3.21.1",
     "cross-env": "7.0.3",
-    "css-loader": "6.5.1",
+    "css-loader": "6.6.0",
     "css-minimizer-webpack-plugin": "3.4.1",
-    "eslint": "8.7.0",
-    "eslint-config-prettier": "8.3.0",
+    "eslint": "8.9.0",
+    "eslint-config-prettier": "8.4.0",
     "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",
+    "folder-hash": "4.0.2",
+    "fork-ts-checker-webpack-plugin": "7.2.1",
     "html-webpack-plugin": "5.5.0",
     "identity-obj-proxy": "3.0.0",
-    "jest": "27.4.7",
+    "jest": "27.5.1",
     "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.5.2",
+    "mini-css-extract-plugin": "2.5.3",
     "postcss-loader": "6.2.1",
-    "postcss-rtlcss": "3.5.1",
+    "postcss-rtlcss": "3.5.2",
     "react-infinite-scroll-component": "6.1.0",
     "redux-mock-store": "1.5.4",
     "rimraf": "3.0.2",
-    "sass": "1.49.0",
-    "sass-loader": "12.4.0",
+    "sass": "1.49.9",
+    "sass-loader": "12.6.0",
     "simple-progress-webpack-plugin": "2.0.0",
-    "sinon": "12.0.1",
+    "sinon": "13.0.1",
     "source-map-loader": "3.0.1",
     "sourcemap-istanbul-instrumenter-loader": "0.2.0",
     "style-loader": "3.3.1",
-    "swagger-ui-dist": "4.2.1",
-    "terser-webpack-plugin": "5.3.0",
+    "swagger-ui-dist": "4.5.2",
+    "terser-webpack-plugin": "5.3.1",
     "thread-loader": "3.0.4",
     "ts-jest": "27.1.3",
     "ts-loader": "9.2.6",
     "typescript": "4.5.5",
-    "webpack": "5.66.0",
-    "webpack-cli": "4.9.1",
-    "webpack-dev-server": "4.7.3",
+    "webpack": "5.69.1",
+    "webpack-cli": "4.9.2",
+    "webpack-dev-server": "4.7.4",
     "webpack-merge": "5.8.0",
     "webpack-notifier": "1.15.0",
-    "workbox-webpack-plugin": "6.4.2"
+    "workbox-webpack-plugin": "6.5.0"
   }
 }

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

@@ -1,13 +1,13 @@
 {
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "1.2.36",
-    "@fortawesome/free-solid-svg-icons": "5.15.4",
+    "@fortawesome/fontawesome-svg-core": "1.3.0",
+    "@fortawesome/free-solid-svg-icons": "6.0.0",
     "@fortawesome/vue-fontawesome": "2.0.6",
-    "axios": "0.25.0",
+    "axios": "0.26.0",
     "bootstrap": "4.6.1",
     "bootstrap-vue": "2.21.2",
     "bootswatch": "5.1.3",
-    "swagger-ui-dist": "4.2.1",
+    "swagger-ui-dist": "4.5.2",
     "vue": "2.6.14",
     "vue-class-component": "7.2.6",
     "vue-cookie": "1.1.4",
@@ -21,9 +21,9 @@
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "1.1.0",
-    "@types/jest": "27.4.0",
-    "@types/node": "16.11.21",
-    "@types/sinon": "10.0.8",
+    "@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",
@@ -32,40 +32,40 @@
     "axios-mock-adapter": "1.20.0",
     "autoprefixer": "10.4.2",
     "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.6.0",
     "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.1",
     "html-webpack-plugin": "5.5.0",
-    "jest": "27.4.7",
+    "jest": "27.5.1",
     "jest-junit": "13.0.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.5.3",
     "numeral": "2.0.6",
     "postcss-import": "14.0.2",
     "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",
+    "sass": "1.49.9",
+    "sass-loader": "12.6.0",
+    "sinon": "13.0.1",
+    "terser-webpack-plugin": "5.3.1",
     "ts-jest": "27.1.3",
     "ts-loader": "9.2.6",
-    "eslint": "8.7.0",
+    "eslint": "8.9.0",
     "eslint-plugin-prettier": "4.0.0",
-    "eslint-plugin-vue": "8.3.0",
+    "eslint-plugin-vue": "8.5.0",
     "typescript": "4.5.5",
-    "webpack": "5.66.0",
+    "webpack": "5.69.1",
     "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.7.4",
     "webpack-merge": "5.8.0",
-    "workbox-webpack-plugin": "6.4.2",
+    "workbox-webpack-plugin": "6.5.0",
     "vue-jest": "3.0.7",
     "vue-loader": "15.9.8"
   }

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) { _%>
@@ -93,9 +93,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/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
+<%_ } _%>

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

@@ -37,7 +37,7 @@ let clientPackageMngrName = 'Npm';
 let clientPackageMngrAddGlobal = 'install -g';
 let clientPackageMngrAdd = 'install --save --save-exact';
 let clientPackageMngrAddDev = 'install --save-dev --save-exact';
-let DOCUMENTATION_ARCHIVE_URL = `${DOCUMENTATION_URL + DOCUMENTATION_ARCHIVE_PATH}v${jhipsterVersion}`;
+let DOCUMENTATION_ARCHIVE_URL = `${DOCUMENTATION_URL}`;
 _%>
 This application was generated using JHipster <%= jhipsterVersion %>, you can find documentation and help at [<%= DOCUMENTATION_ARCHIVE_URL %>](<%= DOCUMENTATION_ARCHIVE_URL %>).
 <%_ if (applicationTypeGateway || applicationTypeMicroservice) { _%>
@@ -61,8 +61,10 @@ JHipster configuration is stored in this file at `generator-jhipster` key. You m
 - `.yo-resolve` (optional) - Yeoman conflict resolver
 Allows to use a specific action when conflicts are found skipping prompts for files that matches a pattern. Each line should match `[pattern] [action]` with pattern been a [Minimatch](https://github.com/isaacs/minimatch#minimatch) pattern and action been one of skip (default if ommited) or force. Lines starting with `#` are considered comments and are ignored.
 - `.jhipster/*.json` - JHipster entity configuration files
+<%_ if (!skipClient) { %>
 - `npmw` - wrapper to use locally installed npm.
 JHipster installs Node and npm locally using the build tool by default. This wrapper makes sure npm is installed locally and uses it avoiding some differences different versions can cause. By using `./npmw` instead of the traditional `npm` you can configure a Node-less environment to develop or test your application.
+<%_ } _%>
 - `/src/main/docker` - Docker configurations for the application and services that the application depends on
 
 ## Development

package/generators/common/templates/package.json

@@ -2,8 +2,8 @@
   "devDependencies": {
     "concurrently": "7.0.0",
     "husky": "7.0.4",
-    "lint-staged": "12.2.2",
-    "npm": "8.3.2",
-    "wait-on": "6.0.0"
+    "lint-staged": "12.3.4",
+    "npm": "8.4.1",
+    "wait-on": "6.0.1"
   }
 }

package/generators/common/templates/sonar-project.properties.ejs

@@ -45,7 +45,7 @@ sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey=squid:UndocumentedApi
 <%_ if (authenticationTypeJwt) { _%>
 # Rule https://rules.sonarsource.com/java/RSPEC-4502 is ignored, as for JWT tokens we are not subject to CSRF attack
 sonar.issue.ignore.multicriteria.S4502.resourceKey=<%= MAIN_DIR %>java/**/*
-sonar.issue.ignore.multicriteria.S4502.ruleKey=squid:S4502
+sonar.issue.ignore.multicriteria.S4502.ruleKey=java:S4502
 <%_ } _%>
 # Rule https://rules.sonarsource.com/java/RSPEC-4684
 sonar.issue.ignore.multicriteria.S4684.resourceKey=<%= MAIN_DIR %>java/**/*

package/generators/cypress/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/cypress/files.js

@@ -22,7 +22,7 @@
  * For any other config an object { file:.., method:.., template:.. } can be used
  */
 
-const faker = require('faker');
+const faker = require('@faker-js/faker');
 
 const constants = require('../generator-constants');
 
@@ -79,6 +79,7 @@ const cypressFiles = {
 };
 module.exports = {
   writeFiles,
+  files: cypressFiles,
 };
 
 function writeFiles() {