From e0de04ed46bd4628940c99a433ad8e85da18b453 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 19 Sep 2024 21:16:57 -0300 Subject: [PATCH] adjusts --- .../generators/rsbuild/templates/rsbuild.config.ts.jhi.ejs | 6 +++--- generators/vue/templates/rsbuild.config.ts.jhi.vue.ejs | 2 +- .../vue/templates/rsbuild.module-federation.config.ts.ejs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/generators/javascript/generators/rsbuild/templates/rsbuild.config.ts.jhi.ejs b/generators/javascript/generators/rsbuild/templates/rsbuild.config.ts.jhi.ejs index f69302f49583..9b9e70e93618 100644 --- a/generators/javascript/generators/rsbuild/templates/rsbuild.config.ts.jhi.ejs +++ b/generators/javascript/generators/rsbuild/templates/rsbuild.config.ts.jhi.ejs @@ -33,14 +33,14 @@ const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); export default defineConfig({ - root: __dirname, + root: path.join(__dirname, '<%- this.relativeDir(clientRootDir, clientSrcDir) %>'), output: { distPath: { - root: './<%= this.relativeDir(clientRootDir, clientDistDir) %>', + root: path.join(__dirname, './<%= this.relativeDir(clientRootDir, clientDistDir) %>'), }, }, html: { - template: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>index.html', + template: './index.html', }, plugins: [ <&- fragments.pluginsSection() -&> diff --git a/generators/vue/templates/rsbuild.config.ts.jhi.vue.ejs b/generators/vue/templates/rsbuild.config.ts.jhi.vue.ejs index bd64de5d5686..a58d06cbec23 100644 --- a/generators/vue/templates/rsbuild.config.ts.jhi.vue.ejs +++ b/generators/vue/templates/rsbuild.config.ts.jhi.vue.ejs @@ -34,7 +34,7 @@ import { mfConfig } from './rsbuild.module-federation.config.js'; <&_ if (fragment.configSection) { -&> source: { entry: { - app: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/<%= microfrontend ? 'index' : 'main' %>.ts', + app: './app/<%= microfrontend ? 'index' : 'main' %>.ts', }, alias: { vue$: '@vue/compat/dist/vue.esm-bundler.js', diff --git a/generators/vue/templates/rsbuild.module-federation.config.ts.ejs b/generators/vue/templates/rsbuild.module-federation.config.ts.ejs index d9efdce7fc5a..072694374b99 100644 --- a/generators/vue/templates/rsbuild.module-federation.config.ts.ejs +++ b/generators/vue/templates/rsbuild.module-federation.config.ts.ejs @@ -36,8 +36,8 @@ export const mfConfig = { name: '<%= lowercaseBaseName %>', <%_ if (applicationTypeMicroservice) { _%> exposes: { - './entities-router': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/router/entities', - './entities-menu': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/entities/entities-menu', + './entities-router': './app/router/entities', + './entities-menu': './app/entities/entities-menu', }, <%_ } _%> filename: 'remoteEntry.js',