revert _resetModuleScope and update test imports

Author: chaance

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

@@ -28,9 +28,11 @@ import {
   useSubmit,
   useFetcher,
   useFetchers,
-  UNSAFE_resetModuleScope,
   UNSAFE_DataRouterStateContext,
-} from "../index";
+} from "react-router-dom";
+
+// Private API
+import { _resetModuleScope } from "../../react-router/lib/components";
 
 testDomRouter("<DataBrowserRouter>", DataBrowserRouter, (url) =>
   getWindowImpl(url, false)
@@ -40,7 +42,11 @@ testDomRouter("<DataHashRouter>", DataHashRouter, (url) =>
   getWindowImpl(url, true)
 );
 
-function testDomRouter(name, TestDataRouter, getWindow) {
+function testDomRouter(
+  name: string,
+  TestDataRouter: typeof DataBrowserRouter,
+  getWindow: (initialUrl: string, isHash?: boolean) => Window
+) {
   describe(name, () => {
     let consoleWarn: jest.SpyInstance;
     let consoleError: jest.SpyInstance;
@@ -52,7 +58,7 @@ function testDomRouter(name, TestDataRouter, getWindow) {
     afterEach(() => {
       consoleWarn.mockRestore();
       consoleError.mockRestore();
-      UNSAFE_resetModuleScope();
+      _resetModuleScope();
     });
 
     it("renders the first route that matches the URL", () => {

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

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

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

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

packages/react-router-dom/index.tsx

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

packages/react-router-native/index.tsx

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

packages/react-router/__tests__/DataMemoryRouter-test.tsx

@@ -11,7 +11,7 @@ import "@testing-library/jest-dom";
 import type { FormMethod, Router } from "@remix-run/router";
 import { createMemoryRouter } from "@remix-run/router";
 
-import type { DataMemoryRouterProps } from "../index";
+import type { DataMemoryRouterProps } from "react-router";
 import {
   DataMemoryRouter,
   MemoryRouter,
@@ -27,8 +27,10 @@ import {
   useRenderDataRouter,
   useRevalidator,
   UNSAFE_DataRouterContext,
-  UNSAFE_resetModuleScope,
-} from "../index";
+} from "react-router";
+
+// Private API
+import { _resetModuleScope } from "../lib/components";
 
 describe("<DataMemoryRouter>", () => {
   let consoleWarn: jest.SpyInstance;
@@ -41,7 +43,7 @@ describe("<DataMemoryRouter>", () => {
   afterEach(() => {
     consoleWarn.mockRestore();
     consoleError.mockRestore();
-    UNSAFE_resetModuleScope();
+    _resetModuleScope();
   });
 
   it("renders the first route that matches the URL", () => {

packages/react-router/index.ts

@@ -53,7 +53,6 @@ import {
   Router,
   Routes,
   useRenderDataRouter,
-  _resetModuleScope,
 } from "./lib/components";
 import type { Navigator, NavigateOptions } from "./lib/context";
 import {
@@ -186,6 +185,5 @@ export {
   RouteContext as UNSAFE_RouteContext,
   DataRouterContext as UNSAFE_DataRouterContext,
   DataRouterStateContext as UNSAFE_DataRouterStateContext,
-  _resetModuleScope as UNSAFE_resetModuleScope,
   useRenderDataRouter,
 };

packages/router/__tests__/browser-test.ts

@@ -4,8 +4,8 @@
 
 import { JSDOM } from "jsdom";
 
-import type { BrowserHistory } from "../history";
-import { createBrowserHistory } from "../history";
+import type { BrowserHistory } from "@remix-run/router";
+import { createBrowserHistory } from "@remix-run/router";
 
 import InitialLocationDefaultKey from "./TestSequences/InitialLocationDefaultKey";
 import Listen from "./TestSequences/Listen";

packages/router/__tests__/create-path-test.ts

@@ -1,4 +1,4 @@
-import { createPath } from "../history";
+import { createPath } from "@remix-run/router";
 
 describe("createPath", () => {
   describe("given only a pathname", () => {

packages/router/__tests__/hash-base-test.ts

@@ -4,8 +4,8 @@
 
 import { JSDOM } from "jsdom";
 
-import type { HashHistory } from "../history";
-import { createHashHistory } from "../history";
+import type { HashHistory } from "@remix-run/router";
+import { createHashHistory } from "@remix-run/router";
 
 describe("a hash history on a page with a <base> tag", () => {
   let history: HashHistory;