Merge pull request #657 from reduxjs/bugfix/5.0-weakref-check

markerikson · web-flow · commit 2a1e05547374 · 2023-12-04T08:49:11.000-05:00
diff --git a/.github/workflows/build-and-test-types.yml b/.github/workflows/build-and-test-types.yml
@@ -140,10 +140,6 @@ jobs:
       - name: Clone RTK repo
         run: git clone https://github.com/reduxjs/redux-toolkit.git ./redux-toolkit
 
-      - name: Check out v2.0-integration
-        working-directory: ./redux-toolkit
-        run: git checkout v2.0-integration
-
       - name: Check folder contents
         run: ls -l .
 
diff --git a/src/weakMapMemoize.ts b/src/weakMapMemoize.ts
@@ -15,7 +15,10 @@ class StrongRef<T> {
   }
 }
 
-const Ref = WeakRef ?? StrongRef
+const Ref =
+  typeof WeakRef !== 'undefined'
+    ? WeakRef
+    : (StrongRef as unknown as typeof WeakRef)
 
 const UNTERMINATED = 0
 const TERMINATED = 1

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,10 @@ class StrongRef<T> {`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`		`-const Ref = WeakRef ?? StrongRef`
	`18`	`+const Ref =`
	`19`	`+ typeof WeakRef !== 'undefined'`
	`20`	`+ ? WeakRef`
	`21`	`+ : (StrongRef as unknown as typeof WeakRef)`
`19`	`22`
`20`	`23`	`const UNTERMINATED = 0`
`21`	`24`	`const TERMINATED = 1`