From 4ef10a3bcd072c6e54895213d63e6f317581db1e Mon Sep 17 00:00:00 2001
From: Dylan Piercey <dpiercey@ebay.com>
Date: Fri, 11 Jun 2021 11:16:12 -0700
Subject: [PATCH] fix: improve commonjs support for ssr screen api

---
 src/index.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 2c1ad18..9a60830 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -17,7 +17,7 @@ export { FireFunction, FireObject, fireEvent } from "./shared";
 
 export type RenderResult = AsyncReturnValue<typeof render>;
 
-export let screen: typeof testingLibraryScreen;
+export const screen: typeof testingLibraryScreen = {} as any;
 
 let activeContainer: DocumentFragment | undefined;
 
@@ -50,8 +50,7 @@ export async function render<T extends Template>(
   ));
   (container as any).outerHTML = html; // Fixes prettyDOM for container
 
-  // For SSR tests screen is always the last rendered component.
-  screen = {
+  const queries = {
     debug: function debug(element, maxLength, options) {
       if (!element) {
         debug(Array.from(container.children), maxLength, options);
@@ -66,6 +65,9 @@ export async function render<T extends Template>(
     ...within(container as any as HTMLElement),
   } as typeof testingLibraryScreen;
 
+  // For SSR tests screen is always references the last rendered component.
+  Object.assign(screen, queries);
+
   return {
     container,
     emitted<N extends string = "*">(
@@ -89,7 +91,7 @@ export async function render<T extends Template>(
 
       cleanupComponent();
     },
-    ...screen,
+    ...queries,
   } as const;
 }