chore: move typecheck test files from root into packages (#12099)

jestjs · Nov 30, 2021 · 30a69fb · 30a69fb
1 parent 40a9027
commit 30a69fb
Show file tree

Hide file tree

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

diff --git a/jest.config.js b/jest.config.js
@@ -35,8 +35,8 @@ module.exports = {
     require.resolve('jest-snapshot-serializer-raw'),
   ],
   testPathIgnorePatterns: [
-    '/test-types/',
     '/__arbitraries__/',
+    '/__typechecks__/',
     '/node_modules/',
     '/examples/',
     '/e2e/.*/__tests__',

diff --git a/jest.config.types.js b/jest.config.types.js
@@ -7,29 +7,15 @@
 
 'use strict';
 
-const assert = require('assert');
-const baseConfig = require('./jest.config');
-
-const {
-  modulePathIgnorePatterns,
-  testPathIgnorePatterns,
-  watchPathIgnorePatterns,
-} = baseConfig;
-
-assert.strictEqual(
-  testPathIgnorePatterns[0],
-  '/test-types/',
-  'First entry must be types',
-);
+const {modulePathIgnorePatterns} = require('./jest.config');
 
 module.exports = {
   displayName: {
     color: 'blue',
     name: 'types',
   },
   modulePathIgnorePatterns,
+  roots: ['<rootDir>/packages'],
   runner: 'jest-runner-tsd',
-  testMatch: ['<rootDir>/test-types/*.test.ts'],
-  testPathIgnorePatterns: testPathIgnorePatterns.slice(1),
-  watchPathIgnorePatterns,
+  testMatch: ['**/__typechecks__/**/*.ts'],
 };
diff --git a/package.json b/package.json
@@ -62,7 +62,6 @@
     "jquery": "^3.2.1",
     "lerna": "^4.0.0",
     "micromatch": "^4.0.4",
-    "mlh-tsd": "^0.14.1",
     "mock-fs": "^4.4.1",
     "netlify-plugin-cache": "^1.0.3",
     "node-notifier": "^10.0.0",

diff --git a/test-types/expect.test.ts → ...ages/expect/__typechecks__/expect.test.ts b/test-types/expect.test.ts → ...ages/expect/__typechecks__/expect.test.ts
@@ -9,5 +9,5 @@ import type * as expect from 'expect';
 
 export type M = expect.Matchers<void, unknown>;
 export type N = expect.Matchers<void>;
-// @ts-expect-error
-export type E = expect.Matchers<>;
+// @ts-expect-error: Generic type 'Matchers<R, T>' requires between 1 and 2 type arguments.
+export type E = expect.Matchers;
diff --git a/packages/expect/package.json b/packages/expect/package.json
@@ -30,7 +30,8 @@
     "@jest/test-utils": "^27.4.0",
     "chalk": "^4.0.0",
     "fast-check": "^2.0.0",
-    "immutable": "^4.0.0-rc.12"
+    "immutable": "^4.0.0-rc.12",
+    "mlh-tsd": "^0.14.1"
   },
   "engines": {
     "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"

diff --git a/test-types/top-level-config.test.ts → .../jest-types/__typechecks__/config.test.ts b/test-types/top-level-config.test.ts → .../jest-types/__typechecks__/config.test.ts
diff --git a/...-types/top-level-expect-namespace.test.ts → .../jest-types/__typechecks__/expect.test.ts b/...-types/top-level-expect-namespace.test.ts → .../jest-types/__typechecks__/expect.test.ts
diff --git a/test-types/top-level-globals.test.ts → ...jest-types/__typechecks__/globals.test.ts b/test-types/top-level-globals.test.ts → ...jest-types/__typechecks__/globals.test.ts
diff --git a/test-types/top-level-jest-namespace.test.ts → ...es/jest-types/__typechecks__/jest.test.ts b/test-types/top-level-jest-namespace.test.ts → ...es/jest-types/__typechecks__/jest.test.ts
diff --git a/packages/jest-types/package.json b/packages/jest-types/package.json
@@ -26,6 +26,9 @@
     "@types/yargs": "^16.0.0",
     "chalk": "^4.0.0"
   },
+  "devDependencies": {
+    "mlh-tsd": "^0.14.1"
+  },
   "publishConfig": {
     "access": "public"
   }

diff --git a/tsconfig.json b/tsconfig.json
@@ -26,8 +26,9 @@
   },
   "exclude": [
     ".yarn/releases/*",
-    "**/__tests__/**/*",
     "**/__mocks__/**/*",
+    "**/__tests__/**/*",
+    "**/__typechecks__/**/*",
     "**/build/**/*"
   ]
 }
diff --git a/yarn.lock b/yarn.lock
@@ -2613,7 +2613,6 @@ __metadata:
     jquery: ^3.2.1
     lerna: ^4.0.0
     micromatch: ^4.0.4
-    mlh-tsd: ^0.14.1
     mock-fs: ^4.4.1
     netlify-plugin-cache: ^1.0.3
     node-notifier: ^10.0.0
@@ -2775,6 +2774,7 @@ __metadata:
     "@types/node": "*"
     "@types/yargs": ^16.0.0
     chalk: ^4.0.0
+    mlh-tsd: ^0.14.1
   languageName: unknown
   linkType: soft
 
@@ -9813,6 +9813,7 @@ __metadata:
     jest-matcher-utils: ^27.4.0
     jest-message-util: ^27.4.0
     jest-regex-util: ^27.4.0
+    mlh-tsd: ^0.14.1
   languageName: unknown
   linkType: soft