Migrate type tests to Vitest

.eslintrc

@@ -59,7 +59,7 @@
       }
     },
     {
-      "files": ["**/test/**/*.ts", "**/typescript_test/**/*.ts"],
+      "files": ["**/test/**/*.ts", "**/type-test/**/*.ts"],
       "rules": {
         "consistent-return": "off",
         "max-lines": "off",

.github/workflows/build-and-test-types.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
@@ -65,31 +65,33 @@ jobs:
           node-version: ${{ matrix.node }}
           cache: 'yarn'
 
+      - name: Download build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: package
+          path: .
+
       - name: Install deps
         run: yarn install
 
-      # Build with the actual TS version in the repo
-      - name: Pack
-        run: yarn build && yarn pack
-
       - name: Install build artifact
         run: yarn add ./package.tgz
 
       # Then install the specific version to test against
       - name: Install TypeScript ${{ matrix.ts }}
         run: yarn add --dev typescript@${{ matrix.ts }}
 
-      - name: 'Remove source to ensure packaged types are used'
-        run: rm -rf src
-
         # Remove config line that points "reselect" to the `src` folder,
         # so that the typetest will use the installed version instead
-      - run: sed -i -e /@remap-prod-remove-line/d ./typescript_test/tsconfig.json vitest.config.mts
+      - name: Erase path aliases
+        run: sed -i -e /@remap-prod-remove-line/d tsconfig.base.json
 
       - name: Test types
+        env:
+          TEST_DIST: true
         run: |
-          ./node_modules/.bin/tsc --version
-          yarn test:typescript
+          yarn tsc --version
+          yarn type-tests
 
   are-the-types-wrong:
     name: Check package config with are-the-types-wrong
@@ -104,7 +106,8 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v4
+      - name: Download build artifact
+        uses: actions/download-artifact@v4
         with:
           name: package
           path: .
@@ -146,6 +149,12 @@ jobs:
       - name: Clone RTK repo
         run: git clone https://github.com/reduxjs/redux-toolkit.git ./redux-toolkit
 
+      - name: Cache example deps
+        uses: actions/cache@v4
+        with:
+          path: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}/node_modules
+          key: test-published-artifact-${{ matrix.example }}-node_modules
+
       - name: Check folder contents
         run: ls -l .
 
@@ -175,17 +184,6 @@ jobs:
         working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
         run: yarn info reselect && yarn why reselect
 
-      - name: Set up JDK 17 for React Native build
-        if: matrix.example == 'react-native'
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17.x'
-          distribution: 'temurin'
-
-      - 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 }}
         env:
@@ -195,3 +193,45 @@ jobs:
       - name: Run test step
         working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
         run: yarn test
+
+  test-dist:
+    name: Run local tests against build artifact
+    needs: [build]
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        node: ['20.x']
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Use node ${{ matrix.node }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Download build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: package
+          path: .
+
+      - name: Check folder contents
+        run: ls -lah
+
+      - name: Install build artifact
+        run: yarn add ./package.tgz
+
+      - name: Erase path aliases
+        run: sed -i -e /@remap-prod-remove-line/d tsconfig.base.json
+
+      - name: Run local tests against the build artifact
+        env:
+          TEST_DIST: true
+        run: yarn test

.gitignore

@@ -6,9 +6,6 @@ dist
 es
 .vscode
 .idea
-typescript_test/should_compile/index.js
-typescript_test/should_not_compile/index.js
-typescript_test/common.js
 flow_test/should_fail/flow-typed/index.js.flow
 flow_test/should_pass/flow-typed/index.js.flow
 reselect-builds/
@@ -34,3 +31,8 @@ website/.yarn/
 
 docs/examples/**/*.js
 docs/examples/**/*.jsx
+
+tsconfig.vitest-temp.json
+
+.yalc
+yalc.lock

package.json

@@ -28,12 +28,12 @@
     "lint": "eslint src test",
     "prepack": "yarn build",
     "bench": "vitest --run bench --mode production",
-    "test": "node --expose-gc ./node_modules/vitest/dist/cli-wrapper.js --run && vitest --run --typecheck.only",
-    "test:watch": "node --expose-gc ./node_modules/vitest/dist/cli-wrapper.js --watch",
+    "test": "node --expose-gc $(yarn bin vitest) --run --typecheck",
+    "test:watch": "node --expose-gc $(yarn bin vitest) --watch",
     "test:cov": "vitest run --coverage",
     "type-check": "vitest --run --typecheck.only",
-    "type-check:trace": "vitest --run --typecheck.only && tsc --noEmit -p typescript_test/tsconfig.json --generateTrace trace && npx @typescript/analyze-trace trace && rimraf trace",
-    "test:typescript": "tsc --noEmit -p typescript_test/tsconfig.json",
+    "type-check:trace": "vitest --run --typecheck.only && tsc --noEmit -p tsconfig.test.json --generateTrace trace && npx @typescript/analyze-trace trace && rimraf trace",
+    "type-tests": "tsc --noEmit -p tsconfig.test.json",
     "docs:start": "yarn --cwd website start",
     "docs:build": "yarn --cwd website build",
     "docs:clear": "yarn --cwd website clear",
@@ -58,6 +58,7 @@
     "@reduxjs/toolkit": "^2.0.1",
     "@testing-library/react": "^14.1.2",
     "@types/lodash": "^4.14.175",
+    "@types/node": "^22.7.4",
     "@types/react": "^18.2.38",
     "@types/react-dom": "^18.2.17",
     "@types/shelljs": "^0.8.11",
@@ -82,10 +83,7 @@
     "shelljs": "^0.8.5",
     "tsup": "^8.2.4",
     "typescript": "^5.4.2",
-    "vitest": "^1.6.0"
-  },
-  "resolutions": {
-    "esbuild": "0.23.0"
+    "vitest": "^2.1.2"
   },
   "packageManager": "[email protected]"
 }

scripts/writeGitVersion.mjs

@@ -1,14 +1,10 @@
-import path from 'path'
-import fs from 'fs'
-import { fileURLToPath } from 'node:url'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
+import * as fs from 'node:fs'
+import * as path from 'node:path'
 
 const gitRev = process.argv[2]
 
-const packagePath = path.join(__dirname, '../package.json')
-const pkg = JSON.parse(fs.readFileSync(packagePath))
+const packagePath = path.join(import.meta.dirname, '../package.json')
+const pkg = JSON.parse(fs.readFileSync(packagePath, 'utf-8'))
 
 pkg.version = `${pkg.version}-${gitRev}`
 fs.writeFileSync(packagePath, JSON.stringify(pkg, null, 2))