Merge pull request #27346 from mshima/resolve

simplify vite.config using import.meta.resolve
jhipster · Oct 2, 2024 · ed25314 · ed25314
2 parents 3a5bd89 + 9c77791
commit ed25314
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/generators/vue/templates/vite.config.mts.ejs b/generators/vue/templates/vite.config.mts.ejs
@@ -17,7 +17,6 @@
  limitations under the License.
 -%>
 import { fileURLToPath, URL } from 'node:url';
-import { existsSync } from 'node:fs';
 import { normalizePath } from 'vite'
 
 import {
@@ -36,11 +35,6 @@ const sharedAppVersion = '0.0.0';
   <%_ } _%>
 <%_ } _%>
 
-const getFileFromRepo = (file: string) =>
-  existsSync(fileURLToPath(new URL(`../node_modules/${file}`, import.meta.url)))
-    ? fileURLToPath(new URL(`../node_modules/${file}`, import.meta.url))
-    : fileURLToPath(new URL(`./node_modules/${file}`, import.meta.url));
-
 const { getAbsoluteFSPath } = await import('swagger-ui-dist');
 const swaggerUiPath = getAbsoluteFSPath();
 
@@ -54,7 +48,7 @@ let config = defineConfig({
           src: [
             `${normalizePath(swaggerUiPath)}/*.{js,css,html,png}`,
             `!${normalizePath(swaggerUiPath)}/**/index.html`,
-            normalizePath(getFileFromRepo('axios/dist/axios.min.js')),
+            normalizePath(fileURLToPath(new URL('./dist/axios.min.js', import.meta.resolve('axios/package.json')))),
             normalizePath(fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui/index.html', import.meta.url))),
           ],
           dest: 'swagger-ui',