Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(vercel): clear artifacts from redirects #9287

Merged
merged 7 commits into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/nervous-chicken-allow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/vercel': patch
---

Fixes an issue where redirects did not work with the static adapter.
1 change: 1 addition & 0 deletions packages/astro/src/core/logger/core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export type LoggerLabel =
| 'watch'
| 'middleware'
| 'preferences'
| 'redirects'
// SKIP_FORMAT: A special label that tells the logger not to apply any formatting.
// Useful for messages that are already formatted, like the server start message.
| 'SKIP_FORMAT';
Expand Down
13 changes: 13 additions & 0 deletions packages/astro/src/core/routing/manifest/create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,19 @@ export function createRouteManifest(
.map(([{ dynamic, content }]) => (dynamic ? `[${content}]` : content))
.join('/')}`.toLowerCase();

{
let destination: string
if (typeof to === "string") {
destination = to
}
else {
destination = to.destination
}
if (/^https?:\/\//.test(destination)) {
logger.warn('redirects', `Redirecting to an external URL is not officially supported: ${from} -> ${to}`);
}
}

const routeData: RouteData = {
type: 'redirect',
route,
Expand Down
10 changes: 10 additions & 0 deletions packages/astro/test/redirects.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ describe('Astro.redirect', () => {
adapter: testAdapter(),
redirects: {
'/api/redirect': '/test',
'/external/redirect': 'https://example.com/',
},
});
await fixture.build();
Expand All @@ -27,6 +28,15 @@ describe('Astro.redirect', () => {
expect(response.headers.get('location')).to.equal('/login');
});

// ref: https://github.com/withastro/astro/pull/9287
it.skip('Ignores external redirect', async () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can this be unskipped with this test?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, because of the vt test which tests for the opposite.

const app = await fixture.loadTestAdapterApp();
const request = new Request('http://example.com/external/redirect');
const response = await app.render(request);
expect(response.status).to.equal(404);
expect(response.headers.get('location')).to.equal(null);
});

it('Warns when used inside a component', async () => {
const app = await fixture.loadTestAdapterApp();
const request = new Request('http://example.com/late');
Expand Down
3 changes: 1 addition & 2 deletions packages/integrations/vercel/src/lib/redirects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ function getMatchPattern(segments: RoutePart[][]) {
.map((segment) => {
return segment[0].spread
? '(?:\\/(.*?))?'
: '\\/' +
segment
: segment
.map((part) => {
if (part)
return part.dynamic
Expand Down
10 changes: 5 additions & 5 deletions packages/integrations/vercel/test/redirects.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,23 @@ describe('Redirects', () => {
it('define static routes', async () => {
const config = await getConfig();

const oneRoute = config.routes.find((r) => r.src === '/\\/one');
const oneRoute = config.routes.find((r) => r.src === '/one');
expect(oneRoute.headers.Location).to.equal('/');
expect(oneRoute.status).to.equal(301);

const twoRoute = config.routes.find((r) => r.src === '/\\/two');
const twoRoute = config.routes.find((r) => r.src === '/two');
expect(twoRoute.headers.Location).to.equal('/');
expect(twoRoute.status).to.equal(301);

const threeRoute = config.routes.find((r) => r.src === '/\\/three');
const threeRoute = config.routes.find((r) => r.src === '/three');
expect(threeRoute.headers.Location).to.equal('/');
expect(threeRoute.status).to.equal(302);
});

it('defines dynamic routes', async () => {
const config = await getConfig();

const blogRoute = config.routes.find((r) => r.src.startsWith('/\\/blog'));
const blogRoute = config.routes.find((r) => r.src.startsWith('/blog'));
expect(blogRoute).to.not.be.undefined;
expect(blogRoute.headers.Location.startsWith('/team/articles')).to.equal(true);
expect(blogRoute.status).to.equal(301);
Expand All @@ -57,7 +57,7 @@ describe('Redirects', () => {
it('define trailingSlash redirect for sub pages', async () => {
const config = await getConfig();

const subpathRoute = config.routes.find((r) => r.src === '/\\/subpage');
const subpathRoute = config.routes.find((r) => r.src === '/subpage');
expect(subpathRoute).to.not.be.undefined;
expect(subpathRoute.headers.Location).to.equal('/subpage/');
});
Expand Down
Loading