Skip to content

Commit fd3b34d

Browse files
authored
refactor: use recursive option with fs.readdir (#1641)
1 parent 6191fb4 commit fd3b34d

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
"@types/react": "^16.14.0",
103103
"@types/react-dom": "^16.9.11",
104104
"@types/react-window": "^1.8.5",
105-
"@types/recursive-readdir": "^2.2.0",
106105
"@types/semver": "^7.3.4",
107106
"@types/tmp": "0.2.0",
108107
"@typescript-eslint/eslint-plugin": "^6.0.0",
@@ -136,7 +135,6 @@
136135
"postcss": "^8.4.25",
137136
"postcss-less": "^6.0.0",
138137
"prettier": "^3.0.0",
139-
"recursive-readdir": "^2.2.2",
140138
"resolve-url-loader": "^5.0.0",
141139
"standard": "^17.1.0",
142140
"stylelint": "^15.10.1",

src/main/electron-types.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import { readdir } from 'fs/promises';
12
import * as path from 'node:path';
23

34
import { ElectronVersions } from '@electron/fiddle-core';
45
import { BrowserWindow, IpcMainEvent, app } from 'electron';
56
import * as fs from 'fs-extra';
67
import watch from 'node-watch';
78
import packageJson from 'package-json';
8-
import readdir from 'recursive-readdir';
99
import semver from 'semver';
1010

1111
import { ipcMainManager } from './ipc';
@@ -123,11 +123,13 @@ export class ElectronTypes {
123123
const types: NodeTypes = {};
124124

125125
try {
126-
const files = (await readdir(dir)).filter((f) => f.endsWith('.d.ts'));
126+
const files = (await readdir(dir, { recursive: true })).filter((f) =>
127+
f.endsWith('.d.ts'),
128+
);
127129

128130
for (const file of files) {
129131
types[path.relative(dir, file) as keyof NodeTypes] = await fs.readFile(
130-
file,
132+
path.join(dir, file),
131133
'utf8',
132134
);
133135
}

yarn.lock

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2577,13 +2577,6 @@
25772577
"@types/scheduler" "*"
25782578
csstype "^3.0.2"
25792579

2580-
"@types/recursive-readdir@^2.2.0":
2581-
version "2.2.1"
2582-
resolved "https://registry.npmjs.org/@types/recursive-readdir/-/recursive-readdir-2.2.1.tgz"
2583-
integrity sha512-Xd+Ptc4/F2ueInqy5yK2FI5FxtwwbX2+VZpcg+9oYsFJVen8qQKGapCr+Bi5wQtHU1cTXT8s+07lo/nKPgu8Gg==
2584-
dependencies:
2585-
"@types/node" "*"
2586-
25872580
"@types/responselike@^1.0.0":
25882581
version "1.0.0"
25892582
resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
@@ -10219,13 +10212,6 @@ rechoir@^0.8.0:
1021910212
dependencies:
1022010213
resolve "^1.20.0"
1022110214

10222-
recursive-readdir@^2.2.2:
10223-
version "2.2.3"
10224-
resolved "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz"
10225-
integrity sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==
10226-
dependencies:
10227-
minimatch "^3.0.5"
10228-
1022910215
redent@^3.0.0:
1023010216
version "3.0.0"
1023110217
resolved "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz"

0 commit comments

Comments
 (0)