chore(vite): use vite-tsconfig-paths to simplify vite configuration

jhipster · Jul 28, 2024 · 269d215 · 269d215
1 parent db738b9
commit 269d215
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 16 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
@@ -47,7 +47,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
@@ -60,6 +60,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,13 @@
 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/vue/vite.config.ts.mustache b/src/main/resources/generator/client/vue/vite.config.ts.mustache
@@ -1,15 +1,11 @@
 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/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.4",
+    "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"))