refactor(remix-react): upgrade Remix to `react-router-dom@6.4` (non-data-router) and drop `history` #4731

brophdawg11 · 2022-12-01T16:06:37Z

This upgrades Remix to use the latest react-router-dom@6.4.4 release for rendering without yet using the new RouterProvider. This still renders with StaticRouter on the server and and a raw Router on the client. The difference is that we're now using the new createBrowserHistory + v5Compat flag from @remix-run/router and we drop the history@5 dependency.

Subsequent releases will switch from StaticRouter/createBrowserHistory/Router to StaticRouterProvider/createBrowserRouter/RouterProvider

changeset-bot · 2022-12-01T16:06:41Z

🦋 Changeset detected

Latest commit: 32b8793

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

This PR includes changesets to release 17 packages

Name	Type
@remix-run/react	Patch
@remix-run/testing	Patch
create-remix	Patch
remix	Patch
@remix-run/architect	Patch
@remix-run/cloudflare	Patch
@remix-run/cloudflare-pages	Patch
@remix-run/cloudflare-workers	Patch
@remix-run/deno	Patch
@remix-run/dev	Patch
@remix-run/eslint-config	Patch
@remix-run/express	Patch
@remix-run/netlify	Patch
@remix-run/node	Patch
@remix-run/serve	Patch
@remix-run/server-runtime	Patch
@remix-run/vercel	Patch

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

brophdawg11 · 2022-12-01T16:09:00Z

packages/remix-react/browser.tsx

-import type { BrowserHistory, Update } from "history";
-import { createBrowserHistory } from "history";
+import type { BrowserHistory, Action, Location } from "@remix-run/router";
+import { createBrowserHistory } from "@remix-run/router";


Normally, @remix-run/react should be importing from react-router-dom. These are the only imports from @remix-run/router since history stuff isn't re-exported through react-router-dom since users aren't supposed to do manual history management in 6.4.

brophdawg11 · 2022-12-01T16:09:51Z

packages/remix-server-runtime/package.json

@@ -20,7 +20,6 @@
    "@types/cookie": "^0.4.0",
    "@web3-storage/multipart-parser": "^1.0.0",
    "cookie": "^0.4.1",
-    "react-router-dom": "6.3.0",


No longer needed in server-runtime, we can get everything we need from @remix-run/router

Co-authored-by: Mehdi Achour <machour@gmail.com>

* fix(remix-dev): convert `config.appDirectory` to relative unix path (#4709) * fix(remix-dev): convert appDirectory to unix style for fast-glob Signed-off-by: Logan McAnsh <logan@mcan.sh> * chore: relative path Signed-off-by: Logan McAnsh <logan@mcan.sh> * chore: add test Signed-off-by: Logan McAnsh <logan@mcan.sh> * fix test Signed-off-by: Logan McAnsh <logan@mcan.sh> * fix: typo Signed-off-by: Logan McAnsh <logan@mcan.sh> * chore: update test Signed-off-by: Logan McAnsh <logan@mcan.sh> Signed-off-by: Logan McAnsh <logan@mcan.sh> * chore: add changeset for #4709 (#4718) * ci: add typechecking for deno (#4715) * ci: add typechecking for deno * ci: install deno for integration tests * chore: format * chore: format * fix: Firefox LiveReload (#4725) Firefox infinitely reloads the page as long as `<LiveReload>` is rendering. Closes #4692 * fix(remix-dev): allow defining multiple routes for the same route module file (#3970) * Allow multiple routes for same route module * Update packages/remix-dev/config/routes.ts Co-authored-by: Andrew Leedham <AndrewLeedham@outlook.com> * Update routes.ts - Better name for automated ID variable; - Small adjust in `id` option comment; * - Removing redundant IF * Update routes.ts Revert complex custom ID in routes * Non unique custom routes ID error and test * Update assets.ts Trying to solve a conflict * Revert "Update assets.ts" This reverts commit 2064c57. * Error on collisions with non-custom routeIds * Create big-spoons-grab.md Co-authored-by: Andrew Leedham <AndrewLeedham@outlook.com> Co-authored-by: Matt Brophy <matt@brophy.org> * feat: Allow pass-through script props in `ScrollRestoration` (#2879) * ci(nightly): add deno for typechecking deno files (#4738) * ci: fix race condition writing globals.d.ts shim (#4717) Co-authored-by: Chance Strickland <hi@chance.dev> * chore: bump @playwright/test to latest (#4749) Signed-off-by: Logan McAnsh <logan@mcan.sh> Signed-off-by: Logan McAnsh <logan@mcan.sh> * Fix 4199: TypedResponse allows incompatible types (#4734) * Fixes #4199: Do not allow assignment of incompatible TypedResponses * Add myself to contributors.yml * Create light-sheep-give.md * slight changeset tweak * additional changeset tweaks Co-authored-by: Pedro Cattori <pcattori@gmail.com> * chore: format * test: add transition integration tests (#4739) test: useTransition to wait for states This approach could probably be applied across other flakey tests and could also be documented as a good approach of if there is user-feedback for a specific action when running integration tests. * feat: testing helpers (#4539) Co-authored-by: James Restall <james.restall@gmail.com> Signed-off-by: Logan McAnsh <logan@mcan.sh> * chore: format * chore(remix-testing): update dependencies (#4756) * fix(remix-testing): fix deps (#4757) * Fix deps for new remix-testing package * fix lint * Remove ENABLE_REMIX_ROUTER flags (#4732) * chore: add `@remix-run/testing` to changesets (#4781) * chore: add `@remix-run/testing` to changesets Signed-off-by: Logan McAnsh <logan@mcan.sh> * chore: update `ADDING_A_PACKAGE.md` Signed-off-by: Logan McAnsh <logan@mcan.sh> Signed-off-by: Logan McAnsh <logan@mcan.sh> * refactor(remix-react): upgrade Remix to `react-router-dom@6.4` (non-data-router) and drop `history` (#4731) * Bump remix to react-router-dom@6.4.4 (#4668) Co-authored-by: Mehdi Achour <machour@gmail.com> * Bump remix to RR 6.4.4 and drop history dependency (#4702) Co-authored-by: Mehdi Achour <machour@gmail.com> * ci(nightly): move git operations after build (#4797) * ci(nightly): move git operations after build when adding deno typechecking (#4715), nightly now refers to the version we just calculated which hasnt been published when trying to build and typecheck Signed-off-by: Logan McAnsh <logan@mcan.sh> * ci: update tmp branch name Signed-off-by: Logan McAnsh <logan@mcan.sh> Signed-off-by: Logan McAnsh <logan@mcan.sh> * perf(remix-dev): Optimize `parentRouteId` lookup in `defineConventionalRoutes` (#4538) * Use object for parentRouteId lookup * Sign CLA * Move parentRouteId logic to a separate function * Update test fixture path * chore: format * chore(dev): add changeset for PR #4538 (#4800) * chore: format * refactor(remix-react): use `react-router-dom` import instead of `react-router` (#3325) * chore: manually bump remix-testing version due to not being on main just yet Signed-off-by: Logan McAnsh <logan@mcan.sh> * fixup! chore: manually bump remix-testing version due to not being on main just yet * fixup! chore: manually bump remix-testing version due to not being on main just yet Signed-off-by: Logan McAnsh <logan@mcan.sh> * chore: unify error usage (#4696) * chore: format * Add fetcher state/type tests (#4803) * chore(deps): bump esbuild to latest (#4754) * chore: add invariant instead of using `!` Signed-off-by: Logan McAnsh <logan@mcan.sh> * chore(deps): bump esbuild to latest Signed-off-by: Logan McAnsh <logan@mcan.sh> * Create fresh-shrimps-join.md Signed-off-by: Logan McAnsh <logan@mcan.sh> Co-authored-by: Pedro Cattori <pcattori@gmail.com> * test(integration): close server synchronously (#4785) * chore: normalize afterAll Signed-off-by: Logan McAnsh <logan@mcan.sh> * test: close server synchronously Signed-off-by: Logan McAnsh <logan@mcan.sh> * chore: appFixture.close isnt async anymore Signed-off-by: Logan McAnsh <logan@mcan.sh> * Update integration/helpers/create-fixture.ts Co-authored-by: Pedro Cattori <pcattori@gmail.com> Signed-off-by: Logan McAnsh <logan@mcan.sh> Co-authored-by: Pedro Cattori <pcattori@gmail.com> * feat: remix optional segments (#4706) * feat: transform optional routes from remix to react router * Add to contributors * Add changeset * fix(optional-segments): fix escaping of parenthesis * small function fix * Update packages/remix-dev/__tests__/routesConvention-test.ts Co-authored-by: Pedro Cattori <pcattori@gmail.com> Co-authored-by: Pedro Cattori <pcattori@gmail.com> * chore: format * chore: edit the optional segments changeset (#4815) to make it clear that Remix won't support optional segments until integrated with React Router 6.5 * chore: format * docs: rearrange docs, give everything its own page (#4821) * chore: format * fix: wrong parentheses in the optional segments changeset (#4825) * fix: wrong parentheses in the optional segments changeset * add: akamfoad to the contributers * ci(nightly): add workflow_call for testing purposes Signed-off-by: Logan McAnsh <logan@mcan.sh> * Revert "ci(nightly): add workflow_call for testing purposes" This reverts commit f3fa77e. * chore(scripts): Use relaxed peer dependencies to avoid triggering major version bumps (#4736) - Add script to bump peer deps with changesets version Co-authored-by: Mateusz Burzyński <mateuszburzynski@gmail.com> * Add integration tests for request structures (#4829) * fix(remix-dev): resolve asset entry full path to support mono-repo import of styles (#4855) * chore: have eslint report unused eslint comments (#4863) * chore: have eslint report unused eslint comments Signed-off-by: Logan McAnsh <logan@mcan.sh> * chore: remove additional comment Signed-off-by: Logan McAnsh <logan@mcan.sh> * perf(remix-architect,remix-netlify): improve performance of `isBinaryType` (#4761) Co-authored-by: Logan McAnsh <logan@mcan.sh> Co-authored-by: Pannatier Guillaume <Guillaume.Pannatier@hopitalvs.ch> * chore: format * chore(remix-testing): remove internal installGlobals (#4755) * chore: remove internal installGlobals Signed-off-by: Logan McAnsh <logan@mcan.sh> * chore: add README Signed-off-by: Logan McAnsh <logan@mcan.sh> * Create quick-cats-fix.md * Update .changeset/quick-cats-fix.md Co-authored-by: Michaël De Boey <info@michaeldeboey.be> * chore(deps): remove jsdom and happydom from devDependencies Signed-off-by: Logan McAnsh <logan@mcan.sh> Signed-off-by: Logan McAnsh <logan@mcan.sh> Co-authored-by: Michaël De Boey <info@michaeldeboey.be> * fix(dev): build js modules for ts->js conversion The TS->JS migration was removed from the CLI codemod options, but still used for TS->JS conversion when creating a new Remix project from the CLI. The TS modules responsible for the TS->JS conversion were incorrectly removed from the Rollup build, resulting in the corresponding built JS modules being absent. That caused the CLI to error when trying to perform TS->JS conversion. This changes reintroduces the wiring to build the modules responsible for the TS->JS conversion. Fixes #4854 Signed-off-by: Logan McAnsh <logan@mcan.sh> Co-authored-by: Logan McAnsh <logan@mcan.sh> Co-authored-by: Matt Kane <m@mk.gg> Co-authored-by: Remix Run Bot <hello@remix.run> Co-authored-by: Chance Strickland <hi@chance.dev> Co-authored-by: Ryan Florence <rpflorence@gmail.com> Co-authored-by: Lucas Ferreira <panchorf@gmail.com> Co-authored-by: Andrew Leedham <AndrewLeedham@outlook.com> Co-authored-by: Matt Brophy <matt@brophy.org> Co-authored-by: dabdine <1955040+dabdine@users.noreply.github.com> Co-authored-by: Jacob Ebey <jacob.ebey@live.com> Co-authored-by: James Restall <james.restall@gmail.com> Co-authored-by: Michaël De Boey <info@michaeldeboey.be> Co-authored-by: Mehdi Achour <machour@gmail.com> Co-authored-by: Dylan Markow <dylan@dylanmarkow.com> Co-authored-by: Daniel Rios <ieldanr@gmail.com> Co-authored-by: Akam Foad <41629832+akamfoad@users.noreply.github.com> Co-authored-by: Mateusz Burzyński <mateuszburzynski@gmail.com> Co-authored-by: Guillaume Pannatier <guillaume.pannatier@gmail.com> Co-authored-by: Pannatier Guillaume <Guillaume.Pannatier@hopitalvs.ch>

remix-cla-bot bot added the CLA Signed label Dec 1, 2022

brophdawg11 commented Dec 1, 2022

View reviewed changes

brophdawg11 force-pushed the brophdawg11/rr-6-4-non-data branch 2 times, most recently from 99e60c2 to 902bdbd Compare December 1, 2022 16:19

mcansh approved these changes Dec 1, 2022

View reviewed changes

brophdawg11 and others added 2 commits December 2, 2022 18:36

Bump remix to react-router-dom@6.4.4 (#4668)

c7770aa

Co-authored-by: Mehdi Achour <machour@gmail.com>

Bump remix to RR 6.4.4 and drop history dependency (#4702)

32b8793

brophdawg11 force-pushed the brophdawg11/rr-6-4-non-data branch from 902bdbd to 32b8793 Compare December 2, 2022 23:36

MichaelDeBoey changed the title ~~Upgrade Remix to React Router 6.4 (non-data-router) and drop history~~ refactor(remix-react): upgrade Remix to react-router-dom@6.4 (non-data-router) and drop history Dec 2, 2022

MichaelDeBoey added package:server-runtime renderer:react labels Dec 2, 2022

MichaelDeBoey approved these changes Dec 2, 2022

View reviewed changes

brophdawg11 merged commit 7e54f4d into dev Dec 7, 2022

brophdawg11 deleted the brophdawg11/rr-6-4-non-data branch December 7, 2022 16:18

github-actions bot added the awaiting release This issue has been fixed and will be released soon label Dec 7, 2022

This was referenced Dec 7, 2022

refactor(remix-server-runtime): remove react & react-dom from peerDependencies #4801

Merged

refactor(remix-react): use react-router-dom import instead of react-router #3325

Merged

This was referenced Dec 13, 2022

chore: Update version for release (pre) #4858

Closed

chore: Update version for release (pre) #4869

Closed

chore: Update version for release (pre) #4871

Merged

remix-run-bot mentioned this pull request Dec 16, 2022

chore: Update version for release #4893

Merged

mcansh mentioned this pull request Jan 10, 2023

chore: Update version for release (pre) #5050

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(remix-react): upgrade Remix to `react-router-dom@6.4` (non-data-router) and drop `history` #4731

refactor(remix-react): upgrade Remix to `react-router-dom@6.4` (non-data-router) and drop `history` #4731

brophdawg11 commented Dec 1, 2022 •

edited

changeset-bot bot commented Dec 1, 2022 •

edited

brophdawg11 Dec 1, 2022

brophdawg11 Dec 1, 2022

refactor(remix-react): upgrade Remix to react-router-dom@6.4 (non-data-router) and drop history #4731

refactor(remix-react): upgrade Remix to react-router-dom@6.4 (non-data-router) and drop history #4731

Conversation

brophdawg11 commented Dec 1, 2022 • edited

changeset-bot bot commented Dec 1, 2022 • edited

🦋 Changeset detected

brophdawg11 Dec 1, 2022

Choose a reason for hiding this comment

brophdawg11 Dec 1, 2022

Choose a reason for hiding this comment

refactor(remix-react): upgrade Remix to `react-router-dom@6.4` (non-data-router) and drop `history` #4731

refactor(remix-react): upgrade Remix to `react-router-dom@6.4` (non-data-router) and drop `history` #4731

brophdawg11 commented Dec 1, 2022 •

edited

changeset-bot bot commented Dec 1, 2022 •

edited