From d995e83a314bcb36b25648a2bd10d725c2407047 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Wed, 14 Jul 2021 22:40:40 +0800 Subject: [PATCH] fix(vite): set vite's root to current directory (#239) --- packages/app/src/_templates/views/app.template.html | 2 +- packages/vite/src/server.ts | 2 +- packages/vite/src/vite.ts | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/app/src/_templates/views/app.template.html b/packages/app/src/_templates/views/app.template.html index f485f80d36..6584c22502 100644 --- a/packages/app/src/_templates/views/app.template.html +++ b/packages/app/src/_templates/views/app.template.html @@ -6,6 +6,6 @@ {{ APP }} <% if (nuxt.options.vite && nuxt.options.dev) { %> - <% } %> + <% } %> diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index 343d8205a5..af099b7a34 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -28,7 +28,7 @@ export async function buildServer (ctx: ViteBuildContext) { ] }, build: { - outDir: 'dist/server', + outDir: resolve(ctx.nuxt.options.buildDir, 'dist/server'), ssr: true, rollupOptions: { input: resolve(ctx.nuxt.options.buildDir, 'entry.mjs'), diff --git a/packages/vite/src/vite.ts b/packages/vite/src/vite.ts index f618a4860d..5075528115 100644 --- a/packages/vite/src/vite.ts +++ b/packages/vite/src/vite.ts @@ -23,7 +23,7 @@ export async function bundle (nuxt: Nuxt) { config: vite.mergeConfig( nuxt.options.vite as any || {}, { - root: nuxt.options.buildDir, + root: nuxt.options.rootDir, mode: nuxt.options.dev ? 'development' : 'production', logLevel: 'warn', define: { @@ -35,6 +35,7 @@ export async function bundle (nuxt: Nuxt) { ...nuxt.options.alias, '#build': nuxt.options.buildDir, '#app': nuxt.options.appDir, + '/__build': nuxt.options.buildDir, '~': nuxt.options.srcDir, '@': nuxt.options.srcDir, 'web-streams-polyfill/ponyfill/es2018': 'unenv/runtime/mock/empty', @@ -76,7 +77,7 @@ export async function bundle (nuxt: Nuxt) { nuxt.hook('vite:serverCreated', (server: vite.ViteDevServer) => { const start = Date.now() - warmupViteServer(server, ['/entry.mjs']).then(() => { + warmupViteServer(server, [`/@fs${nuxt.options.buildDir.replace(/\\/g, '/')}/entry.mjs`]).then(() => { consola.info(`Vite warmed up in ${Date.now() - start}ms`) }).catch(consola.error) })