Skip to content

Commit 3e87145

Browse files
authored
chore: upgrade TypeScript and @types/node (#15861)
1 parent 33d1166 commit 3e87145

File tree

8 files changed

+306
-263
lines changed

8 files changed

+306
-263
lines changed

eslint.config.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import path from 'path';
1212
import eslintJs from '@eslint/js';
1313
import eslintMarkdown from '@eslint/markdown';
1414
import eslintPluginEslintCommentsConfigs from '@eslint-community/eslint-plugin-eslint-comments/configs';
15+
import {defineConfig} from 'eslint/config';
1516
import {createTypeScriptImportResolver} from 'eslint-import-resolver-typescript';
1617
import eslintPluginImportX from 'eslint-plugin-import-x';
1718
import eslintPluginJest from 'eslint-plugin-jest';
@@ -37,7 +38,7 @@ function getPackages() {
3738
});
3839
}
3940

40-
const config = typescriptEslint.config(
41+
const config = defineConfig(
4142
eslintJs.configs.recommended,
4243
eslintMarkdown.configs.recommended,
4344
...eslintMarkdown.configs.processor,

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
197197
},
198198
"resolutions": {
199-
"@types/node": "~18.14",
199+
"@types/node": "18.x",
200200
"@types/react": "^18.2.21",
201201
"ansi-escapes/type-fest": "^2.0.0",
202202
"babel-jest": "workspace:*",
@@ -205,8 +205,7 @@
205205
"lru-cache@^10.0.1": "patch:lru-cache@npm:10.4.3#./.yarn/patches/lru-cache-npm-10.4.3-30c10b861a.patch",
206206
"lru-cache@^10.2.0": "patch:lru-cache@npm:10.4.3#./.yarn/patches/lru-cache-npm-10.4.3-30c10b861a.patch",
207207
"lru-cache@^10.2.2": "patch:lru-cache@npm:10.4.3#./.yarn/patches/lru-cache-npm-10.4.3-30c10b861a.patch",
208-
"ts-node@^10.5.0": "patch:ts-node@npm:^10.5.0#./.yarn/patches/ts-node-npm-10.9.1-6c268be7f4.patch",
209-
"typescript": "~5.5.4"
208+
"ts-node@^10.5.0": "patch:ts-node@npm:^10.5.0#./.yarn/patches/ts-node-npm-10.9.1-6c268be7f4.patch"
210209
},
211210
"packageManager": "yarn@4.10.3"
212211
}

packages/jest-resolve/src/shouldLoadAsEsm.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77

88
import {dirname, extname} from 'path';
9-
// @ts-expect-error: experimental, not added to the types
109
import {SyntheticModule} from 'vm';
1110
import {findClosestPackageJson, readPackageCached} from './fileWalkers';
1211

0 commit comments

Comments
 (0)