fix import issues in tests

Author: chaance

packages/react-router-dom/__tests__/DataBrowserRouter-test.tsx

@@ -16,21 +16,21 @@ import "@testing-library/jest-dom";
 import {
   DataBrowserRouter,
   DataHashRouter,
+  Form,
+  Link,
   Route,
   Outlet,
   useLoaderData,
   useActionData,
   useRouteError,
+  useNavigate,
   useNavigation,
-  Form,
-  Link,
   useSubmit,
   useFetcher,
   useFetchers,
+  UNSAFE_resetModuleScope,
+  UNSAFE_DataRouterStateContext,
 } from "../index";
-import { _resetModuleScope } from "react-router/lib/components";
-import { useNavigate } from "react-router/lib/hooks";
-import { UNSAFE_DataRouterStateContext } from "react-router";
 
 testDomRouter("<DataBrowserRouter>", DataBrowserRouter, (url) =>
   getWindowImpl(url, false)
@@ -52,7 +52,7 @@ function testDomRouter(name, TestDataRouter, getWindow) {
     afterEach(() => {
       consoleWarn.mockRestore();
       consoleError.mockRestore();
-      _resetModuleScope();
+      UNSAFE_resetModuleScope();
     });
 
     it("renders the first route that matches the URL", () => {

packages/react-router-dom/__tests__/data-static-router-test.tsx

@@ -1,9 +1,13 @@
 import * as React from "react";
 import * as ReactDOMServer from "react-dom/server";
-import { Route, useLocation } from "react-router-dom";
-import { DataStaticRouter } from "react-router-dom/server";
-import { Outlet } from "react-router/lib/components";
-import { useLoaderData, useMatches } from "react-router/lib/hooks";
+import {
+  Route,
+  Outlet,
+  useLoaderData,
+  useLocation,
+  useMatches,
+} from "../index";
+import { DataStaticRouter } from "../server";
 
 beforeEach(() => {
   jest.spyOn(console, "warn").mockImplementation(() => {});

packages/react-router-dom/__tests__/nav-link-active-test.tsx

@@ -14,8 +14,8 @@ import {
   NavLink,
   Outlet,
   DataBrowserRouter,
-} from "react-router-dom";
-import { _resetModuleScope } from "react-router/lib/components";
+  UNSAFE_resetModuleScope,
+} from "../index";
 
 describe("NavLink", () => {
   describe("when it does not match", () => {
@@ -327,7 +327,7 @@ describe("NavLink", () => {
 
 describe("NavLink using a data router", () => {
   afterEach(() => {
-    _resetModuleScope();
+    UNSAFE_resetModuleScope();
   });
 
   it("applies the default 'active'/'pending' classNames to the underlying <a>", async () => {

packages/react-router-dom/index.tsx

@@ -153,6 +153,7 @@ export {
   UNSAFE_RouteContext,
   UNSAFE_DataRouterContext,
   UNSAFE_DataRouterStateContext,
+  UNSAFE_resetModuleScope,
   useRenderDataRouter,
 } from "react-router";
 //#endregion

packages/react-router-native/__tests__/deep-linking-test.tsx

@@ -2,12 +2,7 @@ import * as React from "react";
 import { mocked } from "ts-jest/utils";
 import { Linking as _Linking, Text, View } from "react-native";
 import * as TestRenderer from "react-test-renderer";
-import {
-  NativeRouter,
-  Routes,
-  Route,
-  useDeepLinking,
-} from "react-router-native";
+import { NativeRouter, Routes, Route, useDeepLinking } from "../index";
 import { MockEvent, mockPromiseThatResolvesImmediatelyWith } from "./utils";
 
 // Ensures TypeScript understands that Linking is a mock

packages/react-router-native/__tests__/exports-test.tsx

@@ -1,5 +1,5 @@
 import * as ReactRouter from "react-router";
-import * as ReactRouterNative from "react-router-native";
+import * as ReactRouterNative from "../index";
 
 describe("react-router-native", () => {
   for (let key in ReactRouter) {

packages/react-router-native/__tests__/link-press-test.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { Text, TouchableHighlight, View } from "react-native";
-import { Link, NativeRouter, Routes, Route } from "react-router-native";
+import { Link, NativeRouter, Routes, Route } from "../index";
 import * as TestRenderer from "react-test-renderer";
 
 import { press } from "./utils";

packages/react-router-native/__tests__/search-params-test.tsx

@@ -1,11 +1,6 @@
 import * as React from "react";
 import { View, Text, TextInput } from "react-native";
-import {
-  NativeRouter,
-  Routes,
-  Route,
-  useSearchParams,
-} from "react-router-native";
+import { NativeRouter, Routes, Route, useSearchParams } from "../index";
 import * as TestRenderer from "react-test-renderer";
 
 describe("useSearchParams", () => {

packages/react-router-native/__tests__/useLinkPressHandler-test.tsx

@@ -1,12 +1,7 @@
 import * as React from "react";
 import { Text, TouchableHighlight, View } from "react-native";
-import type { LinkProps } from "react-router-native";
-import {
-  NativeRouter,
-  Route,
-  Routes,
-  useLinkPressHandler,
-} from "react-router-native";
+import type { LinkProps } from "../index";
+import { NativeRouter, Route, Routes, useLinkPressHandler } from "../index";
 import * as TestRenderer from "react-test-renderer";
 
 import { press } from "./utils";

packages/react-router-native/index.tsx

@@ -117,6 +117,7 @@ export {
   UNSAFE_RouteContext,
   UNSAFE_DataRouterContext,
   UNSAFE_DataRouterStateContext,
+  UNSAFE_resetModuleScope,
   useRenderDataRouter,
 } from "react-router";