From 32c524d05058b7542f6d6a9778af85ffc1a26d5d Mon Sep 17 00:00:00 2001 From: ota-meshi Date: Thu, 17 Dec 2020 12:05:44 +0900 Subject: [PATCH] Fix bug in eslint 6 --- lib/rules/no-restricted-call-after-await.js | 9 ++++++++- typings/eslint/index.d.ts | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/rules/no-restricted-call-after-await.js b/lib/rules/no-restricted-call-after-await.js index a7d1eb0d7..6723d91ce 100644 --- a/lib/rules/no-restricted-call-after-await.js +++ b/lib/rules/no-restricted-call-after-await.js @@ -107,6 +107,13 @@ module.exports = { return allLocalImports } + function getCwd() { + if (context.getCwd) { + return context.getCwd() + } + return path.resolve('') + } + /** * @param {string} moduleName * @param {Program} ast @@ -116,7 +123,7 @@ module.exports = { /** @type {string} */ let modulePath if (moduleName.startsWith('.')) { - modulePath = safeRequireResolve(path.join(context.getCwd(), moduleName)) + modulePath = safeRequireResolve(path.join(getCwd(), moduleName)) } else if (path.isAbsolute(moduleName)) { modulePath = safeRequireResolve(moduleName) } else { diff --git a/typings/eslint/index.d.ts b/typings/eslint/index.d.ts index 398399c9d..fdbca8503 100644 --- a/typings/eslint/index.d.ts +++ b/typings/eslint/index.d.ts @@ -328,7 +328,8 @@ export namespace Rule { markVariableAsUsed(name: string): boolean report(descriptor: ReportDescriptor): void - getCwd(): string + // eslint@6 does not have this method. + getCwd?: () => string } type ReportDescriptor =