Skip to content

Commit 5cd111f

Browse files
committed
Fix tsconfig base, node types and build.
1 parent 9d26473 commit 5cd111f

File tree

5 files changed

+12
-18
lines changed

5 files changed

+12
-18
lines changed

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,14 @@
7777
"devDependencies": {
7878
"@mozilla/glean": "^3.0.0",
7979
"@pkgr/rollup": "^4.1.3",
80+
"@robintail/import-resolver": "link:.",
81+
"@tsconfig/node18": "^18.2.4",
8082
"@types/debug": "^4.1.12",
8183
"@types/is-glob": "^4.0.4",
82-
"@types/node": "^18.19.39",
84+
"@types/node": "^20.14.11",
8385
"@types/unist": "^2.0.10",
8486
"dummy.js": "link:dummy.js",
8587
"eslint": "^8.57.0",
86-
"@robintail/import-resolver": "link:.",
8788
"eslint-plugin-import": "npm:eslint-plugin-i@^2.29.1",
8889
"npm-run-all2": "^5.0.2",
8990
"prettier": "^2.8.8",

src/.eslintrc.cjs

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/index.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { builtinModules } from 'node:module'
33
import path from 'node:path'
44

55
import debug from 'debug'
6-
import type { FileSystem, ResolveOptions, Resolver } from 'enhanced-resolve'
6+
import type { ResolveOptions, Resolver } from 'enhanced-resolve'
77
import enhancedResolve from 'enhanced-resolve'
88
import { hashObject } from 'eslint-module-utils/hash.js'
99
import fg from 'fast-glob'
@@ -99,8 +99,6 @@ type InternalResolverOptions = Required<
9999
ResolveOptions &
100100
TsResolverOptions
101101

102-
const fileSystem = fs as FileSystem
103-
104102
const JS_EXT_PATTERN = /\.(?:[cm]js|jsx?)$/
105103
const RELATIVE_PATH_PATTERN = /^\.{1,2}(?:\/.*)?$/
106104

@@ -154,7 +152,7 @@ export function resolve(
154152
extensionAlias: options?.extensionAlias ?? defaultExtensionAlias,
155153
mainFields: options?.mainFields ?? defaultMainFields,
156154
fileSystem: new enhancedResolve.CachedInputFileSystem(
157-
fileSystem,
155+
fs,
158156
5 * 1000,
159157
),
160158
useSyncFileSystemCalls: true,

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "@1stg/tsconfig/node16",
2+
"extends": "@tsconfig/node18/tsconfig.json",
33
"compilerOptions": {
44
"module": "Node16",
55
"outDir": "./lib"

yarn.lock

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,11 @@
360360
estree-walker "^2.0.2"
361361
picomatch "^2.3.1"
362362

363+
"@tsconfig/node18@^18.2.4":
364+
version "18.2.4"
365+
resolved "https://registry.yarnpkg.com/@tsconfig/node18/-/node18-18.2.4.tgz#094efbdd70f697d37c09f34067bf41bc4a828ae3"
366+
integrity sha512-5xxU8vVs9/FNcvm3gE07fPbn9tl6tqGGWA9tSlwsUEkBxtRnTsNmwrV8gasZ9F/EobaSv9+nu8AxUKccw77JpQ==
367+
363368
"@types/debug@^4.1.12":
364369
version "4.1.12"
365370
resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917"
@@ -402,20 +407,13 @@
402407
resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433"
403408
integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==
404409

405-
"@types/node@*":
410+
"@types/node@*", "@types/node@^20.14.11":
406411
version "20.14.11"
407412
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.11.tgz#09b300423343460455043ddd4d0ded6ac579b74b"
408413
integrity sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==
409414
dependencies:
410415
undici-types "~5.26.4"
411416

412-
"@types/node@^18.19.39":
413-
version "18.19.41"
414-
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.41.tgz#27695cf2cac63f22c202b9217c0bcf3fb192a2f0"
415-
integrity sha512-LX84pRJ+evD2e2nrgYCHObGWkiQJ1mL+meAgbvnwk/US6vmMY7S2ygBTGV2Jw91s9vUsLSXeDEkUHZIJGLrhsg==
416-
dependencies:
417-
undici-types "~5.26.4"
418-
419417
"@types/normalize-package-data@^2.4.0":
420418
version "2.4.4"
421419
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"

0 commit comments

Comments
 (0)