Switch to Vitest

.config/tsconfig.base.json

@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "isolatedModules": true,
+    "esModuleInterop": true,
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "target": "ES2019",
+    "strict": true,
+    "incremental": true,
+    "skipLibCheck": true
+  }
+}

.config/vitest.config.ts

@@ -0,0 +1,7 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    globals: true,
+  },
+});

.github/workflows/ci.yml

@@ -18,6 +18,14 @@ jobs:
         run: pnpm build
       - name: Examples
         run: pnpm --filter "./examples/**" --parallel build
+  bundlesize:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: ./.github/actions/install
+      - run: pnpm bundlesize
   check:
     runs-on: ubuntu-latest
     steps:

CONTRIBUTING.md

@@ -26,7 +26,7 @@ Welcome, and thanks for your interest in contributing! Please take a moment to r
 
 ### Scripts
 
-- `pnpm dev` – runs jest, watching for file changes
+- `pnpm dev` – runs vitest, watching for file changes
 - `pnpm build` – production build
 - `pnpm tsc` – type checks
 - `pnpm test`

package.json

@@ -3,7 +3,7 @@
   "scripts": {
     "check": "pnpm run --filter './packages/**' --parallel check",
     "build": "pnpm run --filter './packages/**' build",
-    "dev": "pnpm run --filter './packages/**' --parallel dev",
+    "dev": "vitest --config .config/vitest.config.ts",
     "docs": "pnpm run --filter docs dev",
     "lint": "pnpm run --filter './packages/**' --parallel lint",
     "lint-staged": "lint-staged --config .config/lint-staged.config.mjs",
@@ -13,9 +13,11 @@
     "prepare:packages": "pnpm build",
     "prettier": "prettier --config .prettierrc.cjs --ignore-unknown --no-error-on-unmatched-pattern",
     "syncpack": "syncpack list-mismatches --config .config/.syncpackrc",
-    "test": "pnpm run --filter './packages/**' --parallel test"
+    "test": "vitest --config .config/vitest.config.ts run --coverage",
+    "bundlesize": "pnpm run --filter './packages/**' --parallel bundlesize"
   },
   "devDependencies": {
+    "@vitest/coverage-v8": "0.34.2",
     "husky": "8.0.1",
     "if-env": "1.0.4",
     "lint-staged": "13.0.1",
@@ -24,7 +26,8 @@
     "prettier-plugin-astro": "0.8.0",
     "prettier-plugin-packagejson": "2.4.2",
     "prettier-plugin-tailwindcss": "0.2.2",
-    "syncpack": "8.4.11"
+    "syncpack": "8.4.11",
+    "vitest": "0.34.2"
   },
   "packageManager": "[email protected]",
   "engines": {

packages/@cva/tailwindcss/.config/tsconfig.build.json

@@ -1,10 +1,11 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../../../../.config/tsconfig.base.json",
   "include": ["../src/**/*.ts"],
   "exclude": ["../node_modules", "../dist", "../src/**/*.test.ts"],
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "../dist",
+    "incremental": false,
     "declaration": true,
     "emitDeclarationOnly": true
   }

packages/@cva/tailwindcss/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cva/tailwindcss",
-  "version": "0.6.0",
+  "version": "0.0.0",
   "description": "Class Variance Authority 🧬",
   "keywords": [
     "Class Variance Authority",
@@ -20,44 +20,33 @@
   "license": "Apache-2.0",
   "author": "Joe Bell (https://joebell.co.uk)",
   "exports": {
-    "import": "./dist/index.mjs",
-    "require": "./dist/index.js",
-    "types": "./dist/index.d.ts"
+    "import": "./src/index.ts",
+    "require": "./src/index.ts",
+    "types": "./src/index.ts"
   },
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "main": "src/index.ts",
+  "module": "src/index.ts",
+  "types": "src/index.ts",
   "files": [
-    "dist/*.mjs",
-    "dist/*.mjs.map",
-    "dist/*.js",
-    "dist/*.js.map",
-    "dist/*.d.ts"
+    "dist/"
   ],
   "scripts": {
     "build": "run-p build:**",
     "build:cjs": "swc ./src/index.ts --config-file ./.config/.swcrc -o dist/index.js -C module.type=commonjs",
     "build:esm": "swc ./src/index.ts --config-file ./.config/.swcrc -o dist/index.mjs -C module.type=es6 ",
     "build:tsc": "tsc --project .config/tsconfig.build.json",
     "check": "tsc --project tsconfig.json --noEmit",
-    "dev": "jest --config .config/jest.config.ts --watch",
     "prepublishOnly": "pnpm build",
-    "test": "run-p test:*",
-    "test:jest": "jest --config .config/jest.config.ts --coverage",
-    "test:size": "pnpm build && bundlesize -f 'dist/*.js' -s 900B"
+    "bundlesize": "pnpm build && bundlesize -f 'dist/*.js' -s 900B"
   },
   "devDependencies": {
-    "@jest/types": "28.1.1",
     "@swc/cli": "0.1.57",
     "@swc/core": "1.2.198",
-    "@swc/jest": "0.2.21",
-    "@types/jest": "28.1.1",
     "@types/node": "18.11.18",
     "@types/react": "18.0.12",
     "@types/react-dom": "18.0.5",
     "bundlesize": "0.18.1",
     "cva": "workspace:*",
-    "jest": "28.1.1",
     "npm-run-all": "4.1.5",
     "react": "18.2.0",
     "react-dom": "18.2.0",
@@ -68,5 +57,15 @@
   "peerDependencies": {
     "cva": "workspace:*",
     "tailwind-merge": ">= 1.12.0"
+  },
+  "publishConfig": {
+    "exports": {
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "main": "dist/index.js",
+    "module": "dist/index.mjs",
+    "types": "dist/index.d.ts"
   }
 }

packages/@cva/tailwindcss/src/index.test.ts

@@ -1,7 +1,7 @@
 import { cva, cx } from "./";
 
 describe("cx", () => {
-  describe.each<Parameters<typeof cx>>([
+  describe.each<[Parameters<typeof cx>[0], ReturnType<typeof cx>]>([
     ["bg-blue-300 bg-green-300", "bg-green-300"],
     [["bg-blue-300", "bg-red-100", "bg-green-300"], "bg-green-300"],
   ])("cx(%o)", (options, expected) => {
@@ -12,9 +12,14 @@ describe("cx", () => {
 });
 
 describe("cva", () => {
-  expect(cva({ base: "bg-blue-300 bg-green-300" })()).toBe("bg-green-300");
-
-  expect(cva({ base: ["bg-blue-300", "bg-red-100", "bg-green-300"] })()).toBe(
-    "bg-green-300"
-  );
+  describe.each<
+    [Parameters<typeof cva>[0], ReturnType<ReturnType<typeof cva>>]
+  >([
+    [{ base: "bg-blue-300 bg-green-300" }, "bg-green-300"],
+    [{ base: ["bg-blue-300", "bg-red-100", "bg-green-300"] }, "bg-green-300"],
+  ])("cva(%o)", (options, expected) => {
+    test(`returns ${expected}`, () => {
+      expect(cva(options)()).toBe(expected);
+    });
+  });
 });

packages/@cva/tailwindcss/tsconfig.json

@@ -1,15 +1,5 @@
 {
   "extends": "../../../tsconfig.json",
   "include": ["src/**/*.ts"],
-  "exclude": ["node_modules", "dist"],
-  "compilerOptions": {
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "target": "ES2019",
-    "strict": true,
-    "incremental": true,
-    "skipLibCheck": true
-  }
+  "exclude": ["node_modules", "dist"]
 }

packages/class-variance-authority/.config/tsconfig.build.json

@@ -1,10 +1,11 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../../../.config/tsconfig.base.json",
   "include": ["../src/**/*.ts"],
   "exclude": ["../node_modules", "../dist", "../src/**/*.test.ts"],
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "../dist",
+    "incremental": false,
     "declaration": true,
     "emitDeclarationOnly": true
   }

packages/class-variance-authority/package.json

@@ -22,54 +22,57 @@
   "author": "Joe Bell (https://joebell.co.uk)",
   "exports": {
     ".": {
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "import": "./src/index.ts",
+      "types": "./src/index.ts"
     },
     "./types": {
-      "types": "./dist/types.d.ts"
+      "types": "./src/types.ts"
     }
   },
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "main": "src/index.ts",
+  "module": "src/index.ts",
+  "types": "src/index.ts",
   "files": [
-    "dist/*.mjs",
-    "dist/*.mjs.map",
-    "dist/*.js",
-    "dist/*.js.map",
-    "dist/*.d.ts"
+    "dist/"
   ],
   "scripts": {
     "build": "run-p build:**",
     "build:cjs": "swc ./src/index.ts --config-file ./.config/.swcrc -o dist/index.js -C module.type=commonjs",
     "build:esm": "swc ./src/index.ts --config-file ./.config/.swcrc -o dist/index.mjs -C module.type=es6 ",
     "build:tsc": "tsc --project .config/tsconfig.build.json",
     "check": "tsc --project tsconfig.json --noEmit",
-    "dev": "jest --config .config/jest.config.ts --watch",
     "prepublishOnly": "pnpm build",
-    "test": "run-p test:*",
-    "test:jest": "jest --config .config/jest.config.ts --coverage",
-    "test:size": "pnpm build && bundlesize -f 'dist/*.js' -s 850B"
+    "bundlesize": "pnpm build && bundlesize -f 'dist/*.js' -s 850B"
   },
   "dependencies": {
     "clsx": "2.0.0"
   },
   "devDependencies": {
-    "@jest/types": "28.1.1",
     "@swc/cli": "0.1.57",
     "@swc/core": "1.2.198",
-    "@swc/jest": "0.2.21",
-    "@types/jest": "28.1.1",
     "@types/node": "18.11.18",
     "@types/react": "18.0.12",
     "@types/react-dom": "18.0.5",
     "bundlesize": "0.18.1",
-    "jest": "28.1.1",
     "npm-run-all": "4.1.5",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "ts-node": "10.8.1",
     "typescript": "5.1.3"
+  },
+  "publishConfig": {
+    "exports": {
+      ".": {
+        "import": "./dist/index.mjs",
+        "require": "./dist/index.js",
+        "types": "./dist/index.d.ts"
+      },
+      "./types": {
+        "types": "./dist/types.d.ts"
+      }
+    },
+    "main": "dist/index.js",
+    "module": "dist/index.mjs",
+    "types": "dist/index.d.ts"
   }
 }

packages/class-variance-authority/tsconfig.json

@@ -1,15 +1,5 @@
 {
   "extends": "../../tsconfig.json",
   "include": ["src/**/*.ts"],
-  "exclude": ["node_modules", "dist"],
-  "compilerOptions": {
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "target": "ES2019",
-    "strict": true,
-    "incremental": true,
-    "skipLibCheck": true
-  }
+  "exclude": ["node_modules", "dist"]
 }

packages/cva/.config/tsconfig.build.json

@@ -1,10 +1,11 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../../../.config/tsconfig.base.json",
   "include": ["../src/**/*.ts"],
   "exclude": ["../node_modules", "../dist", "../src/**/*.test.ts"],
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "../dist",
+    "incremental": false,
     "declaration": true,
     "emitDeclarationOnly": true
   }