From 8adb4f606123519410b9ae0f88bba1b6068d6477 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 26 Sep 2022 12:00:45 +0100 Subject: [PATCH 1/6] fix(nuxt): don't prerender index.html with a server --- packages/nuxt/src/core/nitro.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index d66578d243f..1f77448a8a6 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -57,7 +57,8 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) { crawlLinks: nuxt.options._generate ? nuxt.options.generate.crawler : false, routes: ([] as string[]) .concat(nuxt.options._generate ? ['/', '/200.html', ...nuxt.options.generate.routes] : []) - .concat(nuxt.options.ssr === false ? ['/index.html', '/200.html', '/404.html'] : []) + .concat(nuxt.options.ssr === false ? ['/200.html', '/404.html'] : []) + .concat(nuxt.options.ssr === false && nuxt.options._generate ? ['/index.html'] : []) }, sourceMap: nuxt.options.sourcemap.server, externals: { From 6e8475fabf844458055b786e1faaf55513e39565 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 3 Oct 2022 14:53:57 +0100 Subject: [PATCH 2/6] fix: don't generate other routes if running `nuxi build` --- packages/nuxt/src/core/nitro.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index 1f77448a8a6..ed518f887c6 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -57,8 +57,7 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) { crawlLinks: nuxt.options._generate ? nuxt.options.generate.crawler : false, routes: ([] as string[]) .concat(nuxt.options._generate ? ['/', '/200.html', ...nuxt.options.generate.routes] : []) - .concat(nuxt.options.ssr === false ? ['/200.html', '/404.html'] : []) - .concat(nuxt.options.ssr === false && nuxt.options._generate ? ['/index.html'] : []) + .concat(nuxt.options.ssr === false && nuxt.options._generate ? ['/index.html', '/200.html', '/404.html'] : []) }, sourceMap: nuxt.options.sourcemap.server, externals: { From 1737ac9416b8a1465a92acfe9611c7c7183b1623 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 3 Oct 2022 14:54:58 +0100 Subject: [PATCH 3/6] fix: remove extra 200 --- packages/nuxt/src/core/nitro.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index ed518f887c6..06c5a3fea79 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -57,7 +57,7 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) { crawlLinks: nuxt.options._generate ? nuxt.options.generate.crawler : false, routes: ([] as string[]) .concat(nuxt.options._generate ? ['/', '/200.html', ...nuxt.options.generate.routes] : []) - .concat(nuxt.options.ssr === false && nuxt.options._generate ? ['/index.html', '/200.html', '/404.html'] : []) + .concat(nuxt.options.ssr === false && nuxt.options._generate ? ['/index.html', '/404.html'] : []) }, sourceMap: nuxt.options.sourcemap.server, externals: { From 49f57a2bf2442ebd7f9b08d3434b3da99f22e5e5 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 3 Oct 2022 14:58:32 +0100 Subject: [PATCH 4/6] refactor: simplify --- packages/nuxt/src/core/nitro.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index 06c5a3fea79..f04608ccb19 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -56,8 +56,8 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) { prerender: { crawlLinks: nuxt.options._generate ? nuxt.options.generate.crawler : false, routes: ([] as string[]) - .concat(nuxt.options._generate ? ['/', '/200.html', ...nuxt.options.generate.routes] : []) - .concat(nuxt.options.ssr === false && nuxt.options._generate ? ['/index.html', '/404.html'] : []) + .concat(nuxt.options._generate ? ['/200.html', '/404.html', ...nuxt.options.generate.routes] : []) + .concat(nuxt.options.ssr && nuxt.options._generate ? [nuxt.options.ssr ? '/' : '/index.html'] : []) }, sourceMap: nuxt.options.sourcemap.server, externals: { From 8cd0c32e0ec25a98b1f6bd4c257fb0af8e4fecc0 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 3 Oct 2022 14:59:40 +0100 Subject: [PATCH 5/6] fix: remove condition --- packages/nuxt/src/core/nitro.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index f04608ccb19..2ac11e565db 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -57,7 +57,7 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) { crawlLinks: nuxt.options._generate ? nuxt.options.generate.crawler : false, routes: ([] as string[]) .concat(nuxt.options._generate ? ['/200.html', '/404.html', ...nuxt.options.generate.routes] : []) - .concat(nuxt.options.ssr && nuxt.options._generate ? [nuxt.options.ssr ? '/' : '/index.html'] : []) + .concat(nuxt.options._generate ? [nuxt.options.ssr ? '/' : '/index.html'] : []) }, sourceMap: nuxt.options.sourcemap.server, externals: { From 83812d0c405816de1e3b18e5235f75d8f71fda7e Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 3 Oct 2022 15:01:32 +0100 Subject: [PATCH 6/6] chore: final, perhaps? --- packages/nuxt/src/core/nitro.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index 2ac11e565db..d473a3a9ae2 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -56,8 +56,8 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) { prerender: { crawlLinks: nuxt.options._generate ? nuxt.options.generate.crawler : false, routes: ([] as string[]) - .concat(nuxt.options._generate ? ['/200.html', '/404.html', ...nuxt.options.generate.routes] : []) - .concat(nuxt.options._generate ? [nuxt.options.ssr ? '/' : '/index.html'] : []) + .concat(nuxt.options.generate.routes) + .concat(nuxt.options._generate ? [nuxt.options.ssr ? '/' : '/index.html', '/200.html', '/404.html'] : []) }, sourceMap: nuxt.options.sourcemap.server, externals: {