fix: ci and test

outerbase · Apr 15, 2024 · 089fdf2 · 089fdf2
1 parent 0f32b75
commit 089fdf2
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 4 deletions.
diff --git a/gui/jest.config.cjs b/gui/jest.config.cjs
@@ -0,0 +1,9 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: "ts-jest",
+  testEnvironment: "jsdom",
+  rootDir: "./",
+  moduleNameMapper: {
+    "^@gui/(.*)$": "<rootDir>/src/$1",
+  },
+};
diff --git a/gui/package.json b/gui/package.json
@@ -14,7 +14,10 @@
   "scripts": {
     "dev": "tsup --watch",
     "build": "tsup",
+    "staged": "pnpm run typecheck && pnpm run format && pnpm run lint && pnpm run test",
     "typecheck": "tsc --noEmit",
+    "test": "jest",
+    "test:watch": "jest --watch",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "format": "prettier --check .",
@@ -76,15 +79,18 @@
   "devDependencies": {
     "@libsqlstudio/tailwind": "workspace:*",
     "@libsqlstudio/tsconfig": "workspace:*",
-    "eslint-config-libsqlstudio": "workspace:*",
     "@types/deep-equal": "^1.0.4",
     "@types/jest": "^29.5.11",
     "@types/react": "^18.2.66",
     "@types/react-dom": "^18.2.22",
     "@vitejs/plugin-react": "^4.2.1",
     "autoprefixer": "^10.4.19",
+    "eslint-config-libsqlstudio": "workspace:*",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "postcss": "^8.4.38",
     "tailwindcss": "^3.4.3",
+    "ts-jest": "^29.1.2",
     "tsup": "^8.0.2",
     "vite": "^5.2.0",
     "vite-tsconfig-paths": "^4.3.2"

diff --git a/gui/tsconfig.json b/gui/tsconfig.json
@@ -8,6 +8,13 @@
     },
     "noImplicitReturns": false
   },
-  "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "*.js", "*.ts"],
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+    ".eslintrc.cjs",
+    "*.js",
+    "*.ts",
+    "jest.config.cjs"
+  ],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/studio/package.json b/studio/package.json
@@ -4,7 +4,7 @@
   "private": false,
   "scripts": {
     "dev": "next dev --turbo",
-    "build": "npm run db:migrate && next build",
+    "build": "pnpm run db:migrate && next build",
     "start": "next start",
     "tsc": "tsc --noEmit --skipLibCheck",
     "test": "jest",
@@ -13,7 +13,7 @@
     "db:generate": "drizzle-kit generate:sqlite",
     "db:migrate": "tsx src/db/migrate.ts",
     "generate-random-key": "tsx src/cli/generate-aes-key.ts",
-    "staged": "npm run tsc && npm run lint && jest",
+    "staged": "pnpm run typecheck && pnpm run lint && jest",
     "typecheck": "tsc --noEmit --skipLibCheck",
     "format": "prettier --check .",
     "format:fix": "prettier --write .",