From 2382bf80aba2fe2f7ca52077f74f891eb814b032 Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Thu, 23 Feb 2023 16:56:53 +0100 Subject: [PATCH 1/2] fix: move catch-all-regex to the end part of #9182 --- .changeset/friendly-pumpkins-reply.md | 5 +++++ packages/adapter-vercel/index.js | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 .changeset/friendly-pumpkins-reply.md diff --git a/.changeset/friendly-pumpkins-reply.md b/.changeset/friendly-pumpkins-reply.md new file mode 100644 index 000000000000..bda3b8d8fbab --- /dev/null +++ b/.changeset/friendly-pumpkins-reply.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/adapter-vercel': patch +--- + +fix: move catch-all-regex to last position diff --git a/packages/adapter-vercel/index.js b/packages/adapter-vercel/index.js index b91edaa83127..6958975c27df 100644 --- a/packages/adapter-vercel/index.js +++ b/packages/adapter-vercel/index.js @@ -216,11 +216,6 @@ const plugin = function (defaults = {}) { /** @type {import('@sveltejs/kit').RouteDefinition[]} */ (group.routes) ); - if (singular) { - // Special case: One function for all routes - static_config.routes.push({ src: '/.*', dest: `/${name}` }); - } - for (const route of group.routes) { functions.set(route.pattern.toString(), name); } @@ -286,6 +281,12 @@ const plugin = function (defaults = {}) { } } + if (singular) { + // Common case: One function for all routes + // Needs to happen after ISR or else regex swallows all other matches + static_config.routes.push({ src: '/.*', dest: `/fn` }); + } + builder.log.minor('Copying assets...'); builder.writeClient(dirs.static); From b1f26bbc49f193d91c9bbde97d04c25809d54516 Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Thu, 23 Feb 2023 17:47:41 +0100 Subject: [PATCH 2/2] changelog --- .changeset/friendly-pumpkins-reply.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/friendly-pumpkins-reply.md b/.changeset/friendly-pumpkins-reply.md index bda3b8d8fbab..0a6870e4744b 100644 --- a/.changeset/friendly-pumpkins-reply.md +++ b/.changeset/friendly-pumpkins-reply.md @@ -2,4 +2,4 @@ '@sveltejs/adapter-vercel': patch --- -fix: move catch-all-regex to last position +fix: move catch-all-regex to the end