Merge master into vlk/split-out-api-overview (PR #1226)#1240
Merged
jderochervlk merged 7 commits intovlk/split-out-api-overviewfrom Apr 9, 2026
Merged
Merge master into vlk/split-out-api-overview (PR #1226)#1240jderochervlk merged 7 commits intovlk/split-out-api-overviewfrom
jderochervlk merged 7 commits intovlk/split-out-api-overviewfrom
Conversation
* ci: allow dependabot PRs to deploy via pull_request_target GitHub restricts secrets for pull_request events triggered by dependabot[bot]. Switch dependabot PRs to pull_request_target, which runs in the base branch context and has access to secrets. - Add pull_request_target trigger - Route dependabot PRs through pull_request_target only - Route all other PRs through pull_request only (no double runs) - Checkout PR head SHA for pull_request_target events * Update .github/workflows/deploy.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * bypass cloudflare * Simplify deploy job condition in workflow file * Fix conditional syntax in deploy workflow steps --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…ution override (#1236) * Initial plan * fix: upgrade marked to 4.0.10 via resolutions to fix ReDoS (GHSA-5v2h-r2cx-5xgj) Agent-Logs-Url: https://github.com/rescript-lang/rescript-lang.org/sessions/9eb986e6-cb64-40d5-ac83-ff5bdd72d561 Co-authored-by: jderochervlk <60623931+jderochervlk@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jderochervlk <60623931+jderochervlk@users.noreply.github.com>
- Create CommunityRoute.res with dedicated loader and community sidebar - Register communityRoutes in routes.res, filter community from mdxRoutes - Remove communityTableOfContents, community branches from MdxRoute
) * Add Cypress E2E testing with ReScript bindings and CI integration - Add Cypress config and support files for E2E tests - Add ReScript bindings for Cypress in e2e/bindings - Add navigation E2E test in e2e/Navigation_.cy.res - Update .gitignore for e2e artifacts - Add Cypress and E2E scripts to package.json - Add e2e to rescript.json dev sources - Update GitHub Actions to run E2E tests after deploy * Use Cypress GitHub Action for E2E tests in deploy workflow * pr feedback * wait again * configure retries * change type name
…r-into-1226 Co-authored-by: jderochervlk <60623931+jderochervlk@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Merge master into branch 1226
Merge master into vlk/split-out-api-overview (PR #1226)
Apr 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR #1226 had diverged from
master. This mergesmasterinto the branch to bring it up to date before review/merge.Commits pulled from master
CommunityRoutesplit fromMdxRoute(feat: split community pages out of MdxRoute into CommunityRoute #1223) +.resifix (fix: Add .resi file for CommunityRoute.jsx #1238) — parallel refactor to the same area as this PRmarkedReDoS patch (CVE-2022-21681) via Yarn resolution override (fix: patch marked ReDoS vulnerability (CVE-2022-21681) via Yarn resolution override #1236)No conflicts —
app/routes.resandapp/routes/MdxRoute.resauto-merged cleanly.