Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-03-10 23:01:26 -05:00
Code Issues Activity

fix(vercel): trailingSlash fix for non-html pages (#3185)

Browse source 
* fix(vercel): `trailingSlash` fix for non-html pages

* Changeset
This commit is contained in:
Juan Martín Seery 2022-04-26 17:00:26 -03:00 • committed by GitHub
parent 92eb642434
commit 9e7ac1ce00
1 changed files with 37 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
packages/integrations/vercel/src/index.ts
View file

@ -88,39 +88,47 @@ export default function vercel(): AstroIntegration {
basePath: '/', basePath: '/',
pages404: false, pages404: false,
redirects: redirects:
// Extracted from Next.js v12.1.5 _config.trailingSlash !== 'ignore'
_config.trailingSlash === 'always' ? routes
? [ .filter((route) => route.type === 'page' && !route.pathname?.endsWith('/'))
{ .map((route) => {
source: '/:file((?!\\.well-known(?:/.*)?)(?:[^/]+/)*[^/]+\\.\\w+)/', const path =
destination: '/:file', '/' +
internal: true, route.segments
statusCode: 308, .map((segments) =>
regex: '^(?:/((?!\\.well-known(?:/.*)?)(?:[^/]+/)*[^/]+\\.\\w+))/$', segments
}, .map((part) =>
{ part.spread
source: '/:notfile((?!\\.well-known(?:/.*)?)(?:[^/]+/)*[^/\\.]+)', ? `:${part.content}*`
destination: '/:notfile/', : part.dynamic
internal: true, ? `:${part.content}`
statusCode: 308, : part.content
regex: '^(?:/((?!\\.well-known(?:/.*)?)(?:[^/]+/)*[^/\\.]+))$', )
}, .join('')
] )
: _config.trailingSlash === 'never' .join('/');
? [
{ let source, destination;
source: '/:path+/',
destination: '/:path+', if (_config.trailingSlash === 'always') {
internal: true, source = path;
statusCode: 308, destination = path + '/';
regex: '^(?:/((?:[^/]+?)(?:/(?:[^/]+?))*))/$', } else {
}, source = path + '/';
] destination = path;
}
return { source, destination, statusCode: 308 };
})
: undefined, : undefined,
rewrites: staticRoutes.map((route) => { rewrites: staticRoutes.map((route) => {
let source = route.pathname as string; let source = route.pathname as string;
if (_config.trailingSlash === 'always' && !source.endsWith('/')) { if (
route.type === 'page' &&
_config.trailingSlash === 'always' &&
!source.endsWith('/')
) {
source += '/'; source += '/';
} }