Merge branch 'dev' into release-6.4.3

Author: brophdawg11

.changeset/green-dragons-vanish.md

@@ -0,0 +1,5 @@
+---
+"@remix-run/router": patch
+---
+
+fix `createURL` in local file execution in Firefox ([#9464](https://github.com/remix-run/react-router/pull/9464))

.changeset/nine-apricots-notice.md

@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+`useRoutes` should be able to return `null` when passing `locationArg` ([#9485](https://github.com/remix-run/react-router/pull/9485))

.changeset/odd-kids-buy.md

@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+fix initialEntries type in createMemoryRouter

contributors.yml

@@ -1,6 +1,7 @@
 - abdallah-nour
 - abhi-kr-2100
 - adamdotjs
+- AchThomas
 - Ajayff4
 - alany411
 - alexlbr
@@ -27,6 +28,7 @@
 - codeape2
 - coryhouse
 - cvbuelow
+- danielberndt
 - dauletbaev
 - david-crespo
 - dokeet

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

@@ -75,6 +75,57 @@ describe("useRoutes", () => {
     `);
   });
 
+  it("returns null when no route matches", () => {
+    let routes = [{ path: "one", element: <h1>one</h1> }];
+
+    const NullRenderer = (props: { routes: RouteObject[] }) => {
+      const element = useRoutes(props.routes);
+      return element === null ? <div>is null</div> : <div>is not null</div>;
+    };
+
+    let renderer: TestRenderer.ReactTestRenderer;
+    TestRenderer.act(() => {
+      renderer = TestRenderer.create(
+        <MemoryRouter initialEntries={["/two"]}>
+          <NullRenderer routes={routes} />
+        </MemoryRouter>
+      );
+    });
+
+    expect(renderer.toJSON()).toMatchInlineSnapshot(`
+      <div>
+        is null
+      </div>
+    `);
+  });
+
+  it("returns null when no route matches and a `location` prop is passed", () => {
+    let routes = [{ path: "one", element: <h1>one</h1> }];
+
+    const NullRenderer = (props: {
+      routes: RouteObject[];
+      location?: Partial<Location> & { pathname: string };
+    }) => {
+      const element = useRoutes(props.routes, props.location);
+      return element === null ? <div>is null</div> : <div>is not null</div>;
+    };
+
+    let renderer: TestRenderer.ReactTestRenderer;
+    TestRenderer.act(() => {
+      renderer = TestRenderer.create(
+        <MemoryRouter initialEntries={["/two"]}>
+          <NullRenderer routes={routes} location={{ pathname: "/three" }} />
+        </MemoryRouter>
+      );
+    });
+
+    expect(renderer.toJSON()).toMatchInlineSnapshot(`
+      <div>
+        is null
+      </div>
+    `);
+  });
+
   describe("warns", () => {
     let consoleWarn: jest.SpyInstance;
     beforeEach(() => {

packages/react-router/index.ts

@@ -17,6 +17,7 @@ import type {
   Router as RemixRouter,
   ShouldRevalidateFunction,
   To,
+  InitialEntry,
 } from "@remix-run/router";
 import {
   AbortedDeferredError,
@@ -203,7 +204,7 @@ export function createMemoryRouter(
   opts?: {
     basename?: string;
     hydrationData?: HydrationState;
-    initialEntries?: string[];
+    initialEntries?: InitialEntry[];
     initialIndex?: number;
   }
 ): RemixRouter {

packages/react-router/lib/hooks.tsx

@@ -415,7 +415,7 @@ export function useRoutes(
   // When a user passes in a `locationArg`, the associated routes need to
   // be wrapped in a new `LocationContext.Provider` in order for `useLocation`
   // to use the scoped location instead of the global location.
-  if (locationArg) {
+  if (locationArg && renderedMatches) {
     return (
       <LocationContext.Provider
         value={{

packages/router/history.ts

@@ -540,8 +540,13 @@ export function parsePath(path: string): Partial<Path> {
 }
 
 export function createURL(location: Location | string): URL {
+  // window.location.origin is "null" (the literal string value) in Firefox
+  // under certain conditions, notably when serving from a local HTML file
+  // See https://bugzilla.mozilla.org/show_bug.cgi?id=878297
   let base =
-    typeof window !== "undefined" && typeof window.location !== "undefined"
+    typeof window !== "undefined" &&
+    typeof window.location !== "undefined" &&
+    window.location.origin !== "null"
       ? window.location.origin
       : "unknown://unknown";
   let href = typeof location === "string" ? location : createPath(location);