feat: support for jest 28

readmeio · May 3, 2022 · 77de0ed · 77de0ed
1 parent 9d769c7
commit 77de0ed
Show file tree

Hide file tree

Showing 8 changed files with 2,421 additions and 2,486 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,4 +1,3 @@
-@types/
 coverage/
 dist/
 node_modules/
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-@types/
 coverage/
 dist/
 node_modules/
diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,3 @@
-@types/
 coverage/
 dist/
 node_modules/
diff --git a/tsconfig.test.json → __tests__/tsconfig.json b/tsconfig.test.json → __tests__/tsconfig.json
@@ -1,8 +1,8 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "module": "es6",
     "moduleResolution": "node"
   },
-  "include": ["src/**/*", "__tests__/**/*"]
+  "include": ["../src/**/*", "*.ts", "**/*"]
 }
diff --git a/jest.config.js b/jest.config.js
@@ -2,7 +2,7 @@ module.exports = {
   coveragePathIgnorePatterns: ['__tests__/__fixtures__/'],
   globals: {
     'ts-jest': {
-      tsconfig: 'tsconfig.test.json',
+      tsconfig: '__tests__/tsconfig.json',
     },
   },
   preset: 'ts-jest/presets/js-with-ts',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,11 +3,11 @@
   "version": "3.0.2",
   "description": "Jest matcher for asserting valid HAR definitions",
   "main": "dist/index.js",
-  "types": "@types/index.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
     "lint": "eslint . --ext .js,.ts",
-    "prebuild": "rm -rf dist/ @types/",
+    "prebuild": "rm -rf dist/",
     "prepack": "npm run build",
     "pretest": "npm run lint",
     "prettier": "prettier --list-different --write \"./**/**.js\"",
@@ -40,14 +40,14 @@
     "har-validator": "^5.1.5"
   },
   "peerDependencies": {
-    "jest": "^27.0.3"
+    "jest": "^28.0.3"
   },
   "devDependencies": {
     "@readme/eslint-config": "^8.5.1",
     "@types/jest": "^27.4.1",
     "eslint": "^8.11.0",
     "prettier": "^2.6.0",
-    "ts-jest": "^27.1.1",
+    "ts-jest": "^28.0.0",
     "typescript": "^4.6.2"
   },
   "prettier": "@readme/eslint-config/prettier"

diff --git a/tsconfig.json b/tsconfig.json
@@ -3,7 +3,6 @@
     "allowJs": true,
     "baseUrl": "./src/",
     "declaration": true,
-    "declarationDir": "./@types",
     "esModuleInterop": true,
     "lib": ["es2020"],
     "outDir": "./dist",