generator-jhipster 8.0.0-beta.2 → 8.0.0-rc.1

package/dist/generators/vue/templates/.eslintrc.cjs.ejs

@@ -0,0 +1,58 @@
+<%#
+ Copyright 2013-2023 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.
+-%>
+/* eslint-env node */
+require('@rushstack/eslint-patch/modern-module-resolution')
+
+module.exports = {
+  root: true,
+  extends: [
+    'plugin:vue/vue3-essential',
+    'eslint:recommended',
+    '@vue/eslint-config-typescript',
+    '@vue/eslint-config-prettier/skip-formatting',
+  ],
+<%_ if (cypressTests) { _%>
+  overrides: [
+    {
+      files: [
+        '<%= clientTestDir %>cypress/e2e/**/*.{cy,spec}.{js,ts,jsx,tsx}',
+      ],
+      'extends': [
+        'plugin:cypress/recommended',
+      ],
+    },
+  ],
+<%_ } _%>
+  parserOptions: {
+    ecmaVersion: 'latest',
+  },
+  rules: {
+    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'vue/multi-word-component-names': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-unused-vars': 'off',
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    '@typescript-eslint/no-empty-function': 'off',
+    '@typescript-eslint/ban-ts-comment': 'off',
+    '@typescript-eslint/no-var-requires': 'off',
+    '@typescript-eslint/consistent-type-imports': 'error',
+  },
+  ignorePatterns: ['<%= this.relativeDir(clientRootDir, temporaryDir) %>'],
+};

package/dist/generators/vue/templates/.eslintrc.js.ejs

@@ -32,7 +32,7 @@ module.exports = {
     ecmaVersion: 2020,
     project: [
       './tsconfig.json',
-      './<%= clientTestDir %>spec/tsconfig.json',
+      './tsconfig.test.json',
 <%_ if (cypressTests) { _%>
       './<%= clientTestDir %>cypress/tsconfig.json',
 <%_ } _%>

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

@@ -49,43 +49,55 @@
     "pinia": "<%= nodeDependencies.pinia %>",
     "vue": "<%= nodeDependencies['vue'] %>",
 <%_ if (enableTranslation) { _%>
+    "deepmerge": null,
     "vue-i18n": "<%= nodeDependencies['vue-i18n'] %>",
 <%_ } _%>
     "vue-router": "<%= nodeDependencies['vue-router'] %>"
   },
   "devDependencies": {
+<%_ if (microfrontend) { _%>
+    "@originjs/vite-plugin-federation": "1.2.3",
+    "browser-sync-webpack-plugin": "<%= nodeDependencies['browser-sync-webpack-plugin'] %>",
+    "copy-webpack-plugin": "<%= nodeDependencies['copy-webpack-plugin'] %>",
+    "css-loader": "<%= nodeDependencies['css-loader'] %>",
+    "css-minimizer-webpack-plugin": "<%= nodeDependencies['css-minimizer-webpack-plugin'] %>",
+    "html-webpack-plugin": "<%= nodeDependencies['html-webpack-plugin'] %>",
+  <%_ if (enableTranslation) { _%>
+    "folder-hash": "<%= nodeDependencies['folder-hash'] %>",
+    "merge-jsons-webpack-plugin": "<%= nodeDependencies['merge-jsons-webpack-plugin'] %>",
+  <%_ } _%>
+    "mini-css-extract-plugin": "<%= nodeDependencies['mini-css-extract-plugin'] %>",
+    "postcss-loader": "<%= nodeDependencies['postcss-loader'] %>",
+    "sass-loader": "<%= nodeDependencies['sass-loader'] %>",
+    "terser-webpack-plugin": "<%= nodeDependencies['terser-webpack-plugin'] %>",
+    "ts-loader": "<%= nodeDependencies['ts-loader'] %>",
+    "vue-loader": "<%= nodeDependencies['vue-loader'] %>",
+    "vue-style-loader": "<%= nodeDependencies['vue-style-loader'] %>",
+    "webpack": "<%= nodeDependencies['webpack'] %>",
+    "webpack-bundle-analyzer": "<%= nodeDependencies['webpack-bundle-analyzer'] %>",
+    "webpack-cli": "<%= nodeDependencies['webpack-cli'] %>",
+    "webpack-dev-server": "<%= nodeDependencies['webpack-dev-server'] %>",
+    "webpack-merge": "<%= nodeDependencies['webpack-merge'] %>",
+    "workbox-webpack-plugin": "<%= nodeDependencies['workbox-webpack-plugin'] %>",
+<%_ } _%>
     "@pinia/testing": "<%= nodeDependencies['@pinia/testing'] %>",
     "@rushstack/eslint-patch": "<%= nodeDependencies['@rushstack/eslint-patch'] %>",
     "@types/node": "<%= nodeDependencies['@types/node'] %>",
     "@types/sinon": "<%= nodeDependencies['@types/sinon'] %>",
+    "@tsconfig/node18": null,
     "@vue/compiler-sfc": "<%= nodeDependencies.vue %>",
     "@vitejs/plugin-vue": "<%= nodeDependencies['@vitejs/plugin-vue'] %>",
-    "@vitest/coverage-c8": "<%= nodeDependencies.vitest %>",
+    "@vitest/coverage-v8": "<%= nodeDependencies.vitest %>",
     "@vue/eslint-config-prettier": "<%= nodeDependencies['@vue/eslint-config-prettier'] %>",
     "@vue/eslint-config-typescript": "<%= nodeDependencies['@vue/eslint-config-typescript'] %>",
     "@vue/test-utils": "<%= nodeDependencies['@vue/test-utils'] %>",
+    "@vue/tsconfig": null,
     "axios-mock-adapter": "<%= nodeDependencies['axios-mock-adapter'] %>",
     "autoprefixer": "<%= nodeDependencies['autoprefixer'] %>",
-    "browser-sync-webpack-plugin": "<%= nodeDependencies['browser-sync-webpack-plugin'] %>",
-    "copy-webpack-plugin": "<%= nodeDependencies['copy-webpack-plugin'] %>",
-    "css-loader": "<%= nodeDependencies['css-loader'] %>",
-    "css-minimizer-webpack-plugin": "<%= nodeDependencies['css-minimizer-webpack-plugin'] %>",
-<%_ if (!skipJhipsterDependencies) { _%>
-    "generator-jhipster": "<%= jhipsterVersion %>",
-  <%_ blueprints.forEach(blueprint => { _%>
-    "<%= blueprint.name %>": "<%= blueprint.version %>",
-  <%_ }); _%>
-<%_ } _%>
-    "html-webpack-plugin": "<%= nodeDependencies['html-webpack-plugin'] %>",
-<%_ if (enableTranslation) { _%>
-    "folder-hash": "<%= nodeDependencies['folder-hash'] %>",
-    "merge-jsons-webpack-plugin": "<%= nodeDependencies['merge-jsons-webpack-plugin'] %>",
-<%_ } _%>
+    "flush-promises": null,
     "happy-dom": "<%= nodeDependencies['happy-dom'] %>",
-    "mini-css-extract-plugin": "<%= nodeDependencies['mini-css-extract-plugin'] %>",
     "numeral": "<%= nodeDependencies['numeral'] %>",
     "postcss-import": "<%= nodeDependencies['postcss-import'] %>",
-    "postcss-loader": "<%= nodeDependencies['postcss-loader'] %>",
     "postcss-url": "<%= nodeDependencies['postcss-url'] %>",
     "prettier": "<%= nodeDependencies['prettier'] %>",
 <%_ if (!skipServer) { _%>
@@ -96,26 +108,17 @@
     "cypress": "<%= nodeDependencies['cypress'] %>",
 <%_ } _%>
     "rimraf": "<%= nodeDependencies['rimraf'] %>",
+    "rollup-plugin-copy": null,
     "sass": "<%= nodeDependencies['sass'] %>",
-    "sass-loader": "<%= nodeDependencies['sass-loader'] %>",
     "sinon": "<%= nodeDependencies['sinon'] %>",
     "swagger-ui-dist": "<%= nodeDependencies['swagger-ui-dist'] %>",
-    "terser-webpack-plugin": "<%= nodeDependencies['terser-webpack-plugin'] %>",
-    "ts-loader": "<%= nodeDependencies['ts-loader'] %>",
     "eslint": "<%= nodeDependencies['eslint'] %>",
     "eslint-plugin-prettier": "<%= nodeDependencies['eslint-plugin-prettier'] %>",
     "eslint-plugin-vue": "<%= nodeDependencies['eslint-plugin-vue'] %>",
     "typescript": "<%= nodeDependencies['typescript'] %>",
+    "vite": null,
     "vitest": "<%= nodeDependencies.vitest %>",
-    "vitest-sonar-reporter": "<%= nodeDependencies['vitest-sonar-reporter'] %>",
-    "vue-loader": "<%= nodeDependencies['vue-loader'] %>",
-    "vue-style-loader": "<%= nodeDependencies['vue-style-loader'] %>",
-    "webpack": "<%= nodeDependencies['webpack'] %>",
-    "webpack-bundle-analyzer": "<%= nodeDependencies['webpack-bundle-analyzer'] %>",
-    "webpack-cli": "<%= nodeDependencies['webpack-cli'] %>",
-    "webpack-dev-server": "<%= nodeDependencies['webpack-dev-server'] %>",
-    "webpack-merge": "<%= nodeDependencies['webpack-merge'] %>",
-    "workbox-webpack-plugin": "<%= nodeDependencies['workbox-webpack-plugin'] %>"
+    "vitest-sonar-reporter": "<%= nodeDependencies['vitest-sonar-reporter'] %>"
   },
   "engines": {
     "node": ">=<%= nodeVersion %>",
@@ -125,12 +128,17 @@
     "default_environment": "prod"
   },
   "scripts": {
+<%_ if (microfrontend) { %>
     "prettier:check": "prettier --check \"{,src/**/,webpack/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
     "prettier:format": "prettier --write \"{,src/**/,webpack/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
+<%_ } else { %>
+    "prettier:check": "prettier --check \"{,src/**/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
+    "prettier:format": "prettier --write \"{,src/**/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
+<%_ } %>
     "lint": "eslint . --ext .ts,.vue ",
     "lint:fix": "eslint . --ext .ts,.vue --fix",
-    "cleanup": "rimraf <%= clientDistDir %>",
-    "clean-www": "rimraf <%= clientDistDir %>app/{src,<%= temporaryDir %>}",
+    "cleanup": "rimraf <%= this.relativeDir(clientRootDir, temporaryDir) %>",
+    "clean-www": "rimraf <%= this.relativeDir(clientRootDir, clientDistDir) %>",
     "start": "<%= clientPackageManager %> run webapp:dev --",
     "start-tls": "<%= clientPackageManager %> run webapp:dev -- --env.tls",
     "serve": "<%= clientPackageManager %> run start --",
@@ -143,13 +151,24 @@
     "test:watch": "<%= clientPackageManager %> run vitest",
     "watch": "concurrently npm:start<% if(!skipServer) { %> npm:backend:start<% } %>",
     "webapp:build": "<%= clientPackageManager %> run clean-www && <%= clientPackageManager %> run webapp:build:dev --",
+<%_ if (microfrontend) { %>
     "webapp:build:dev": "<%= clientPackageManager %> run webpack -- --mode development --env stats=minimal",
     "webapp:build:prod": "<%= clientPackageManager %> run webpack -- --mode production --env stats=minimal",
     "webapp:dev": "<%= clientPackageManager %> run webpack-dev-server -- --mode development --env stats=normal",
+<%_ } else { %>
+    "webapp:build:dev": "<%= clientPackageManager %> run vite-build",
+    "webapp:build:prod": "<%= clientPackageManager %> run vite-build",
+    "webapp:serve": "<%= clientPackageManager %> run vite-serve",
+<%_ } %>
     "webapp:prod": "<%= clientPackageManager %> run clean-www && <%= clientPackageManager %> run webapp:build:prod --",
     "webapp:test": "<%= clientPackageManager %> run test --",
+<%_ if (microfrontend) { %>
     "webpack-dev-server": "webpack serve --config webpack/webpack.common.js",
     "webpack": "webpack --config webpack/webpack.common.js"
+<%_ } else { %>
+    "vite-serve": "vite",
+    "vite-build": "vite build"
+<%_ } %>
   },
   "browserslist": [
     "> 1%",

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/account/account.service.spec.ts.ejs

@@ -5,8 +5,8 @@ import axios from 'axios';
 import sinon from 'sinon';
 
 import { createTestingPinia } from '@pinia/testing';
-import AccountService from '../../<%- clientSrcDirRelativeToClientTestDir %>account/account.service';
-import { AccountStore, useStore } from '../../<%- clientSrcDirRelativeToClientTestDir %>store';
+import AccountService from './account.service';
+import { type AccountStore, useStore } from '@/store';
 
 const resetStore = (store: AccountStore) => {
   store.$reset();

package/dist/generators/vue/templates/src/main/webapp/app/account/account.service.ts.ejs

@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-import { AccountStore } from '@/store';
+import { type AccountStore } from '@/store';
 
 export default class AccountService {
   constructor(private store: AccountStore) {}
@@ -34,7 +34,9 @@ export default class AccountService {
         this.store.setAuthentication(account);
         return true;
       }
-    } catch (error) {}
+    } catch (error) {
+      // Ignore error
+    }
 
     this.store.logout();
     return false;

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/account/activate/activate.component.spec.ts.ejs

@@ -1,10 +1,10 @@
 import { vitest } from 'vitest';
-import { shallowMount, ComponentMountingOptions } from '@vue/test-utils';
+import { shallowMount, type ComponentMountingOptions } from '@vue/test-utils';
 import axios from 'axios';
 import sinon from 'sinon';
 
-import Activate from '../../../<%- clientSrcDirRelativeToClientTestDir %>account/activate/activate.vue';
-import LoginService from '../../../<%- clientSrcDirRelativeToClientTestDir %>account/login.service';
+import Activate from './activate.vue';
+import LoginService from '../login.service';
 
 type ActivateComponentType = InstanceType<typeof Activate>;
 

package/dist/generators/vue/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs

@@ -1,6 +1,6 @@
-import { defineComponent, inject, onMounted, ref, Ref } from 'vue';
+import { defineComponent, inject, onMounted, ref, type Ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import LoginService from '@/account/login.service';
+import type LoginService from '@/account/login.service';
 import ActivateService from './activate.service';
 import { useRoute } from 'vue-router';
 

package/dist/generators/vue/templates/src/main/webapp/app/account/activate/activate.service.ts.ejs

@@ -1,4 +1,4 @@
-import axios, { AxiosInstance } from 'axios';
+import axios, { type AxiosInstance } from 'axios';
 
 export default class ActivateService {
   private axios: AxiosInstance;

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/account/change-password/change-password.component.spec.ts.ejs

@@ -4,8 +4,8 @@ import axios from 'axios';
 import sinon from 'sinon';
 
 import { createTestingPinia } from '@pinia/testing';
-import { useStore } from '../../../<%- clientSrcDirRelativeToClientTestDir %>store';
-import ChangePassword from '../../../<%- clientSrcDirRelativeToClientTestDir %>account/change-password/change-password.vue';
+import { useStore } from '@/store';
+import ChangePassword from './change-password.vue';
 
 type ChangePasswordComponentType = InstanceType<typeof ChangePassword>;
 

package/dist/generators/vue/templates/src/main/webapp/app/account/change-password/change-password.component.ts.ejs

@@ -1,4 +1,4 @@
-import { ComputedRef, defineComponent, inject, ref, Ref } from 'vue';
+import { type ComputedRef, defineComponent, inject, ref, type Ref } from 'vue';
 <%_ if (enableTranslation) { _%>
 import { useI18n } from 'vue-i18n';
 <%_ } _%>

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/account/login-form/login-form.component.spec.ts.ejs

@@ -1,15 +1,15 @@
 import { vitest } from 'vitest';
-import { shallowMount, MountingOptions } from '@vue/test-utils';
+import { shallowMount, type MountingOptions } from '@vue/test-utils';
 import axios from 'axios';
 import sinon from 'sinon';
-import { RouteLocation } from 'vue-router';
+import { type RouteLocation } from 'vue-router';
 import { PiniaVuePlugin } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
 
-import LoginService from '../../../<%- clientSrcDirRelativeToClientTestDir %>account/login.service';
-import AccountService from '../../../<%- clientSrcDirRelativeToClientTestDir %>account/account.service';
-import { useStore } from '../../../<%- clientSrcDirRelativeToClientTestDir %>store';
-import LoginForm from '../../../<%- clientSrcDirRelativeToClientTestDir %>account/login-form/login-form.vue';
+import LoginService from '../login.service';
+import AccountService from '../account.service';
+import { useStore } from '@/store';
+import LoginForm from './login-form.vue';
 
 type LoginFormComponentType = InstanceType<typeof LoginForm>;
 

package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.component.ts.ejs

@@ -1,11 +1,11 @@
 import axios from 'axios';
-import { defineComponent, inject, ref, Ref } from 'vue';
+import { defineComponent, inject, ref, type Ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 <%_ if (enableTranslation) { _%>
 import { useI18n } from 'vue-i18n';
 <%_ } _%>
-import AccountService from '../account.service';
-import LoginService from '@/account/login.service';
+import type AccountService from '../account.service';
+import type LoginService from '@/account/login.service';
 
 export default defineComponent({
   compatConfig: { MODE: 3 },

package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.vue.ejs

@@ -8,26 +8,24 @@
       </div>
       <div class="col-md-8">
         <b-form role="form" v-on:submit.prevent="doLogin()">
-          <b-form-group <% if (!enableTranslation) { %>label="Username" <% } %>v-bind:label="t$('global.form[\'username.label\']')" label-for="username">
+          <b-form-group v-bind:label="t$('global.form[\'username.label\']')" label-for="username">
             <b-form-input
               id="username"
               type="text"
               name="username"
               autofocus
               v-bind:placeholder="t$('global.form[\'username.placeholder\']')"
-              <% if (!enableTranslation) { %>placeholder="Your username" <% } %>
               v-model="login"
               data-cy="username"
             >
             </b-form-input>
           </b-form-group>
-          <b-form-group <% if (!enableTranslation) { %>label="Password" <% } %>v-bind:label="t$('login.form.password')" label-for="password">
+          <b-form-group v-bind:label="t$('login.form.password')" label-for="password">
             <b-form-input
               id="password"
               type="password"
               name="password"
               v-bind:placeholder="t$('login.form[\'password.placeholder\']')"
-              <% if (!enableTranslation) { %>placeholder="Your password" <% } %>
               v-model="password"
               data-cy="password"
             >

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/account/login.service.spec.ts.ejs

@@ -1,4 +1,4 @@
-import LoginService from '../../<%- clientSrcDirRelativeToClientTestDir %>account/login.service';
+import LoginService from './login.service';
 <%_ if (!authenticationTypeJwt) { _%>
 import axios from 'axios';
 import sinon from 'sinon';

package/dist/generators/vue/templates/src/main/webapp/app/account/login.service.ts.ejs

@@ -2,7 +2,7 @@
 import Vue from 'vue';
 <%_ } _%>
 <%_ if (!authenticationTypeJwt) { _%>
-import axios, { AxiosPromise } from 'axios';
+import axios, { type AxiosPromise } from 'axios';
 <%_ } _%>
 
 export default class LoginService {

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/account/register/register.component.spec.ts.ejs

@@ -4,10 +4,10 @@ import { shallowMount } from '@vue/test-utils';
 import axios from 'axios';
 import sinon from 'sinon';
 
-import { EMAIL_ALREADY_USED_TYPE, LOGIN_ALREADY_USED_TYPE } from '../../../<%- clientSrcDirRelativeToClientTestDir %>constants';
-import Register from '../../../<%- clientSrcDirRelativeToClientTestDir %>account/register/register.vue';
-import RegisterService from '../../../<%- clientSrcDirRelativeToClientTestDir %>account/register/register.service';
-import LoginService from '../../../<%- clientSrcDirRelativeToClientTestDir %>account/login.service';
+import { EMAIL_ALREADY_USED_TYPE, LOGIN_ALREADY_USED_TYPE } from '@/constants';
+import Register from './register.vue';
+import RegisterService from './register.service';
+import LoginService from '../login.service';
 
 type RegisterComponentType = InstanceType<typeof Register>;
 

package/dist/generators/vue/templates/src/main/webapp/app/account/register/register.component.ts.ejs

@@ -1,10 +1,10 @@
-import { computed, defineComponent, inject, ref, Ref } from 'vue';
+import { computed, defineComponent, inject, ref, type Ref } from 'vue';
 <%_ if (enableTranslation) { _%>
 import { useI18n } from 'vue-i18n';
 <%_ } _%>
 import { useVuelidate } from '@vuelidate/core'
 import { email, helpers, maxLength, minLength, required, sameAs } from '@vuelidate/validators';
-import LoginService from '@/account/login.service';
+import type LoginService from '@/account/login.service';
 import RegisterService from '@/account/register/register.service';
 import { EMAIL_ALREADY_USED_TYPE, LOGIN_ALREADY_USED_TYPE } from '@/constants';
 

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/account/reset-password/finish/reset-password-finish.component.spec.ts.ejs

@@ -1,8 +1,8 @@
 import axios from 'axios';
 import sinon from 'sinon';
 import { shallowMount } from '@vue/test-utils';
-import ResetPasswordFinish from '../../../../<%- clientSrcDirRelativeToClientTestDir %>account/reset-password/finish/reset-password-finish.vue';
-import LoginService from '../../../../<%- clientSrcDirRelativeToClientTestDir %>account/login.service';
+import ResetPasswordFinish from './reset-password-finish.vue';
+import LoginService from '@/login.service';
 
 type ResetPasswordFinishComponentType = InstanceType<typeof ResetPasswordFinish>;
 

package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/finish/reset-password-finish.component.ts.ejs

@@ -1,11 +1,11 @@
-import { defineComponent, inject, ref, Ref } from 'vue';
+import { defineComponent, inject, ref, type Ref } from 'vue';
 <%_ if (enableTranslation) { _%>
 import { useI18n } from 'vue-i18n';
 <%_ } _%>
 import axios from 'axios';
 import { useVuelidate } from '@vuelidate/core'
 import { maxLength, minLength, required, sameAs } from '@vuelidate/validators';
-import LoginService from '@/account/login.service';
+import type LoginService from '@/account/login.service';
 
 export default defineComponent({
   compatConfig: { MODE: 3 },

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/account/reset-password/init/reset-password-init.component.spec.ts.ejs

@@ -1,7 +1,7 @@
 import { shallowMount } from '@vue/test-utils';
 import axios from 'axios';
 import sinon from 'sinon';
-import ResetPasswordInit from '../../../../<%- clientSrcDirRelativeToClientTestDir %>account/reset-password/init/reset-password-init.vue';
+import ResetPasswordInit from './reset-password-init.vue';
 
 type ResetPasswordInitComponentType = InstanceType<typeof ResetPasswordInit>;
 

package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/init/reset-password-init.component.ts.ejs

@@ -1,4 +1,4 @@
-import { defineComponent, ref, Ref } from 'vue';
+import { defineComponent, ref, type Ref } from 'vue';
 <%_ if (enableTranslation) { _%>
 import { useI18n } from 'vue-i18n';
 <%_ } _%>

package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/init/reset-password-init.vue.ejs

@@ -9,7 +9,7 @@
                 </div>
 
                 <div class="alert alert-success" v-if="success">
-                    <p v-text="t$('reset.request.messages.success')">Check your emails for details on how to reset your
+                    <p v-text="t$('reset.request.messages.success')">Check your email for details on how to reset your
                         password.</p>
                 </div>
 

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/account/sessions/sessions.component.spec.ts.ejs

@@ -3,11 +3,11 @@ import axios from 'axios';
 import sinon from 'sinon';
 
 import { createTestingPinia } from '@pinia/testing';
-import { useStore } from '../../../<%- clientSrcDirRelativeToClientTestDir %>store';
-import Sessions from '../../../<%- clientSrcDirRelativeToClientTestDir %>account/sessions/sessions.vue';
-import router from '../../../<%- clientSrcDirRelativeToClientTestDir %>router';
+import { useStore } from '@/store';
+import Sessions from './sessions.vue';
+import router from '@/router';
 <%_ if (enableTranslation) { _%>
-import TranslationService from '../../../<%- clientSrcDirRelativeToClientTestDir %>locale/translation.service';
+import TranslationService from '@/locale/translation.service';
 <%_ } _%>
 
 type SessionsComponentType = InstanceType<typeof Sessions>;

package/dist/generators/vue/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs

@@ -1,4 +1,4 @@
-import { defineComponent, ref, Ref, computed } from 'vue';
+import { defineComponent, ref, type Ref, computed } from 'vue';
 <%_ if (enableTranslation) { _%>
 import { useI18n } from 'vue-i18n';
 <%_ } _%>

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/account/settings/settings.component.spec.ts.ejs

@@ -3,9 +3,9 @@ import axios from 'axios';
 import sinon from 'sinon';
 import { createTestingPinia } from '@pinia/testing';
 
-import { useStore } from '../../../<%- clientSrcDirRelativeToClientTestDir %>store';
-import Settings from '../../../<%- clientSrcDirRelativeToClientTestDir %>account/settings/settings.vue';
-import { EMAIL_ALREADY_USED_TYPE } from '../../../<%- clientSrcDirRelativeToClientTestDir %>constants';
+import { useStore } from '@/store';
+import Settings from './settings.vue';
+import { EMAIL_ALREADY_USED_TYPE } from '@/constants';
 
 type SettingsComponentType = InstanceType<typeof Settings>;
 

package/dist/generators/vue/templates/src/main/webapp/app/account/settings/settings.component.ts.ejs

@@ -1,4 +1,4 @@
-import { computed, ComputedRef, defineComponent, inject, ref, Ref } from 'vue';
+import { computed, type ComputedRef, defineComponent, inject, ref, type Ref } from 'vue';
 <%_ if (enableTranslation) { _%>
 import { useI18n } from 'vue-i18n';
 import languages from '@/shared/config/languages';

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/admin/configuration/configuration.component.spec.ts.ejs

@@ -2,7 +2,7 @@ import { shallowMount } from '@vue/test-utils';
 import axios from 'axios';
 import sinon from 'sinon';
 
-import Configuration from '../../../<%- clientSrcDirRelativeToClientTestDir %>admin/configuration/configuration.vue';
+import Configuration from './configuration.vue';
 
 type ConfigurationComponentType = InstanceType<typeof Configuration>;
 

package/dist/generators/vue/templates/src/main/webapp/app/admin/configuration/configuration.component.ts.ejs

@@ -1,4 +1,4 @@
-import { computed, defineComponent, inject, ref, Ref } from 'vue';
+import { computed, defineComponent, inject, ref, type Ref } from 'vue';
 <%_ if (enableTranslation) { _%>
 import { useI18n } from 'vue-i18n';
 <%_ } _%>

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/admin/gateway/gateway.component.spec.ts.ejs

@@ -1,8 +1,8 @@
 import { vitest } from 'vitest';
 import { shallowMount } from '@vue/test-utils';
 
-import Gateway from '../../../<%- clientSrcDirRelativeToClientTestDir %>admin/gateway/gateway.vue';
-import GatewayService from '../../../<%- clientSrcDirRelativeToClientTestDir %>admin/gateway/gateway.service';
+import Gateway from './gateway.vue';
+import GatewayService from './gateway.service';
 
 type GatewayComponentType = InstanceType<typeof Gateway>;
 

package/dist/generators/vue/templates/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs

@@ -1,4 +1,4 @@
-import { defineComponent, inject, ref, Ref, onMounted } from 'vue';
+import { defineComponent, inject, ref, type Ref, onMounted } from 'vue';
 <%_ if (enableTranslation) { _%>
 import { useI18n } from 'vue-i18n';
 <%_ } _%>

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/admin/health/health-modal.component.spec.ts.ejs

@@ -1,7 +1,7 @@
 import { vitest } from 'vitest';
 import { shallowMount } from '@vue/test-utils';
 
-import HealthModal from '../../../<%- clientSrcDirRelativeToClientTestDir %>admin/health/health-modal.vue';
+import HealthModal from './health-modal.vue';
 
 type HealthModalComponentType = InstanceType<typeof HealthModal>;
 

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/admin/health/health.component.spec.ts.ejs

@@ -2,8 +2,8 @@ import { shallowMount } from '@vue/test-utils';
 import axios from 'axios';
 import sinon from 'sinon';
 
-import Health from '../../../<%- clientSrcDirRelativeToClientTestDir %>admin/health/health.vue';
-import HealthService from '../../../<%- clientSrcDirRelativeToClientTestDir %>admin/health/health.service';
+import Health from './health.vue';
+import HealthService from './health.service';
 
 type HealthComponentType = InstanceType<typeof Health>;
 

package/dist/generators/vue/templates/src/main/webapp/app/admin/health/health.component.ts.ejs

@@ -1,4 +1,4 @@
-import { defineComponent, inject, ref, Ref } from 'vue';
+import { defineComponent, inject, ref, type Ref } from 'vue';
 <%_ if (enableTranslation) { _%>
 import { useI18n } from 'vue-i18n';
 <%_ } _%>

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/admin/health/health.service.spec.ts.ejs

@@ -1,4 +1,4 @@
-import HealthService from '../../../<%- clientSrcDirRelativeToClientTestDir %>admin/health/health.service';
+import HealthService from './health.service';
 
 describe('Health Service', () => {
   let healthService: HealthService;

package/dist/generators/vue/templates/src/main/webapp/app/admin/health/health.service.ts.ejs

@@ -1,4 +1,4 @@
-import axios, { AxiosPromise } from 'axios';
+import axios, { type AxiosPromise } from 'axios';
 
 export default class HealthService {
   public separator: string;

package/dist/generators/vue/templates/src/{test/javascript/spec → main/webapp}/app/admin/logs/logs.component.spec.ts.ejs

@@ -1,8 +1,8 @@
 import { shallowMount } from '@vue/test-utils';
 import axios from 'axios';
 import sinon from 'sinon';
-import Logs from '../../../<%- clientSrcDirRelativeToClientTestDir %>admin/logs/logs.vue';
-import LogsService from '../../../<%- clientSrcDirRelativeToClientTestDir %>admin/logs/logs.service';
+import Logs from './logs.vue';
+import LogsService from './logs.service';
 
 type LogsComponentType = InstanceType<typeof Logs>;