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.

Sign up for GitHub

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

Jump to bottom

feat: rerouting in the middleware #10853

Merged
merged 13 commits into from
Apr 23, 2024
Merged

feat: rerouting in the middleware #10853

merged 13 commits into from
Apr 23, 2024

Conversation

ematipico
Copy link
Member

@ematipico ematipico commented Apr 23, 2024 •
edited
Loading

Changes

This is part of withastro/roadmap#901

This PR adds some new logic around the middleware.

The next function now can accept a ReroutePayload, and the sequence function will modify - inline - the current context with the new Request.

Important

Due to some architectural contains, we can't recreate APIContext.params because we don't have a RouteData object. Please also check relative section for more information

Testing

I added a couple of cases to show how the middleware works.

Docs

N/A

@ematipico
feat: implement reroute in dev (#10818)
ba505e3 
* chore: implement reroute in dev

* chore: revert naming change

* chore: conditionally create the new request

* chore: handle error

* remove only

* remove only

* chore: add tests and remove logs

* chore: fix regression

* chore: fix regression route matching

* chore: remove unwanted test
@ematipico
feat: reroute in SSG (#10843)
8e32ed8 
* feat: rerouting in ssg

* linting
@ematipico
feat: rerouting in ssg
1d4f902
@ematipico
linting
8da194d
@ematipico
feat: reroute for SSR
b9265f8
@ematipico
Merge branch 'feat/reroute' into feat/reroute-ssr
4c6c61f
@ematipico
fix rebase
e7eb213
@ematipico
fix merge issue
242ba26
@ematipico
feat: implement the next(payload) feature for rerouting
49a2290
@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Apr 23, 2024 •
edited
Loading

⚠️ No Changeset found

Latest commit: 05643f8

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@github-actions github-actions bot added pkg: astro Related to the core `astro` package (scope) pr: docs A PR that includes documentation for review labels Apr 23, 2024
@ematipico ematipico marked this pull request as ready for review April 23, 2024 14:17
@ematipico ematipico changed the title feat: implement reroute in dev (#10818) feat: rerouting in the middleware Apr 23, 2024
bluwy
bluwy approved these changes Apr 23, 2024
View reviewed changes
Copy link
Member

@bluwy bluwy left a comment

Choose a reason for hiding this comment

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

Logic seems good to me 👍

packages/astro/src/core/middleware/sequence.ts Outdated Show resolved Hide resolved
@ematipico @bluwy
Apply suggestions from code review
05643f8 
Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>
@ematipico ematipico merged commit 1e7cafc into feat/reroute Apr 23, 2024
14 checks passed
@ematipico ematipico deleted the feat/reroute-middleware branch April 23, 2024 16:52
ematipico added a commit that referenced this pull request Apr 24, 2024
@ematipico @bluwy
feat: rerouting in the middleware (#10853)
a5c474b 
* feat: implement reroute in dev (#10818)

* chore: implement reroute in dev

* chore: revert naming change

* chore: conditionally create the new request

* chore: handle error

* remove only

* remove only

* chore: add tests and remove logs

* chore: fix regression

* chore: fix regression route matching

* chore: remove unwanted test

* feat: reroute in SSG (#10843)

* feat: rerouting in ssg

* linting

* feat: rerouting in ssg

* linting

* feat: reroute for SSR

* fix rebase

* fix merge issue

* feat: implement the `next(payload)` feature for rerouting

* chore: revert code

* chore: fix code

* Apply suggestions from code review

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>

---------

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>
ematipico added a commit that referenced this pull request May 6, 2024
@ematipico @bluwy
feat: rerouting in the middleware (#10853)
51d9d9a 
* feat: implement reroute in dev (#10818)

* chore: implement reroute in dev

* chore: revert naming change

* chore: conditionally create the new request

* chore: handle error

* remove only

* remove only

* chore: add tests and remove logs

* chore: fix regression

* chore: fix regression route matching

* chore: remove unwanted test

* feat: reroute in SSG (#10843)

* feat: rerouting in ssg

* linting

* feat: rerouting in ssg

* linting

* feat: reroute for SSR

* fix rebase

* fix merge issue

* feat: implement the `next(payload)` feature for rerouting

* chore: revert code

* chore: fix code

* Apply suggestions from code review

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>

---------

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>
ematipico added a commit that referenced this pull request May 7, 2024
@ematipico @bluwy
feat: rerouting in the middleware (#10853)
5621a91 
* feat: implement reroute in dev (#10818)

* chore: implement reroute in dev

* chore: revert naming change

* chore: conditionally create the new request

* chore: handle error

* remove only

* remove only

* chore: add tests and remove logs

* chore: fix regression

* chore: fix regression route matching

* chore: remove unwanted test

* feat: reroute in SSG (#10843)

* feat: rerouting in ssg

* linting

* feat: rerouting in ssg

* linting

* feat: reroute for SSR

* fix rebase

* fix merge issue

* feat: implement the `next(payload)` feature for rerouting

* chore: revert code

* chore: fix code

* Apply suggestions from code review

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>

---------

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>
ematipico added a commit that referenced this pull request May 8, 2024
@ematipico @bluwy
@sarah11918 @matthewp @bholmesdev
feat: rewriting (experimental) (#10867)
47877a7 
* feat: implement reroute in dev (#10818)

* chore: implement reroute in dev

* chore: revert naming change

* chore: conditionally create the new request

* chore: handle error

* remove only

* remove only

* chore: add tests and remove logs

* chore: fix regression

* chore: fix regression route matching

* chore: remove unwanted test

* feat: reroute in SSG (#10843)

* feat: rerouting in ssg

* linting

* feat: reroute for SSR (#10845)

* feat: implement reroute in dev (#10818)

* chore: implement reroute in dev

* chore: revert naming change

* chore: conditionally create the new request

* chore: handle error

* remove only

* remove only

* chore: add tests and remove logs

* chore: fix regression

* chore: fix regression route matching

* chore: remove unwanted test

* feat: reroute in SSG (#10843)

* feat: rerouting in ssg

* linting

* feat: rerouting in ssg

* linting

* feat: reroute for SSR

* fix rebase

* fix merge issue

* feat: rerouting in the middleware (#10853)

* feat: implement reroute in dev (#10818)

* chore: implement reroute in dev

* chore: revert naming change

* chore: conditionally create the new request

* chore: handle error

* remove only

* remove only

* chore: add tests and remove logs

* chore: fix regression

* chore: fix regression route matching

* chore: remove unwanted test

* feat: reroute in SSG (#10843)

* feat: rerouting in ssg

* linting

* feat: rerouting in ssg

* linting

* feat: reroute for SSR

* fix rebase

* fix merge issue

* feat: implement the `next(payload)` feature for rerouting

* chore: revert code

* chore: fix code

* Apply suggestions from code review

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>

---------

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>

* feat: rerouting

* chore: rename to `rewrite`

* chore: better error message

* chore: update the chageset

* Apply suggestions from code review

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>

* chore: update docs based on feedback

* lock file

* Apply suggestions from code review

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
Co-authored-by:  Matthew Phillips <matthew@skypack.dev>
Co-authored-by: Ben Holmes <hey@bholmes.dev>

* feedback

* rename

* add tests for 404

* revert change

* fix regression

* Update .changeset/pink-ligers-share.md

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>

---------

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
Co-authored-by: Matthew Phillips <matthew@skypack.dev>
Co-authored-by: Ben Holmes <hey@bholmes.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewp matthewp matthewp approved these changes

@bluwy bluwy bluwy approved these changes

Assignees
No one assigned
Labels
pkg: astro Related to the core `astro` package (scope) pr: docs A PR that includes documentation for review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ematipico @matthewp @bluwy