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

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

Merged
merged 1 commit into from
Dec 7, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
refactor(remix-react): use react-router-dom import instead of `reac… 
…t-router`
  • Loading branch information
@MichaelDeBoey
MichaelDeBoey committed Dec 7, 2022
commit 0ea52c2fdd7e4f89ced859a7d4a82343f594131a
4 changes: 0 additions & 4 deletions packages/remix-react/__tests__/transition-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1877,10 +1877,6 @@ describe("navigating with inflight fetchers", () => {
});
});

// describe("react-router", () => {
// it.todo("replaces pending locations even on a push");
// });

////////////////////////////////////////////////////////////////////////////////
type Deferred = ReturnType<typeof defer>;

Expand Down
2 changes: 1 addition & 1 deletion packages/remix-react/routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { ComponentType, ReactNode } from "react";
import * as React from "react";
import type { Params } from "react-router";
import type { Params } from "react-router-dom";

import type { RouteModules, ShouldReloadFunction } from "./routeModules";
import { loadRouteModule } from "./routeModules";
Expand Down