update typescript

Author: sokra

lib/ResolverFactory.js

@@ -40,6 +40,7 @@ const UseFilePlugin = require("./UseFilePlugin");
 /** @typedef {import("./PnpPlugin").PnpApiImpl} PnpApi */
 /** @typedef {import("./Resolver").FileSystem} FileSystem */
 /** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
+/** @typedef {import("./Resolver").SyncFileSystem} SyncFileSystem */
 
 /** @typedef {string|string[]|false} AliasOptionNewRequest */
 /** @typedef {{[k: string]: AliasOptionNewRequest}} AliasOptions */
@@ -187,7 +188,11 @@ function createOptions(options) {
 		enforceExtension: options.enforceExtension || false,
 		extensions: new Set(options.extensions || [".js", ".json", ".node"]),
 		fileSystem: options.useSyncFileSystemCalls
-			? new SyncAsyncFileSystemDecorator(options.fileSystem)
+			? new SyncAsyncFileSystemDecorator(
+					/** @type {SyncFileSystem} */ (
+						/** @type {unknown} */ (options.fileSystem)
+					)
+			  )
 			: options.fileSystem,
 		unsafeCache:
 			options.unsafeCache && typeof options.unsafeCache !== "object"

lib/SyncAsyncFileSystemDecorator.js

@@ -5,79 +5,74 @@
 
 "use strict";
 
+/** @typedef {import("./Resolver").FileSystem} FileSystem */
+/** @typedef {import("./Resolver").SyncFileSystem} SyncFileSystem */
+
 /**
- * @param {Object} fs file system implementation
+ * @param {SyncFileSystem} fs file system implementation
  * @constructor
  */
 function SyncAsyncFileSystemDecorator(fs) {
-	/**
-	 * @type {Object}
-	 */
 	this.fs = fs;
-	if (fs.statSync) {
-		this.stat = (arg, callback) => {
-			let result;
-			try {
-				result = fs.statSync(arg);
-			} catch (e) {
-				return callback(e);
-			}
-			callback(null, result);
-		};
+	this.stat = (arg, callback) => {
+		let result;
+		try {
+			result = fs.statSync(arg);
+		} catch (e) {
+			return callback(e);
+		}
+		callback(null, result);
+	};
+	this.statSync = arg => fs.statSync(arg);
 
-		this.statSync = arg => fs.statSync(arg);
-	}
-	if (fs.readdirSync) {
-		this.readdir = (arg, callback) => {
-			let result;
-			try {
-				result = fs.readdirSync(arg);
-			} catch (e) {
-				return callback(e);
-			}
-			callback(null, result);
-		};
+	this.readdir = (arg, callback) => {
+		let result;
+		try {
+			result = fs.readdirSync(arg);
+		} catch (e) {
+			return callback(e);
+		}
+		callback(null, result);
+	};
+	this.readdirSync = arg => fs.readdirSync(arg);
 
-		this.readdirSync = arg => fs.readdirSync(arg);
-	}
-	if (fs.readFileSync) {
-		this.readFile = (arg, callback) => {
-			let result;
-			try {
-				result = fs.readFileSync(arg);
-			} catch (e) {
-				return callback(e);
-			}
-			callback(null, result);
-		};
+	this.readFile = (arg, callback) => {
+		let result;
+		try {
+			result = fs.readFileSync(arg);
+		} catch (e) {
+			return callback(e);
+		}
+		callback(null, result);
+	};
+	this.readFileSync = arg => fs.readFileSync(arg);
 
-		this.readFileSync = arg => fs.readFileSync(arg);
-	}
-	if (fs.readlinkSync) {
-		this.readlink = (arg, callback) => {
-			let result;
-			try {
-				result = fs.readlinkSync(arg);
-			} catch (e) {
-				return callback(e);
-			}
-			callback(null, result);
-		};
+	this.readlink = (arg, callback) => {
+		let result;
+		try {
+			result = fs.readlinkSync(arg);
+		} catch (e) {
+			return callback(e);
+		}
+		callback(null, result);
+	};
+	this.readlinkSync = arg => fs.readlinkSync(arg);
 
-		this.readlinkSync = arg => fs.readlinkSync(arg);
-	}
-	if (fs.readJsonSync) {
+	this.readJson = undefined;
+	this.readJsonSync = undefined;
+	const readJsonSync = fs.readJsonSync;
+	if (readJsonSync) {
 		this.readJson = (arg, callback) => {
 			let result;
 			try {
-				result = fs.readJsonSync(arg);
+				result = readJsonSync.call(fs, arg);
 			} catch (e) {
 				return callback(e);
 			}
 			callback(null, result);
 		};
 
-		this.readJsonSync = arg => fs.readJsonSync(arg);
+		this.readJsonSync = arg => readJsonSync.call(fs, arg);
 	}
 }
 module.exports = SyncAsyncFileSystemDecorator;

package.json

@@ -29,7 +29,7 @@
     "prettier": "^2.1.2",
     "should": "^13.2.3",
     "tooling": "webpack/tooling#v1.8.0",
-    "typescript": "3.8.3"
+    "typescript": "^4.0.2"
   },
   "engines": {
     "node": ">=10.13.0"

types.d.ts

@@ -463,7 +463,7 @@ declare namespace exports {
 		Resolver,
 		FileSystem,
 		ResolveContext,
-		UserResolveOptions as ResolveOptions,
+		UserResolveOptions as ResolveOptions
 	};
 }
 

yarn.lock

@@ -2758,10 +2758,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@3.8.3:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
-  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
+typescript@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2"
+  integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==
 
 uri-js@^4.2.2:
   version "4.2.2"