Merge pull request #3628 from itsjohncs/eslint-patch-fallback

[eslint-patch] Use original resolver if patched resolver fails.
microsoft · Sep 14, 2022 · c0c0de4 · c0c0de4
2 parents f299343 + 7eca2cc
commit c0c0de4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/common/changes/@rushstack/eslint-patch/eslint-patch-fallback_2022-09-14-07-30.json b/common/changes/@rushstack/eslint-patch/eslint-patch-fallback_2022-09-14-07-30.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/eslint-patch",
+      "comment": "Use original resolver if patched resolver fails.",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@rushstack/eslint-patch"
+}
diff --git a/eslint/eslint-patch/src/modern-module-resolution.ts b/eslint/eslint-patch/src/modern-module-resolution.ts
@@ -209,8 +209,15 @@ if (!ConfigArrayFactory.__patched) {
       const originalResolve = ModuleResolver.resolve;
       try {
         ModuleResolver.resolve = function (moduleName: string, relativeToPath: string) {
-          // resolve using importerPath instead of relativeToPath
-          return originalResolve.call(this, moduleName, importerPath);
+          try {
+            // resolve using importerPath instead of relativeToPath
+            return originalResolve.call(this, moduleName, importerPath);
+          } catch (e) {
+            if (isModuleResolutionError(e)) {
+              return originalResolve.call(this, moduleName, relativeToPath);
+            }
+            throw e;
+          }
         };
         return originalLoadPlugin.apply(this, arguments);
       } finally {
@@ -223,8 +230,15 @@ if (!ConfigArrayFactory.__patched) {
       const originalResolve = ModuleResolver.resolve;
       try {
         ModuleResolver.resolve = function (moduleName: string, relativeToPath: string) {
-          // resolve using ctx.filePath instead of relativeToPath
-          return originalResolve.call(this, moduleName, ctx.filePath);
+          try {
+            // resolve using ctx.filePath instead of relativeToPath
+            return originalResolve.call(this, moduleName, ctx.filePath);
+          } catch (e) {
+            if (isModuleResolutionError(e)) {
+              return originalResolve.call(this, moduleName, relativeToPath);
+            }
+            throw e;
+          }
         };
         return originalLoadPlugin.apply(this, arguments);
       } finally {