From 4f7411973978a992e76806db1eea1f20715d1a22 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Wed, 11 Nov 2020 00:04:33 +0100 Subject: [PATCH] fix: fix issues with router.base support --- packages/nitro/src/rollup/config.ts | 1 + packages/nitro/src/targets/browser.ts | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/nitro/src/rollup/config.ts b/packages/nitro/src/rollup/config.ts index c9b98e9e37..186a8cf98a 100644 --- a/packages/nitro/src/rollup/config.ts +++ b/packages/nitro/src/rollup/config.ts @@ -76,6 +76,7 @@ export const getRollupConfig = (config: SLSOptions) => { values: { 'process.env.NODE_ENV': '"production"', 'typeof window': '"undefined"', + 'process.env.ROUTER_BASE': JSON.stringify(config.routerBase), 'process.env.NUXT_STATIC_BASE': JSON.stringify(config.staticAssets.base), 'process.env.NUXT_STATIC_VERSION': JSON.stringify(config.staticAssets.version), // @ts-ignore diff --git a/packages/nitro/src/targets/browser.ts b/packages/nitro/src/targets/browser.ts index 56749f9b96..ae632d43b1 100644 --- a/packages/nitro/src/targets/browser.ts +++ b/packages/nitro/src/targets/browser.ts @@ -28,14 +28,13 @@ if ('serviceWorker' in navigator) { 'template:document' (tmpl) { tmpl.compiled = tmpl.compiled.replace('', script + '') }, - async done ({ targetDir, publicDir }) { - const rootIndex = resolve(publicDir, 'index.html') - const rootFallback = resolve(publicDir, '200.html') - if (!existsSync(rootIndex) && existsSync(rootFallback)) { - await copy(rootFallback, rootIndex) + async done ({ rootDir, publicDir }) { + const fallback200 = resolve(publicDir, '200.html') + const fallback400 = resolve(publicDir, '400.html') + if (!existsSync(fallback400) && existsSync(fallback200)) { + await copy(fallback200, fallback400) } - - consola.info(`Try with \`npx serve ${relative(process.cwd(), targetDir)}\``) + consola.info(`Try with \`nuxt start ${relative(process.cwd(), rootDir)}\``) } } }