Test updates

Author: brophdawg11

packages/react-router/__tests__/router/instrumentation-test.ts

@@ -1899,7 +1899,7 @@ describe("instrumentation", () => {
         },
       );
       let handler = createRequestHandler(build);
-      let response = await handler(new Request("http://localhost/"));
+      let response = await handler(new Request("http://localhost/"), {});
 
       expect(await response.text()).toBe("GET http://localhost/ COMPONENT");
       expect(spy.mock.calls).toEqual([
@@ -1913,9 +1913,7 @@ describe("instrumentation", () => {
                 get: expect.any(Function),
               },
             },
-            context: {
-              get: expect.any(Function),
-            },
+            context: {},
           },
         ],
         ["loader"],
@@ -1929,9 +1927,7 @@ describe("instrumentation", () => {
                 get: expect.any(Function),
               },
             },
-            context: {
-              get: expect.any(Function),
-            },
+            context: {},
           },
         ],
       ]);
@@ -2071,9 +2067,7 @@ describe("instrumentation", () => {
             },
             params: {},
             unstable_pattern: "/",
-            context: {
-              get: expect.any(Function),
-            },
+            context: {},
           },
         ],
         ["loader"],
@@ -2089,9 +2083,7 @@ describe("instrumentation", () => {
             },
             params: {},
             unstable_pattern: "/",
-            context: {
-              get: expect.any(Function),
-            },
+            context: {},
           },
         ],
       ]);
@@ -2148,9 +2140,7 @@ describe("instrumentation", () => {
             },
             params: {},
             unstable_pattern: "/",
-            context: {
-              get: expect.any(Function),
-            },
+            context: {},
           },
         ],
         ["action"],
@@ -2166,9 +2156,7 @@ describe("instrumentation", () => {
             },
             params: {},
             unstable_pattern: "/",
-            context: {
-              get: expect.any(Function),
-            },
+            context: {},
           },
         ],
       ]);

packages/react-router/lib/router/instrumentation.ts

@@ -133,7 +133,7 @@ type RequestHandlerInstrumentations = {
 
 type RequestHandlerInstrumentationInfo = Readonly<{
   request: ReadonlyRequest;
-  context: ReadonlyContext;
+  context: ReadonlyContext | undefined;
 }>;
 
 const UninstrumentedSymbol = Symbol("Uninstrumented");
@@ -351,7 +351,7 @@ export function instrumentHandler(
       let [request, context] = args as Parameters<RequestHandler>;
       return {
         request: getReadonlyRequest(request),
-        context: getReadonlyContext(context),
+        context: context != null ? getReadonlyContext(context) : context,
       } satisfies RequestHandlerInstrumentationInfo;
     }) as RequestHandler;
   }
@@ -483,27 +483,21 @@ function getReadonlyRequest(request: Request): {
 }
 
 function getReadonlyContext(
-  context:
-    | (MiddlewareEnabled extends true ? RouterContextProvider : AppLoadContext)
-    // Context can be undefined in the request handler instrumentation case
-    | null
-    | undefined,
+  context: MiddlewareEnabled extends true
+    ? RouterContextProvider
+    : AppLoadContext,
 ): MiddlewareEnabled extends true
   ? Pick<RouterContextProvider, "get">
   : Readonly<AppLoadContext> {
   if (isPlainObject(context)) {
-    let frozen = context ? { ...context } : {};
+    let frozen = { ...context };
     Object.freeze(frozen);
     return frozen;
   } else {
-    return context
-      ? {
-          get: <T>(ctx: RouterContext<T>) =>
-            (context as unknown as RouterContextProvider).get(ctx),
-        }
-      : {
-          get: () => undefined,
-        };
+    return {
+      get: <T>(ctx: RouterContext<T>) =>
+        (context as unknown as RouterContextProvider).get(ctx),
+    };
   }
 }
 
@@ -515,6 +509,9 @@ const objectProtoNames = Object.getOwnPropertyNames(Object.prototype)
 function isPlainObject(
   thing: unknown,
 ): thing is Record<string | number | symbol, unknown> {
+  if (thing === null || typeof thing !== "object") {
+    return false;
+  }
   const proto = Object.getPrototypeOf(thing);
   return (
     proto === Object.prototype ||