From 823b8dc188a373d63e64e9b0ad1fa0018679e031 Mon Sep 17 00:00:00 2001 From: Siarhei Fedarovich Date: Fri, 18 Aug 2023 15:07:46 -0700 Subject: [PATCH] Revert "Revert "perf: utilize throwIfNoEntry in sync mode"" This reverts commit b2af955b766c583233542b19accfe9482377deb3. --- lib/DirectoryExistsPlugin.js | 2 +- lib/FileExistsPlugin.js | 2 +- lib/ModulesInHierarchicalDirectoriesPlugin.js | 2 +- lib/Resolver.js | 4 ++-- package.json | 2 +- types.d.ts | 8 ++++---- yarn.lock | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/DirectoryExistsPlugin.js b/lib/DirectoryExistsPlugin.js index 80c94094..dbf1705d 100644 --- a/lib/DirectoryExistsPlugin.js +++ b/lib/DirectoryExistsPlugin.js @@ -32,7 +32,7 @@ module.exports = class DirectoryExistsPlugin { const fs = resolver.fileSystem; const directory = request.path; if (!directory) return callback(); - fs.stat(directory, (err, stat) => { + fs.stat(directory, { throwIfNoEntry: false }, (err, stat) => { if (err || !stat) { if (resolveContext.missingDependencies) resolveContext.missingDependencies.add(directory); diff --git a/lib/FileExistsPlugin.js b/lib/FileExistsPlugin.js index 2dd33e3e..3ba3926d 100644 --- a/lib/FileExistsPlugin.js +++ b/lib/FileExistsPlugin.js @@ -30,7 +30,7 @@ module.exports = class FileExistsPlugin { .tapAsync("FileExistsPlugin", (request, resolveContext, callback) => { const file = request.path; if (!file) return callback(); - fs.stat(file, (err, stat) => { + fs.stat(file, { throwIfNoEntry: false }, (err, stat) => { if (err || !stat) { if (resolveContext.missingDependencies) resolveContext.missingDependencies.add(file); diff --git a/lib/ModulesInHierarchicalDirectoriesPlugin.js b/lib/ModulesInHierarchicalDirectoriesPlugin.js index 651377b2..d5f51557 100644 --- a/lib/ModulesInHierarchicalDirectoriesPlugin.js +++ b/lib/ModulesInHierarchicalDirectoriesPlugin.js @@ -52,7 +52,7 @@ module.exports = class ModulesInHierarchicalDirectoriesPlugin { * @returns {void} */ (addr, callback) => { - fs.stat(addr, (err, stat) => { + fs.stat(addr, { throwIfNoEntry: false }, (err, stat) => { if (!err && stat && stat.isDirectory()) { /** @type {ResolveRequest} */ const obj = { diff --git a/lib/Resolver.js b/lib/Resolver.js index 8806bb1c..0ab12d0d 100644 --- a/lib/Resolver.js +++ b/lib/Resolver.js @@ -63,8 +63,8 @@ const { * @property {function(string, (ReaddirOptions | BufferEncoding | null | undefined | 'buffer' | DirentArrayCallback)=, DirentArrayCallback=): void} readdir * @property {((function(string, FileSystemCallback): void) & function(string, object, FileSystemCallback): void)=} readJson * @property {(function(string, FileSystemCallback): void) & function(string, object, FileSystemCallback): void} readlink - * @property {(function(string, FileSystemCallback): void) & function(string, object, FileSystemCallback): void=} lstat - * @property {(function(string, FileSystemCallback): void) & function(string, object, FileSystemCallback): void} stat + * @property {(function(string, FileSystemCallback): void) & function(string, object, FileSystemCallback): void=} lstat + * @property {(function(string, FileSystemCallback): void) & function(string, object, FileSystemCallback): void} stat */ /** diff --git a/package.json b/package.json index c08417c6..4ae43bb7 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "process": "./lib/util/process-browser.js" }, "dependencies": { - "graceful-fs": "^4.2.4", + "graceful-fs": "^4.2.9", "tapable": "^2.2.0" }, "license": "MIT", diff --git a/types.d.ts b/types.d.ts index e88d59c2..4908e356 100644 --- a/types.d.ts +++ b/types.d.ts @@ -38,7 +38,7 @@ declare class CachedInputFileSystem { ( arg0: string, arg1: object, - arg2: FileSystemCallback + arg2: FileSystemCallback ): void; }; lstatSync?: (arg0: string, arg1?: object) => FileSystemStats; @@ -47,7 +47,7 @@ declare class CachedInputFileSystem { ( arg0: string, arg1: object, - arg2: FileSystemCallback + arg2: FileSystemCallback ): void; }; statSync: (arg0: string, arg1?: object) => FileSystemStats; @@ -195,7 +195,7 @@ declare interface FileSystem { ( arg0: string, arg1: object, - arg2: FileSystemCallback + arg2: FileSystemCallback ): void; }; stat: { @@ -203,7 +203,7 @@ declare interface FileSystem { ( arg0: string, arg1: object, - arg2: FileSystemCallback + arg2: FileSystemCallback ): void; }; } diff --git a/yarn.lock b/yarn.lock index d362a163..bfc974ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2052,10 +2052,10 @@ globals@^13.6.0, globals@^13.9.0: dependencies: type-fest "^0.20.2" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9: - version "4.2.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" - integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.9: + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== has-flag@^3.0.0: version "3.0.0"