reduxjs · markerikson · Oct 28, 2023 · Oct 28, 2023 · Oct 28, 2023
diff --git a/.github/workflows/build-and-test-types.yml b/.github/workflows/build-and-test-types.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    name: Lint, Test, Report Coverage on Node ${{ matrix.node }}
+    name: Build and Test on Node ${{ matrix.node }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -57,13 +57,14 @@ jobs:
       fail-fast: false
       matrix:
         node: ['16.x']
-        ts: ['4.2', '4.3', '4.4', '4.5', '4.6', '4.7', '4.8', '4.9', '5.0']
+        ts: ['4.7', '4.8', '4.9', '5.0', '5.1', '5.2']
+
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Use node ${{ matrix.node }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
           cache: 'yarn'
@@ -94,6 +95,28 @@ jobs:
           ./node_modules/.bin/tsc --version
           yarn test:typescript
 
+  are-the-types-wrong:
+    name: Check package config with are-the-types-wrong
+
+    needs: [build]
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        node: ['16.x']
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: package
+          path: .
+
+      # Note: We currently expect "FalseCJS" failures for Node16 + `moduleResolution: "node16",
+      - name: Run are-the-types-wrong
+        run: npx @arethetypeswrong/cli ./package.tgz --format table --ignore-rules false-cjs
+
   test-published-artifact:
     name: Test Published Artifact ${{ matrix.example }}
 
@@ -103,35 +126,45 @@ jobs:
       fail-fast: false
       matrix:
         node: ['16.x']
-        example:
-          [
-            'cra4',
-            'cra5',
-            'next',
-            'vite',
-            'node-standard',
-            'node-esm',
-            'are-the-types-wrong'
-          ]
+        example: ['cra4', 'cra5', 'next', 'vite', 'node-standard', 'node-esm']
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Use node ${{ matrix.node }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3.8.1
         with:
           node-version: ${{ matrix.node }}
           cache: 'yarn'
 
       - 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 .
 
+        # Some weird install diffs with cloning this repo and installing.
+        # Just kill the lockfiles for this repo and RTK and reinstall
+
+      - name: Remove top lockfile
+        run: rm yarn.lock && rm package.json
+
+      - name: Remove RTK lockfile
+        working-directory: ./redux-toolkit
+        run: rm yarn.lock && rm package.json
+
       - name: Install deps
         working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
-        run: yarn install
+        run: rm yarn.lock && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install
+
+      - name: Install Playwright browser if necessary
+        working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
+        continue-on-error: true
+        run: yarn playwright install
 
       - uses: actions/download-artifact@v2
         with:
@@ -150,17 +183,14 @@ jobs:
         working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
         run: yarn info reselect && yarn why reselect
 
+      - name: Check MSW version
+        working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
+        run: yarn why msw
+
       - name: Build example
         working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
         run: yarn build
 
       - name: Run test step
         working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
         run: yarn test
-        if: matrix.example != 'are-the-types-wrong'
-
-      - name: Run test step (attw)
-        working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
-        # Ignore "FalseCJS" errors in the `attw` job
-        run: yarn test -n FalseCJS
-        if: matrix.example == 'are-the-types-wrong'
diff --git a/package.json b/package.json
@@ -13,13 +13,6 @@
       "default": "./dist/cjs/reselect.cjs"
     }
   },
-  "typesVersions": {
-    "<=4.6": {
-      "*": [
-        "./dist/versionedTypes/ts46/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "src",
     "dist"

diff --git a/src/versionedTypes/package.dist.json b/src/versionedTypes/package.dist.json
diff --git a/src/versionedTypes/ts46-mergeParameters.ts b/src/versionedTypes/ts46-mergeParameters.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -20,7 +20,6 @@
     "paths": {
       "reselect": ["src/index.ts"], // @remap-prod-remove-line
       "@internal/*": ["src/*"],
-      "./ts47-mergeParameters": ["./src/versionedTypes/ts46-mergeParameters.ts"]
     }
   },
   "include": ["./src/**/*"],

diff --git a/tsconfig.ts46types.json b/tsconfig.ts46types.json
diff --git a/tsup.config.ts b/tsup.config.ts
@@ -29,18 +29,7 @@ export default defineConfig(options => {
       format: ['esm'],
       outExtension: () => ({ js: '.mjs' }),
       dts: true,
-      clean: true,
-      async onSuccess() {
-        console.log('onSuccess')
-
-        console.log('Generating TS 4.6 types...')
-        await execAsync('yarn tsc -p tsconfig.ts46types.json')
-        fs.copyFileSync(
-          'src/versionedTypes/package.dist.json',
-          'dist/versionedTypes/ts46/versionedTypes/package.json'
-        )
-        console.log('TS 4.6 types done')
-      }
+      clean: true
     },
 
     // Support Webpack 4 by pointing `"module"` to a file with a `.js` extension