diff options
| -rw-r--r-- | .changeset/swift-houses-itch.md | 5 | ||||
| -rw-r--r-- | packages/integrations/vercel/src/index.ts | 66 |
2 files changed, 42 insertions, 29 deletions
diff --git a/.changeset/swift-houses-itch.md b/.changeset/swift-houses-itch.md new file mode 100644 index 000000000..ed63fe225 --- /dev/null +++ b/.changeset/swift-houses-itch.md @@ -0,0 +1,5 @@ +--- +'@astrojs/vercel': patch +--- + +Fixed `trailingSlash` for non-HTML pages diff --git a/packages/integrations/vercel/src/index.ts b/packages/integrations/vercel/src/index.ts index 35d20d42f..838844a08 100644 --- a/packages/integrations/vercel/src/index.ts +++ b/packages/integrations/vercel/src/index.ts @@ -88,39 +88,47 @@ export default function vercel(): AstroIntegration { basePath: '/', pages404: false, redirects: - // Extracted from Next.js v12.1.5 - _config.trailingSlash === 'always' - ? [ - { - source: '/:file((?!\\.well-known(?:/.*)?)(?:[^/]+/)*[^/]+\\.\\w+)/', - destination: '/:file', - internal: true, - statusCode: 308, - regex: '^(?:/((?!\\.well-known(?:/.*)?)(?:[^/]+/)*[^/]+\\.\\w+))/$', - }, - { - source: '/:notfile((?!\\.well-known(?:/.*)?)(?:[^/]+/)*[^/\\.]+)', - destination: '/:notfile/', - internal: true, - statusCode: 308, - regex: '^(?:/((?!\\.well-known(?:/.*)?)(?:[^/]+/)*[^/\\.]+))$', - }, - ] - : _config.trailingSlash === 'never' - ? [ - { - source: '/:path+/', - destination: '/:path+', - internal: true, - statusCode: 308, - regex: '^(?:/((?:[^/]+?)(?:/(?:[^/]+?))*))/$', - }, - ] + _config.trailingSlash !== 'ignore' + ? routes + .filter((route) => route.type === 'page' && !route.pathname?.endsWith('/')) + .map((route) => { + const path = + '/' + + route.segments + .map((segments) => + segments + .map((part) => + part.spread + ? `:${part.content}*` + : part.dynamic + ? `:${part.content}` + : part.content + ) + .join('') + ) + .join('/'); + + let source, destination; + + if (_config.trailingSlash === 'always') { + source = path; + destination = path + '/'; + } else { + source = path + '/'; + destination = path; + } + + return { source, destination, statusCode: 308 }; + }) : undefined, rewrites: staticRoutes.map((route) => { let source = route.pathname as string; - if (_config.trailingSlash === 'always' && !source.endsWith('/')) { + if ( + route.type === 'page' && + _config.trailingSlash === 'always' && + !source.endsWith('/') + ) { source += '/'; } |