Merge pull request jhipster#10440 from murdos/chore/simplify-vite-vit…

…est-config chore: use vite-tsconfig-paths to simplify generated vite and vitest configuration
murdos · Jul 29, 2024 · bff542e · bff542e
2 parents 361a1e8 + 02de949
commit bff542e
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 28 deletions.
diff --git a/...n/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java b/...n/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java
@@ -51,7 +51,7 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
  .addDevDependency(packageName("typescript"), COMMON)
  .addDevDependency(packageName("ts-node"), REACT)
  .addDevDependency(packageName("vite"), COMMON)
- .addDevDependency(packageName("vite-tsconfig-paths"), REACT)
+ .addDevDependency(packageName("vite-tsconfig-paths"), COMMON)
  .addDevDependency(packageName("vitest"), COMMON)
  .addDevDependency(packageName("vitest-sonar-reporter"), COMMON)
  .addDependency(packageName("react"), REACT)

diff --git a/src/main/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactory.java b/src/main/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactory.java
@@ -64,6 +64,7 @@ public JHipsterModule buildVueModule(JHipsterModuleProperties properties) {
  .addDevDependency(packageName("jsdom"), COMMON)
  .addDevDependency(packageName("typescript"), COMMON)
  .addDevDependency(packageName("vite"), COMMON)
+ .addDevDependency(packageName("vite-tsconfig-paths"), COMMON)
  .addDevDependency(packageName("vitest"), COMMON)
  .addDevDependency(packageName("vitest-sonar-reporter"), COMMON)
  .addDevDependency(packageName("vue-tsc"), VUE)

diff --git a/src/main/resources/generator/client/react/vite.config.ts.mustache b/src/main/resources/generator/client/react/vite.config.ts.mustache
@@ -1,18 +1,12 @@
 import { defineConfig } from 'vite';
+import tsconfigPaths from 'vite-tsconfig-paths';
 import react from '@vitejs/plugin-react';
-import path from 'path';
 
 export default defineConfig({
- plugins: [react()],
+ plugins: [react(), tsconfigPaths()],
  build: {
  outDir: '../../../{{projectBuildDirectory}}/classes/static',
  },
- resolve: {
- alias: [
- { find: '@', replacement: path.resolve(__dirname, 'src/main/webapp/app') },
- { find: '@assets', replacement: path.resolve('src/main/webapp/assets') },
- ],
- },
  root: 'src/main/webapp',
  server: {
  port: 9000,

diff --git a/src/main/resources/generator/client/react/vitest.config.ts.mustache b/src/main/resources/generator/client/react/vitest.config.ts.mustache
@@ -3,13 +3,9 @@
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 import react from '@vitejs/plugin-react';
-import path from 'path';
 
 export default defineConfig({
  plugins: [react(), tsconfigPaths()],
- resolve: {
- alias: [{ find: '@', replacement: path.resolve(__dirname, 'src/main/webapp/app') }],
- },
  test: {
  reporters: ['verbose', 'vitest-sonar-reporter'],
  outputFile: {

diff --git a/src/main/resources/generator/client/vue/tsconfig.json b/src/main/resources/generator/client/vue/tsconfig.json
@@ -7,6 +7,7 @@
  "strict": true,
  "jsx": "preserve",
  "skipLibCheck": true,
+ "allowJs": true,
  "sourceMap": true,
  "resolveJsonModule": true,
  "esModuleInterop": true,
@@ -22,7 +23,8 @@
  "src/main/webapp/**/*.d.ts",
  "src/main/webapp/**/*.tsx",
  "src/main/webapp/**/*.vue",
- "src/test/javascript/spec/**/*.ts"
+ "src/test/javascript/spec/**/*.ts",
+ "src/test/javascript/spec/**/*.vue"
  ],
  "exclude": ["./node_modules"]
 }
diff --git a/src/main/resources/generator/client/vue/vite.config.ts.mustache b/src/main/resources/generator/client/vue/vite.config.ts.mustache
@@ -1,15 +1,10 @@
 import { defineConfig } from 'vite';
+import tsconfigPaths from 'vite-tsconfig-paths';
 import vue from '@vitejs/plugin-vue';
-import path from 'path';
 
 // https://vitejs.dev/config/
 export default defineConfig({
- resolve: {
- alias: {
- '@': path.resolve(__dirname, './src/main/webapp/app'),
- },
- },
- plugins: [vue()],
+ plugins: [vue(), tsconfigPaths()],
  build: {
  outDir: '../../../{{projectBuildDirectory}}/classes/static',
  },

diff --git a/src/main/resources/generator/client/vue/vitest.config.ts.mustache b/src/main/resources/generator/client/vue/vitest.config.ts.mustache
@@ -1,14 +1,11 @@
 /// <reference types="vitest" />
 
 import { defineConfig } from 'vite';
+import tsconfigPaths from 'vite-tsconfig-paths';
 import vue from '@vitejs/plugin-vue';
-import path from 'path';
 
 export default defineConfig({
- plugins: [vue()],
- resolve: {
- alias: [{ find: '@', replacement: path.resolve(__dirname, 'src/main/webapp/app') }],
- },
+ plugins: [vue(), tsconfigPaths()],
  test: {
  reporters: ['verbose', 'vitest-sonar-reporter'],
  outputFile: {

diff --git a/src/main/resources/generator/dependencies/common/package.json b/src/main/resources/generator/dependencies/common/package.json
@@ -43,6 +43,7 @@
  "ts-jest": "29.2.3",
  "typescript": "5.5.4",
  "vite": "5.3.5",
+ "vite-tsconfig-paths": "4.3.2",
  "vitest": "2.0.4",
  "vitest-sonar-reporter": "2.0.0"
  }

diff --git a/src/main/resources/generator/dependencies/react/package.json b/src/main/resources/generator/dependencies/react/package.json
@@ -20,7 +20,6 @@
  "eslint-plugin-react": "7.35.0",
  "react-scripts": "5.0.1",
  "sass": "1.77.8",
- "ts-node": "10.9.2",
- "vite-tsconfig-paths": "4.3.2"
+ "ts-node": "10.9.2"
  }
 }
diff --git a/src/test/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactoryTest.java
@@ -39,6 +39,7 @@ void shouldCreateVueModule() {
  .containing(nodeDependency("jsdom"))
  .containing(nodeDependency("typescript"))
  .containing(nodeDependency("vite"))
+ .containing(nodeDependency("vite-tsconfig-paths"))
  .containing(nodeDependency("vitest"))
  .containing(nodeDependency("vitest-sonar-reporter"))
  .containing(nodeDependency("vue-tsc"))