feat: avoid adding single routes to vercel config

unjs · Oct 20, 2022 · 05bc228 · 05bc228
1 parent dfe239f
commit 05bc228
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 19 deletions.
diff --git a/src/presets/vercel.ts b/src/presets/vercel.ts
@@ -40,9 +40,11 @@ export const vercel = defineNitroPreset({
       for (const [key, value] of Object.entries(nitro.options.routeRules).filter(([_, value]) => value.cache && (value.cache.swr || value.cache.static))) {
         if (!value.cache) { continue } // for type support
         const funcPrefix = resolve(nitro.options.output.serverDir, '..' + generateEndpoint(key))
+        await fsp.mkdir(dirname(funcPrefix), { recursive: true })
         await fsp.symlink('./' + relative(dirname(funcPrefix), nitro.options.output.serverDir), funcPrefix + '.func', 'junction')
         await writeFile(funcPrefix + '.prerender-config.json', JSON.stringify({
-          expiration: value.cache.static ? false : typeof value.cache.swr === 'number' ? value.cache.swr : 60
+          expiration: value.cache.static ? false : typeof value.cache.swr === 'number' ? value.cache.swr : 60,
+          allowQuery: key.includes('/**') ? ['url'] : undefined
         }))
       }
     }
@@ -124,10 +126,10 @@ function generateBuildConfig (nitro: Nitro) {
         handle: 'filesystem'
       },
       ...Object.entries(nitro.options.routeRules)
-        .filter(([_, value]) => value.cache && (value.cache.swr || value.cache.static))
+        .filter(([key, value]) => value.cache && (value.cache.swr || value.cache.static) && key.includes('/**'))
         .map(([key]) => ({
-          src: key.replace('/**', '/(.*)'),
-          dest: generateEndpoint(key)
+          src: key.replace(/^(.*)\/\*\*/, '(<?url>$1/.*)'),
+          dest: generateEndpoint(key) + '?url=$url'
         })),
       {
         src: '/(.*)',
@@ -138,5 +140,5 @@ function generateBuildConfig (nitro: Nitro) {
 }
 
 function generateEndpoint (url: string) {
-  return '/__nitro-' + withoutLeadingSlash(url.replace(/[^a-z]/g, '-'))
+  return url.includes('/**') ? '/__nitro-' + withoutLeadingSlash(url.replace(/\/\*\*.*/, '').replace(/[^a-z]/g, '-')) : url
 }
diff --git a/src/runtime/entries/vercel.ts b/src/runtime/entries/vercel.ts
@@ -1,5 +1,14 @@
 import '#internal/nitro/virtual/polyfill'
-import { toNodeListener } from 'h3'
+import { toNodeListener, NodeListener } from 'h3'
+import { parseQuery } from 'ufo'
 import { nitroApp } from '../app'
 
-export default toNodeListener(nitroApp.h3App)
+const handler = toNodeListener(nitroApp.h3App)
+
+export default <NodeListener> function (req, res) {
+  const { url } = parseQuery(req.headers['x-now-route-matches'] as string)
+  if (url) {
+    req.url = url as string
+  }
+  return handler(req, res)
+}
diff --git a/test/presets/netlify.test.ts b/test/presets/netlify.test.ts
@@ -37,8 +37,8 @@ describe('nitro:preset:netlify', async () => {
       /rules/nested/*	/base	302
       /rules/redirect/obj	https://nitro.unjs.io/	301
       /rules/redirect	/base	302
-      /rules/swr-ttl	/.netlify/builders/server 200
-      /rules/swr	/.netlify/builders/server 200
+      /rules/swr-ttl/*	/.netlify/builders/server 200
+      /rules/swr/*	/.netlify/builders/server 200
       /rules/static	/.netlify/builders/server 200
       /* /.netlify/functions/server 200"
     `)

diff --git a/test/presets/vercel.test.ts b/test/presets/vercel.test.ts
@@ -96,16 +96,12 @@ describe('nitro:preset:vercel', async () => {
             "handle": "filesystem",
           },
           {
-            "dest": "/__nitro--rules-static",
-            "src": "/rules/static",
+            "dest": "/__nitro--rules-swr?url=$url",
+            "src": "(<?url>/rules/swr/.*)",
           },
           {
-            "dest": "/__nitro--rules-swr",
-            "src": "/rules/swr",
-          },
-          {
-            "dest": "/__nitro--rules-swr-ttl",
-            "src": "/rules/swr-ttl",
+            "dest": "/__nitro--rules-swr-ttl?url=$url",
+            "src": "(<?url>/rules/swr-ttl/.*)",
           },
           {
             "dest": "/__nitro",

diff --git a/test/tests.ts b/test/tests.ts
@@ -39,8 +39,8 @@ export async function setupTest (preset) {
       '/rules/cors': { cors: true, headers: { 'access-control-allowed-methods': 'GET' } },
       '/rules/redirect': { redirect: '/base' },
       '/rules/static': { static: true },
-      '/rules/swr': { swr: true },
-      '/rules/swr-ttl': { swr: 60 },
+      '/rules/swr/**': { swr: true },
+      '/rules/swr-ttl/**': { swr: 60 },
       '/rules/redirect/obj': {
         redirect: { to: 'https://nitro.unjs.io/', statusCode: 308 }
       },