generator-jhipster 8.0.0-beta.1 → 8.0.0-beta.3

package/dist/generators/vue/files-vue.mjs

@@ -16,13 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { clientApplicationBlock, clientTestBlock, clientSrcBlock } from '../client/utils.mjs';
+import { clientApplicationTemplatesBlock, clientSrcTemplatesBlock } from '../client/support/files.mjs';
 export const vueFiles = {
     common: [
         {
             templates: [
                 'package.json',
                 'tsconfig.json',
+                'tsconfig.test.json',
                 '.postcssrc.js',
                 '.eslintrc.js',
                 'vitest.config.ts',
@@ -41,33 +42,33 @@ export const vueFiles = {
         },
         {
             condition: generator => generator.microfrontend,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['index.ts', 'core/error/error-loading.vue'],
         },
         {
             condition: generator => generator.microfrontend,
-            ...clientTestBlock,
+            ...clientSrcTemplatesBlock(),
             templates: [
-                'spec/app/microfrontends/entities-menu.component.ts',
-                'spec/app/microfrontends/entities-menu.vue',
-                'spec/app/microfrontends/entities-router.ts',
+                'microfrontends/entities-menu.component-test.ts',
+                'microfrontends/entities-menu-test.vue',
+                'microfrontends/entities-router-test.ts',
             ],
         },
         {
             condition: generator => generator.applicationTypeMicroservice,
-            ...clientTestBlock,
-            templates: ['spec/app/entities/entities-menu.spec.ts'],
+            ...clientApplicationTemplatesBlock(),
+            templates: ['entities/entities-menu.spec.ts'],
         },
     ],
     sass: [
         {
-            ...clientSrcBlock,
+            ...clientSrcTemplatesBlock(),
             templates: ['content/scss/_bootstrap-variables.scss', 'content/scss/global.scss', 'content/scss/vendor.scss'],
         },
     ],
     vueApp: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'app.vue',
                 'app.component.ts',
@@ -76,7 +77,9 @@ export const vueFiles = {
                 'declarations.d.ts',
                 'main.ts',
                 'shared/alert/alert.service.ts',
+                'shared/alert/alert.service.spec.ts',
                 'shared/config/axios-interceptor.ts',
+                'shared/config/axios-interceptor.spec.ts',
                 'shared/config/config.ts',
                 'shared/config/config-bootstrap-vue.ts',
                 'shared/config/dayjs.ts',
@@ -86,30 +89,35 @@ export const vueFiles = {
                 'router/index.ts',
                 'router/admin.ts',
                 'router/pages.ts',
+                'test-setup.ts',
             ],
         },
     ],
     i18n: [
         {
             condition: generator => generator.enableTranslation,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['locale/translation.service.ts', 'shared/config/store/translation-store.ts', 'shared/config/languages.ts'],
         },
     ],
     sharedVueApp: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'core/home/home.vue',
                 'core/home/home.component.ts',
+                'core/home/home.component.spec.ts',
                 'core/error/error.vue',
                 'core/error/error.component.ts',
+                'core/error/error.component.spec.ts',
                 'core/jhi-footer/jhi-footer.vue',
                 'core/jhi-footer/jhi-footer.component.ts',
                 'core/jhi-navbar/jhi-navbar.vue',
                 'core/jhi-navbar/jhi-navbar.component.ts',
+                'core/jhi-navbar/jhi-navbar.component.spec.ts',
                 'core/ribbon/ribbon.vue',
                 'core/ribbon/ribbon.component.ts',
+                'core/ribbon/ribbon.component.spec.ts',
                 'shared/composables/date-format.ts',
                 'shared/composables/index.ts',
                 'shared/composables/validation.ts',
@@ -118,7 +126,9 @@ export const vueFiles = {
                 'shared/sort/jhi-sort-indicator.component.ts',
                 'shared/sort/jhi-sort-indicator.vue',
                 'shared/sort/sorts.ts',
+                'shared/sort/sorts.spec.ts',
                 'shared/data/data-utils.service.ts',
+                'shared/data/data-utils.service.spec.ts',
                 'shared/jhi-item-count.component.ts',
                 'shared/jhi-item-count.vue',
                 'shared/model/user.model.ts',
@@ -127,188 +137,144 @@ export const vueFiles = {
     ],
     accountModule: [
         {
-            ...clientApplicationBlock,
-            templates: ['account/account.service.ts'],
+            ...clientApplicationTemplatesBlock(),
+            templates: ['account/account.service.ts', 'account/account.service.spec.ts'],
         },
         {
             condition: generator => !generator.authenticationTypeOauth2,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'account/login-form/login-form.vue',
                 'account/login-form/login-form.component.ts',
+                'account/login-form/login-form.component.spec.ts',
                 'account/login.service.ts',
                 'router/account.ts',
             ],
         },
         {
             condition: generator => generator.generateUserManagement,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'account/change-password/change-password.vue',
                 'account/change-password/change-password.component.ts',
+                'account/change-password/change-password.component.spec.ts',
                 'account/register/register.vue',
                 'account/register/register.component.ts',
+                'account/register/register.component.spec.ts',
                 'account/register/register.service.ts',
                 'account/reset-password/init/reset-password-init.vue',
                 'account/reset-password/init/reset-password-init.component.ts',
+                'account/reset-password/init/reset-password-init.component.spec.ts',
                 'account/reset-password/finish/reset-password-finish.vue',
                 'account/reset-password/finish/reset-password-finish.component.ts',
+                'account/reset-password/finish/reset-password-finish.component.spec.ts',
                 'account/settings/settings.vue',
                 'account/settings/settings.component.ts',
+                'account/settings/settings.component.spec.ts',
                 'account/activate/activate.component.ts',
+                'account/activate/activate.component.spec.ts',
                 'account/activate/activate.service.ts',
                 'account/activate/activate.vue',
             ],
         },
         {
             condition: generator => generator.authenticationTypeSession && generator.generateUserManagement,
-            ...clientApplicationBlock,
-            templates: ['account/sessions/sessions.vue', 'account/sessions/sessions.component.ts'],
+            ...clientApplicationTemplatesBlock(),
+            templates: [
+                'account/sessions/sessions.vue',
+                'account/sessions/sessions.component.ts',
+                'account/sessions/sessions.component.spec.ts',
+                'account/login.service.spec.ts',
+            ],
         },
         {
             condition: generator => generator.authenticationTypeOauth2,
-            ...clientApplicationBlock,
-            templates: ['account/login.service.ts'],
+            ...clientApplicationTemplatesBlock(),
+            templates: ['account/login.service.ts', 'account/login.service.spec.ts'],
         },
     ],
     adminModule: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['admin/docs/docs.vue', 'admin/docs/docs.component.ts'],
         },
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             condition: generator => generator.withAdminUi,
             templates: [
                 'admin/configuration/configuration.vue',
                 'admin/configuration/configuration.component.ts',
+                'admin/configuration/configuration.component.spec.ts',
                 'admin/configuration/configuration.service.ts',
                 'admin/health/health.vue',
                 'admin/health/health.component.ts',
+                'admin/health/health.component.spec.ts',
                 'admin/health/health-modal.vue',
                 'admin/health/health-modal.component.ts',
+                'admin/health/health-modal.component.spec.ts',
                 'admin/health/health.service.ts',
+                'admin/health/health.service.spec.ts',
                 'admin/logs/logs.vue',
                 'admin/logs/logs.component.ts',
+                'admin/logs/logs.component.spec.ts',
                 'admin/logs/logs.service.ts',
                 'admin/metrics/metrics.vue',
                 'admin/metrics/metrics.component.ts',
+                'admin/metrics/metrics.component.spec.ts',
                 'admin/metrics/metrics.service.ts',
                 'admin/metrics/metrics-modal.vue',
                 'admin/metrics/metrics-modal.component.ts',
+                'admin/metrics/metrics-modal.component.spec.ts',
             ],
         },
         {
             condition: generator => generator.communicationSpringWebsocket,
-            ...clientApplicationBlock,
-            templates: ['admin/tracker/tracker.vue', 'admin/tracker/tracker.component.ts', 'admin/tracker/tracker.service.ts'],
+            ...clientApplicationTemplatesBlock(),
+            templates: [
+                'admin/tracker/tracker.vue',
+                'admin/tracker/tracker.component.ts',
+                'admin/tracker/tracker.component.spec.ts',
+                'admin/tracker/tracker.service.ts',
+                'admin/tracker/tracker.service.spec.ts',
+            ],
         },
         {
             condition: generator => generator.generateUserManagement,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'admin/user-management/user-management.vue',
                 'admin/user-management/user-management.component.ts',
+                'admin/user-management/user-management.component.spec.ts',
                 'admin/user-management/user-management-view.vue',
                 'admin/user-management/user-management-view.component.ts',
+                'admin/user-management/user-management-view.component.spec.ts',
                 'admin/user-management/user-management-edit.vue',
                 'admin/user-management/user-management-edit.component.ts',
+                'admin/user-management/user-management-edit.component.spec.ts',
                 'admin/user-management/user-management.service.ts',
             ],
         },
         {
             condition: generator => generator.applicationTypeGateway && generator.serviceDiscoveryAny,
-            ...clientApplicationBlock,
-            templates: ['admin/gateway/gateway.vue', 'admin/gateway/gateway.component.ts', 'admin/gateway/gateway.service.ts'],
-        },
-        {
-            condition: generator => generator.generateBuiltInUserEntity,
-            ...clientApplicationBlock,
-            templates: ['entities/user/user.service.ts'],
-        },
-    ],
-    clientTestFw: [
-        {
-            ...clientTestBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
-                'spec/setup.ts',
-                'spec/tsconfig.json',
-                'spec/app/account/account.service.spec.ts',
-                'spec/app/core/home/home.component.spec.ts',
-                'spec/app/core/error/error.component.spec.ts',
-                'spec/app/core/jhi-navbar/jhi-navbar.component.spec.ts',
-                'spec/app/core/ribbon/ribbon.component.spec.ts',
-                'spec/app/shared/alert/alert.service.spec.ts',
-                'spec/app/shared/config/axios-interceptor.spec.ts',
-                'spec/app/shared/data/data-utils.service.spec.ts',
-                'spec/app/shared/sort/sorts.spec.ts',
+                'admin/gateway/gateway.vue',
+                'admin/gateway/gateway.component.ts',
+                'admin/gateway/gateway.component.spec.ts',
+                'admin/gateway/gateway.service.ts',
             ],
         },
         {
-            ...clientTestBlock,
-            condition: generator => generator.withAdminUi,
-            templates: [
-                'spec/app/admin/configuration/configuration.component.spec.ts',
-                'spec/app/admin/health/health.component.spec.ts',
-                'spec/app/admin/health/health-modal.component.spec.ts',
-                'spec/app/admin/health/health.service.spec.ts',
-                'spec/app/admin/logs/logs.component.spec.ts',
-                'spec/app/admin/metrics/metrics.component.spec.ts',
-                'spec/app/admin/metrics/metrics-modal.component.spec.ts',
-            ],
-        },
-        {
-            condition: generator => generator.authenticationTypeOauth2,
-            ...clientTestBlock,
-            templates: ['spec/app/account/login.service.spec.ts'],
-        },
-        {
-            condition: generator => !generator.authenticationTypeOauth2,
-            ...clientTestBlock,
-            templates: ['spec/app/account/login-form/login-form.component.spec.ts'],
-        },
-        {
-            condition: generator => generator.authenticationTypeSession && generator.generateUserManagement,
-            ...clientTestBlock,
-            templates: ['spec/app/account/sessions/sessions.component.spec.ts', 'spec/app/account/login.service.spec.ts'],
-        },
-        {
-            condition: generator => generator.generateUserManagement,
-            ...clientTestBlock,
-            templates: [
-                'spec/app/account/change-password/change-password.component.spec.ts',
-                'spec/app/account/register/register.component.spec.ts',
-                'spec/app/account/reset-password/init/reset-password-init.component.spec.ts',
-                'spec/app/account/reset-password/finish/reset-password-finish.component.spec.ts',
-                'spec/app/account/settings/settings.component.spec.ts',
-                'spec/app/account/activate/activate.component.spec.ts',
-            ],
-        },
-        {
-            condition: generator => generator.communicationSpringWebsocket,
-            ...clientTestBlock,
-            templates: ['spec/app/admin/tracker/tracker.component.spec.ts', 'spec/app/admin/tracker/tracker.service.spec.ts'],
-        },
-        {
-            condition: generator => generator.generateUserManagement,
-            ...clientTestBlock,
-            templates: [
-                'spec/app/admin/user-management/user-management.component.spec.ts',
-                'spec/app/admin/user-management/user-management-view.component.spec.ts',
-                'spec/app/admin/user-management/user-management-edit.component.spec.ts',
-            ],
-        },
-        {
-            condition: generator => generator.applicationTypeGateway && generator.serviceDiscoveryAny,
-            ...clientTestBlock,
-            templates: ['spec/app/admin/gateway/gateway.component.spec.ts'],
+            condition: generator => generator.generateBuiltInUserEntity,
+            ...clientApplicationTemplatesBlock(),
+            templates: ['entities/user/user.service.ts'],
         },
     ],
 };
 export const entitiesFiles = {
     entities: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'entities/entities.component.ts',
                 'entities/entities.vue',

package/dist/generators/vue/generator.mjs

@@ -16,18 +16,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { relative } from 'path';
 import chalk from 'chalk';
 import _ from 'lodash';
 import { isFilePending } from 'mem-fs-editor/state';
-import { relative } from 'path';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { fieldTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.mjs';
 import { GENERATOR_VUE, GENERATOR_CLIENT, GENERATOR_LANGUAGES } from '../generator-list.mjs';
-import { writeEntityFiles, postWriteEntityFiles } from './entity-files-vue.mjs';
+import { writeEntityFiles, postWriteEntityFiles, cleanupEntitiesFiles } from './entity-files-vue.mjs';
 import cleanupOldFilesTask from './cleanup.mjs';
 import { writeFiles, writeEntitiesFiles } from './files-vue.mjs';
 import { generateEntityClientEnumImports as getClientEnumImportsFormat, generateEntityClientFields as getHydratedEntityClientFields, generateEntityClientImports as formatEntityClientImports, generateTestEntityId as getTestEntityId, getTypescriptKeyType as getTSKeyType, } from '../client/support/index.mjs';
 import { convertTranslationsSupport, isTranslatedVueFile, translateVueFilesTransform } from './support/index.mjs';
+import { createNeedleCallback } from '../base/support/index.mjs';
 const { CommonDBTypes } = fieldTypes;
 const { VUE } = clientFrameworkTypes;
 const TYPE_BOOLEAN = CommonDBTypes.BOOLEAN;
@@ -60,13 +61,21 @@ export default class VueGenerator extends BaseApplicationGenerator {
     }
     get preparing() {
         return this.asPreparingTaskGroup({
-            prepareForTemplates({ application }) {
+            prepareForTemplates({ application, source }) {
                 application.clientWebappDir = `${application.clientSrcDir}app/`;
                 application.webappEnumerationsDir = `${application.clientWebappDir}shared/model/enumerations/`;
                 application.clientSpecDir = `${application.clientTestDir}spec/`;
                 // Can be dropped if tests are moved near implementation
                 application.applicationRootRelativeToClientTestDir = `${relative(application.clientSpecDir, '.')}/`;
                 application.clientSrcDirRelativeToClientTestDir = `${relative(application.clientSpecDir, application.clientWebappDir)}/`;
+                source.addWebpackConfig = args => {
+                    const webpackPath = 'webpack/webpack.common.js';
+                    const ignoreNonExisting = this.sharedData.getControl().ignoreNeedlesError && 'Webpack configuration file not found';
+                    this.editFile(webpackPath, { ignoreNonExisting }, createNeedleCallback({
+                        needle: 'jhipster-needle-add-webpack-config',
+                        contentToAdd: `,${args.config}`,
+                    }));
+                };
             },
         });
     }
@@ -95,6 +104,7 @@ export default class VueGenerator extends BaseApplicationGenerator {
     }
     get writingEntities() {
         return this.asWritingEntitiesTaskGroup({
+            cleanupEntitiesFiles,
             writeEntitiesFiles,
             writeEntityFiles,
             async queueTranslateTransform({ control, application }) {

package/dist/generators/vue/resources/package.json

@@ -1,63 +1,63 @@
 {
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "6.4.0",
-    "@fortawesome/free-solid-svg-icons": "6.4.0",
+    "@fortawesome/fontawesome-svg-core": "6.4.2",
+    "@fortawesome/free-solid-svg-icons": "6.4.2",
     "@fortawesome/vue-fontawesome": "3.0.3",
-    "@vuelidate/core": "2.0.2",
-    "@vuelidate/validators": "2.0.2",
-    "@vueuse/core": "10.1.2",
-    "axios": "1.4.0",
+    "@vuelidate/core": "2.0.3",
+    "@vuelidate/validators": "2.0.4",
+    "@vueuse/core": "10.4.1",
+    "axios": "1.5.0",
     "bootstrap": "4.6.2",
     "bootstrap-vue": "2.23.1",
-    "bootswatch": "5.3.0",
+    "bootswatch": "5.3.1",
     "js-cookie": "3.0.5",
-    "pinia": "2.1.3",
+    "pinia": "2.1.6",
     "vue": "3.3.4",
     "vue-i18n": "9.2.2",
-    "vue-router": "4.2.2"
+    "vue-router": "4.2.4"
   },
   "devDependencies": {
-    "@pinia/testing": "0.1.2",
-    "@rushstack/eslint-patch": "1.3.1",
-    "@types/node": "16.18.34",
-    "@types/sinon": "10.0.15",
-    "@vitejs/plugin-vue": "4.2.3",
-    "@vue/eslint-config-prettier": "7.1.0",
+    "@pinia/testing": "0.1.3",
+    "@rushstack/eslint-patch": "1.3.3",
+    "@types/node": "18.17.14",
+    "@types/sinon": "10.0.16",
+    "@vitejs/plugin-vue": "4.3.4",
+    "@vue/eslint-config-prettier": "8.0.0",
     "@vue/eslint-config-typescript": "10.0.0",
-    "@vue/test-utils": "2.3.2",
-    "autoprefixer": "10.4.14",
-    "axios-mock-adapter": "1.21.4",
+    "@vue/test-utils": "2.4.1",
+    "autoprefixer": "10.4.15",
+    "axios-mock-adapter": "1.21.5",
     "browser-sync-webpack-plugin": "2.3.0",
     "copy-webpack-plugin": "11.0.0",
     "css-loader": "6.8.1",
-    "css-minimizer-webpack-plugin": "5.0.0",
-    "eslint": "8.42.0",
-    "eslint-plugin-prettier": "4.2.1",
+    "css-minimizer-webpack-plugin": "5.0.1",
+    "eslint": "8.48.0",
+    "eslint-plugin-prettier": "5.0.0",
     "eslint-plugin-vue": "8.7.1",
     "folder-hash": "4.0.4",
-    "happy-dom": "9.20.3",
-    "html-webpack-plugin": "5.5.1",
+    "happy-dom": "10.11.2",
+    "html-webpack-plugin": "5.5.3",
     "merge-jsons-webpack-plugin": "2.0.1",
     "mini-css-extract-plugin": "2.7.6",
     "numeral": "2.0.6",
     "postcss-import": "15.1.0",
-    "postcss-loader": "7.3.2",
+    "postcss-loader": "7.3.3",
     "postcss-url": "10.1.3",
     "rimraf": "5.0.1",
-    "sass": "1.63.2",
-    "sass-loader": "13.3.1",
-    "sinon": "15.1.0",
+    "sass": "1.66.1",
+    "sass-loader": "13.3.2",
+    "sinon": "15.2.0",
     "terser-webpack-plugin": "5.3.9",
-    "ts-loader": "9.4.3",
-    "typescript": "5.1.3",
-    "vitest": "0.32.0",
+    "ts-loader": "9.4.4",
+    "typescript": "5.2.2",
+    "vitest": "0.34.3",
     "vitest-sonar-reporter": "0.4.1",
-    "vue-loader": "17.1.1",
+    "vue-loader": "17.2.2",
     "vue-style-loader": "4.1.3",
-    "webpack": "5.86.0",
-    "webpack-bundle-analyzer": "4.9.0",
+    "webpack": "5.88.2",
+    "webpack-bundle-analyzer": "4.9.1",
     "webpack-cli": "5.1.4",
-    "webpack-dev-server": "4.15.0",
+    "webpack-dev-server": "4.15.1",
     "webpack-merge": "5.9.0",
     "workbox-webpack-plugin": "7.0.0"
   }

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

@@ -60,7 +60,7 @@
     "@types/sinon": "<%= nodeDependencies['@types/sinon'] %>",
     "@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'] %>",

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 { AccountStore, useStore } from '@/store';
 
 const resetStore = (store: AccountStore) => {
   store.$reset();

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

@@ -3,8 +3,8 @@ import { shallowMount, 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/{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/{test/javascript/spec → main/webapp}/app/account/login-form/login-form.component.spec.ts.ejs

@@ -6,10 +6,10 @@ import { 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.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/{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>;