Merge v7 to dev #11768

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

Merged

Parent: fix(vite): loadEnv before reading routes

brophdawg11 merged 2,031 commits into dev from v7

Jul 16, 2024

Contributor

brophdawg11 commented Jul 3, 2024 •

edited

Loading

Now that we don't have any more known features going in the 6.x release line (short of deprecation warnings, and stabilizing some flags), we can merge v7 to dev and continue prepping for the v7 prerelease from dev. This will allow us to do the final changesets setup in dev as well for the new @react-router/* packages.

We'll cut a v6 branch from HEADof dev before merging this
Anything needing to be released in v6 after this will be done as a "hotfix" off the v6 branch
v6 will never merge back into dev since we don't want to inherit changes like deprecation warnings
Functional changes released in v6 moving forward will need to be individually cherry-picked into dev

TODOs

Make sure this is merged with a Normal Merge, not a Squash Merge
Once merged, update the nightly releases to build from dev (6791fe5)
See if we need to update the "versions" dropdown on reactrouter.com to include a static v6.x link
- This can happen once v7 releases - since for now the default version will still come from main which is v6
Confirm we are able to do releases via changesets off the v6 branch

markdalgleish and others added 30 commits

February 29, 2024 07:22

Read Vite config in reveal/routes commands (#8916)

ba9e876

Co-authored-by: Matt Brophy <matt@brophy.org>

Bump router (#8936)

2b673d9

chore: Update version for release (pre) (#8937)

8d86630

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

chore: Update version for release (#8938)

73b2131

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Brophy <matt@brophy.org>

Merge branch 'release-next'

c0d3e4c

Merge branch 'release-next' into dev

ce4c075

Add Vite commands to CLI --help (#8939)

f601d2f

Vite: Fix build.sourcemap config support (#8965)

412c70d

Vite: Fix server.fs.allow with default entry (#8966)

8a549a4

Clean ?client-route=1 in build manifest (#8969)

c4e9787

Bump router (#8984)

fd5fb6d

Merge branch 'main' into release-next

7f88cd9

chore: Update version for release (pre) (#8985)

efef744

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Migrate to pnpm (#8848)

0be6718

Bump router (#9010)

43a1aee

chore: Update version for release (pre) (#9011)

0d64696

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

chore: Update version for release (#9012)

29f9dfe

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Brophy <matt@brophy.org>

Merge branch 'release-next' into dev

bf54911

Fix vite-ecosystem-ci integration (#8997)

ed23eb1

Add future flag for Single Fetch (#8773)

7b1f5de

Migrate Vite build test to Vite test helpers (#9076)

adc11ff

Fix SPA mode when single fetch is enabled (#9063)

861d948

Update single fetch logic when clientLoaders are present (#9073)

d711eb7

Scope single fetch headers calls to only loaded routes (#9085)

d8a3f7a

Promote Vite templates, nest classic templates (#9077)

3dd1a94

Fix webkit single fetch prefetching tests

6190214

fix: handle net new redirects created by handleDataRequest (#9104)

ad6455a

Use shared Jest config (#11362)

6b856bc

feat: use undici as fetch polyfill (#9106)

39565e8

chore: use undici / native node fetch (#11364)

e977d54

* chore: use undici / native node fetch * revert snapshot change

pcattori and others added 3 commits

July 2, 2024 14:09

Merge pull request #11765 from remix-run/pedro/define-route-remove-se…

ecd35cd

…rver-only-code defineRoute: remove server-only code

Use linked package bins in test templates (#11766)

520ab61

Merge branch 'dev' into v7

7fe0cb9

changeset-bot bot commented Jul 3, 2024 •

edited

Loading

🦋 Changeset detected

Latest commit: 7281167

The changes in this PR will be included in the next version bump.

Not sure what this means? Click here to learn what changesets are.

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

remix-cla-bot bot added the CLA Signed label

brophdawg11 marked this pull request as ready for review

July 16, 2024 14:42

brophdawg11 merged commit eed3ebd into dev

brophdawg11 deleted the v7 branch

July 16, 2024 14:51

Contributor

github-actions bot commented Jan 14, 2025

🤖 Hello there,

We just published version 6.28.2-pre.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

12 similar comments

Contributor

github-actions bot commented Jan 14, 2025

🤖 Hello there,

We just published version 6.28.2-pre.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

Contributor

github-actions bot commented Jan 14, 2025

🤖 Hello there,

We just published version 6.28.2-pre.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

Contributor

github-actions bot commented Jan 14, 2025

🤖 Hello there,

We just published version 6.28.2-pre.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

Contributor

github-actions bot commented Jan 14, 2025

🤖 Hello there,

We just published version 6.28.2-pre.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

Contributor

github-actions bot commented Jan 14, 2025

🤖 Hello there,

We just published version 6.28.2-pre.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

Contributor

github-actions bot commented Jan 14, 2025

🤖 Hello there,

We just published version 6.28.2-pre.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

Contributor

github-actions bot commented Jan 14, 2025

🤖 Hello there,

We just published version 6.28.2-pre.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

Contributor

github-actions bot commented Jan 14, 2025

🤖 Hello there,

We just published version 6.28.2-pre.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

Contributor

github-actions bot commented Jan 14, 2025

🤖 Hello there,

We just published version 6.28.2-pre.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

Contributor

github-actions bot commented Jan 14, 2025

🤖 Hello there,

We just published version 6.28.2-pre.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

Contributor

github-actions bot commented Jan 14, 2025

🤖 Hello there,

We just published version 6.28.2-pre.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

Contributor

github-actions bot commented Jan 14, 2025

🤖 Hello there,

We just published version 6.28.2-pre.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment