From d2a0cd15d5b72c599430eda94938a39d5ebd797c Mon Sep 17 00:00:00 2001 From: Mark Erikson Date: Mon, 4 Dec 2023 08:40:12 -0500 Subject: [PATCH 1/2] Fix WeakRef check --- src/weakMapMemoize.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/weakMapMemoize.ts b/src/weakMapMemoize.ts index b39f4bcb4..f723071db 100644 --- a/src/weakMapMemoize.ts +++ b/src/weakMapMemoize.ts @@ -15,7 +15,10 @@ class StrongRef { } } -const Ref = WeakRef ?? StrongRef +const Ref = + typeof WeakRef !== 'undefined' + ? WeakRef + : (StrongRef as unknown as typeof WeakRef) const UNTERMINATED = 0 const TERMINATED = 1 From 484626e5a51f55f5b7c1a765bc6acf2f1594d5ce Mon Sep 17 00:00:00 2001 From: Mark Erikson Date: Mon, 4 Dec 2023 08:45:50 -0500 Subject: [PATCH 2/2] Drop v2.0-integration checkout --- .github/workflows/build-and-test-types.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build-and-test-types.yml b/.github/workflows/build-and-test-types.yml index 016b859e8..3e49fde6b 100644 --- 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 .