Skip to content

Commit 09dc9e2

Browse files
authored
Merge pull request #17024 from webpack/thelarkinn/bump-enhanced-resolve
feat(deps): Update enhanced-resolve to latest
2 parents 4ff4d59 + d58760a commit 09dc9e2

File tree

3 files changed

+47
-22
lines changed

3 files changed

+47
-22
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"acorn-import-assertions": "^1.7.6",
1515
"browserslist": "^4.14.5",
1616
"chrome-trace-event": "^1.0.2",
17-
"enhanced-resolve": "^5.10.0",
17+
"enhanced-resolve": "^5.13.0",
1818
"es-module-lexer": "^1.2.1",
1919
"eslint-scope": "5.1.1",
2020
"events": "^3.2.0",

types.d.ts

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4191,17 +4191,31 @@ declare interface FileSystem {
41914191
arg2: FileSystemCallback<string | Buffer>
41924192
): void;
41934193
};
4194-
readdir: {
4195-
(
4196-
arg0: string,
4197-
arg1: FileSystemCallback<(string | Buffer)[] | FileSystemDirent[]>
4198-
): void;
4199-
(
4200-
arg0: string,
4201-
arg1: object,
4202-
arg2: FileSystemCallback<(string | Buffer)[] | FileSystemDirent[]>
4203-
): void;
4204-
};
4194+
readdir: (
4195+
arg0: string,
4196+
arg1?:
4197+
| null
4198+
| "ascii"
4199+
| "utf8"
4200+
| "utf16le"
4201+
| "ucs2"
4202+
| "latin1"
4203+
| "binary"
4204+
| ((
4205+
arg0?: null | NodeJS.ErrnoException,
4206+
arg1?: any[] | (string | Buffer)[]
4207+
) => void)
4208+
| ReaddirOptions
4209+
| "utf-8"
4210+
| "ucs-2"
4211+
| "base64"
4212+
| "hex"
4213+
| "buffer",
4214+
arg2?: (
4215+
arg0?: null | NodeJS.ErrnoException,
4216+
arg1?: any[] | (string | Buffer)[]
4217+
) => void
4218+
) => void;
42054219
readJson?: {
42064220
(arg0: string, arg1: FileSystemCallback<object>): void;
42074221
(arg0: string, arg1: object, arg2: FileSystemCallback<object>): void;
@@ -4234,11 +4248,6 @@ declare interface FileSystem {
42344248
declare interface FileSystemCallback<T> {
42354249
(err?: null | (PossibleFileSystemError & Error), result?: T): any;
42364250
}
4237-
declare interface FileSystemDirent {
4238-
name: string | Buffer;
4239-
isDirectory: () => boolean;
4240-
isFile: () => boolean;
4241-
}
42424251
declare abstract class FileSystemInfo {
42434252
fs: InputFileSystem;
42444253
logger?: WebpackLogger;
@@ -4590,7 +4599,7 @@ declare interface HashedModuleIdsPluginOptions {
45904599
/**
45914600
* The encoding to use when generating the hash, defaults to 'base64'. All encodings from Node.JS' hash.digest are supported.
45924601
*/
4593-
hashDigest?: "latin1" | "hex" | "base64";
4602+
hashDigest?: "latin1" | "base64" | "hex";
45944603

45954604
/**
45964605
* The prefix length of the hash digest to use, defaults to 4.
@@ -9411,6 +9420,22 @@ declare class ReadFileCompileWasmPlugin {
94119420
*/
94129421
apply(compiler: Compiler): void;
94139422
}
9423+
declare interface ReaddirOptions {
9424+
encoding?:
9425+
| null
9426+
| "ascii"
9427+
| "utf8"
9428+
| "utf16le"
9429+
| "ucs2"
9430+
| "latin1"
9431+
| "binary"
9432+
| "utf-8"
9433+
| "ucs-2"
9434+
| "base64"
9435+
| "hex"
9436+
| "buffer";
9437+
withFileTypes?: boolean;
9438+
}
94149439
declare class RealContentHashPlugin {
94159440
constructor(__0: { hashFunction: any; hashDigest: any });
94169441

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2502,10 +2502,10 @@ emojis-list@^3.0.0:
25022502
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
25032503
integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
25042504

2505-
enhanced-resolve@^5.0.0, enhanced-resolve@^5.10.0:
2506-
version "5.12.0"
2507-
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
2508-
integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
2505+
enhanced-resolve@^5.0.0, enhanced-resolve@^5.13.0:
2506+
version "5.13.0"
2507+
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz#26d1ecc448c02de997133217b5c1053f34a0a275"
2508+
integrity sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==
25092509
dependencies:
25102510
graceful-fs "^4.2.4"
25112511
tapable "^2.2.0"

0 commit comments

Comments
 (0)