chore(type tests): bump jest-runner-tsd (#12299)

* chore: bump jest-runner-tsd * fix compiler config * fix @tsd/typescript version * improve setup * alternative setup
jestjs · Feb 4, 2022 · 8a62d98 · 8a62d98
1 parent 7509d25
commit 8a62d98
Show file tree

Hide file tree

Showing 64 changed files with 198 additions and 256 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -234,7 +234,7 @@ module.exports = {
       },
     },
     {
-      files: ['**/__typechecks__/**', '*.md'],
+      files: ['**/__typetests__/**', '*.md'],
       rules: {
         'jest/no-focused-tests': 'off',
         'jest/no-identical-title': 'off',
@@ -303,7 +303,7 @@ module.exports = {
         devDependencies: [
           '**/__mocks__/**',
           '**/__tests__/**',
-          '**/__typechecks__/**',
+          '**/__typetests__/**',
           '**/?(*.)(spec|test).js?(x)',
           'scripts/**',
           'babel.config.js',

diff --git a/jest.config.js b/jest.config.js
@@ -36,7 +36,7 @@ module.exports = {
   ],
   testPathIgnorePatterns: [
     '/__arbitraries__/',
-    '/__typechecks__/',
+    '/__typetests__/',
     '/node_modules/',
     '/examples/',
     '/e2e/.*/__tests__',

diff --git a/jest.config.types.js → jest.config.tsd.js b/jest.config.types.js → jest.config.tsd.js
@@ -17,5 +17,5 @@ module.exports = {
   modulePathIgnorePatterns,
   roots: ['<rootDir>/packages'],
   runner: 'jest-runner-tsd',
-  testMatch: ['**/__typechecks__/**/*.ts'],
+  testMatch: ['**/__typetests__/**/*.ts'],
 };
diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
     "@jest/globals": "workspace:*",
     "@jest/test-utils": "workspace:*",
     "@tsconfig/node10": "^1.0.8",
+    "@tsd/typescript": "~4.1.5",
     "@types/babel__core": "^7.0.0",
     "@types/babel__generator": "^7.0.0",
     "@types/babel__template": "^7.0.0",
@@ -55,7 +56,7 @@
     "jest-changed-files": "workspace:*",
     "jest-junit": "^13.0.0",
     "jest-mock": "workspace:*",
-    "jest-runner-tsd": "^1.1.0",
+    "jest-runner-tsd": "^2.0.0",
     "jest-silent-reporter": "^0.5.0",
     "jest-snapshot": "workspace:*",
     "jest-snapshot-serializer-raw": "^1.1.0",
@@ -102,7 +103,7 @@
     "lint:prettier": "prettier '**/*.{md,yml,yaml}' 'website/**/*.{css,js}' --write --ignore-path .gitignore",
     "lint:prettier:ci": "prettier '**/*.{md,yml,yaml}' 'website/**/*.{css,js}' --check --ignore-path .gitignore",
     "remove-examples": "node ./scripts/remove-examples.js",
-    "test-types": "yarn jest --config jest.config.types.js",
+    "test-types": "yarn jest --config jest.config.tsd.js",
     "test-ci": "yarn jest-coverage --color -i --config jest.config.ci.js && yarn test-leak && node ./scripts/mapCoverage.js && codecov",
     "test-ci-partial": "yarn test-ci-partial:parallel -i",
     "test-ci-partial:parallel": "yarn jest --color --config jest.config.ci.js",

diff --git a/packages/babel-jest/tsconfig.json b/packages/babel-jest/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   // TODO: include `babel-preset-jest` if it's ever in TS even though we don't care about its types
   "references": [
     {"path": "../jest-transform"},

diff --git a/packages/babel-plugin-jest-hoist/tsconfig.json b/packages/babel-plugin-jest-hoist/tsconfig.json
@@ -3,5 +3,7 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "build"
-  }
+  },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"]
 }
diff --git a/packages/diff-sequences/tsconfig.json b/packages/diff-sequences/tsconfig.json
@@ -3,5 +3,7 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "build"
-  }
+  },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"]
 }
diff --git a/packages/expect/.npmignore b/packages/expect/.npmignore
@@ -1,6 +1,6 @@
 **/__mocks__/**
 **/__tests__/**
-__typechecks__
+__typetests__
 src
 tsconfig.json
 tsconfig.tsbuildinfo
diff --git a/...ages/expect/__typechecks__/expect.test.ts → packages/expect/__typetests__/expect.test.ts b/...ages/expect/__typechecks__/expect.test.ts → packages/expect/__typetests__/expect.test.ts
diff --git a/packages/expect/__typetests__/tsconfig.json b/packages/expect/__typetests__/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "skipLibCheck": true
+  },
+  "include": ["./**/*"]
+}
diff --git a/packages/expect/tsconfig.json b/packages/expect/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-get-type"},
     {"path": "../jest-matcher-utils"},

diff --git a/packages/jest-changed-files/tsconfig.json b/packages/jest-changed-files/tsconfig.json
@@ -4,5 +4,6 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
   "references": [{"path": "../jest-types"}]
 }
diff --git a/packages/jest-circus/tsconfig.json b/packages/jest-circus/tsconfig.json
@@ -4,6 +4,8 @@
     "outDir": "build",
     "rootDir": "src"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__mocks__/**/*", "./**/__tests__/**/*"],
   "references": [
     {"path": "../expect"},
     {"path": "../jest-each"},

diff --git a/packages/jest-cli/tsconfig.json b/packages/jest-cli/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-config"},
     {"path": "../jest-core"},

diff --git a/packages/jest-config/tsconfig.json b/packages/jest-config/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__mocks__/**/*", "./**/__tests__/**/*"],
   // TODO: This is missing `babel-jest`, `jest-jasmine2`, `jest-circus` and
   // jest-test-sequencer, but that is just `require.resolve`d, so no real use
   // for their types

diff --git a/packages/jest-console/tsconfig.json b/packages/jest-console/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-message-util"},
     {"path": "../jest-types"},

diff --git a/packages/jest-core/tsconfig.json b/packages/jest-core/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-changed-files"},
     {"path": "../jest-config"},

diff --git a/packages/jest-create-cache-key-function/tsconfig.json b/packages/jest-create-cache-key-function/tsconfig.json
@@ -4,5 +4,7 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [{"path": "../jest-types"}, {"path": "../jest-util"}]
 }
diff --git a/packages/jest-diff/tsconfig.json b/packages/jest-diff/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../diff-sequences"},
     {"path": "../jest-get-type"},

diff --git a/packages/jest-docblock/tsconfig.json b/packages/jest-docblock/tsconfig.json
@@ -3,5 +3,7 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "build"
-  }
+  },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"]
 }
diff --git a/packages/jest-each/tsconfig.json b/packages/jest-each/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-get-type"},
     {"path": "../jest-types"},

diff --git a/packages/jest-environment-jsdom/tsconfig.json b/packages/jest-environment-jsdom/tsconfig.json
@@ -4,6 +4,8 @@
     "outDir": "build",
     "rootDir": "src"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__mocks__/**/*", "./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-environment"},
     {"path": "../jest-fake-timers"},

diff --git a/packages/jest-environment-node/tsconfig.json b/packages/jest-environment-node/tsconfig.json
@@ -4,6 +4,8 @@
     "outDir": "build",
     "rootDir": "src"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-environment"},
     {"path": "../jest-fake-timers"},

diff --git a/packages/jest-environment/tsconfig.json b/packages/jest-environment/tsconfig.json
@@ -6,6 +6,7 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
   "references": [
     {"path": "../jest-fake-timers"},
     {"path": "../jest-mock"},

diff --git a/packages/jest-fake-timers/tsconfig.json b/packages/jest-fake-timers/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-message-util"},
     {"path": "../jest-mock"},

diff --git a/packages/jest-get-type/tsconfig.json b/packages/jest-get-type/tsconfig.json
@@ -3,5 +3,7 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "build"
-  }
+  },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"]
 }
diff --git a/packages/jest-globals/tsconfig.json b/packages/jest-globals/tsconfig.json
@@ -6,6 +6,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../expect"},
     {"path": "../jest-environment"},

diff --git a/packages/jest-haste-map/tsconfig.json b/packages/jest-haste-map/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-regex-util"},
     {"path": "../jest-serializer"},

diff --git a/packages/jest-jasmine2/tsconfig.json b/packages/jest-jasmine2/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../expect"},
     {"path": "../jest-each"},

diff --git a/packages/jest-leak-detector/tsconfig.json b/packages/jest-leak-detector/tsconfig.json
@@ -4,5 +4,7 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [{"path": "../jest-get-type"}, {"path": "../pretty-format"}]
 }
diff --git a/packages/jest-matcher-utils/tsconfig.json b/packages/jest-matcher-utils/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-diff"},
     {"path": "../jest-get-type"},

diff --git a/packages/jest-message-util/tsconfig.json b/packages/jest-message-util/tsconfig.json
@@ -4,5 +4,7 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [{"path": "../jest-types"}, {"path": "../pretty-format"}]
 }
diff --git a/packages/jest-mock/tsconfig.json b/packages/jest-mock/tsconfig.json
@@ -4,5 +4,7 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [{"path": "../jest-types"}]
 }
diff --git a/packages/jest-phabricator/tsconfig.json b/packages/jest-phabricator/tsconfig.json
@@ -4,6 +4,7 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
   "references": [
     {
       "path": "../jest-test-result"

diff --git a/packages/jest-regex-util/tsconfig.json b/packages/jest-regex-util/tsconfig.json
@@ -3,5 +3,7 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "build"
-  }
+  },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"]
 }
diff --git a/packages/jest-repl/tsconfig.json b/packages/jest-repl/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-config"},
     {"path": "../jest-console"},

diff --git a/packages/jest-reporters/tsconfig.json b/packages/jest-reporters/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-console"},
     {"path": "../jest-haste-map"},

diff --git a/packages/jest-resolve-dependencies/tsconfig.json b/packages/jest-resolve-dependencies/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-haste-map"},
     {"path": "../jest-regex-util"},

diff --git a/packages/jest-resolve/tsconfig.json b/packages/jest-resolve/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__mocks__/**/*", "./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-haste-map"},
     {"path": "../jest-types"},

diff --git a/packages/jest-runner/tsconfig.json b/packages/jest-runner/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-console"},
     {"path": "../jest-docblock"},

diff --git a/packages/jest-runtime/tsconfig.json b/packages/jest-runtime/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__mocks__/**/*", "./**/__tests__/**/*"],
   "references": [
     {"path": "../jest-environment"},
     {"path": "../jest-environment-node"},

diff --git a/packages/jest-serializer/tsconfig.json b/packages/jest-serializer/tsconfig.json
@@ -3,5 +3,7 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "build"
-  }
+  },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__tests__/**/*"]
 }
diff --git a/packages/jest-snapshot/tsconfig.json b/packages/jest-snapshot/tsconfig.json
@@ -4,6 +4,8 @@
     "rootDir": "src",
     "outDir": "build"
   },
+  "include": ["./src/**/*"],
+  "exclude": ["./**/__mocks__/**/*", "./**/__tests__/**/*"],
   "references": [
     {"path": "../expect"},
     {"path": "../jest-diff"},