From 198ef044f8cae5f3f396df1f28e8304999f9982b Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Sun, 16 May 2021 11:17:23 +0200
Subject: [PATCH] Account for changes in `eslint-plugin-import` version
 `2.23.0`

The simplest solution, as far as I can tell, to "fix" the new errors reported by the `no-unresolved` rules was to extend the existing whitelisting to cover the new cases. Given that the affected `imports` are only relevant in `gulp server`-mode, this should thus be completely fine.

Please find additional information at:
 - https://github.com/benmosher/eslint-plugin-import/releases/tag/v2.23.0
 - https://github.com/benmosher/eslint-plugin-import/blob/v2.23.0/CHANGELOG.md#2230---2021-05-13
---
 .eslintrc                         |  4 +++-
 external/builder/test-fixtures.js |  2 +-
 web/.eslintrc                     | 10 ----------
 3 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 web/.eslintrc

diff --git a/.eslintrc b/.eslintrc
index 128967483..13a0955b8 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -32,7 +32,9 @@
   "rules": {
     // Plugins
     "import/extensions": ["error", "always", { "ignorePackages": true, }],
-    "import/no-unresolved": "error",
+    "import/no-unresolved": ["error", {
+      "ignore": ["pdfjs", "pdfjs-lib", "pdfjs-web"]
+    }],
     "mozilla/avoid-removeChild": "error",
     "mozilla/use-includes-instead-of-indexOf": "error",
     "no-unsanitized/method": "error",
diff --git a/external/builder/test-fixtures.js b/external/builder/test-fixtures.js
index 2cc059beb..90b501879 100644
--- a/external/builder/test-fixtures.js
+++ b/external/builder/test-fixtures.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const builder = require("./builder");
+const builder = require("./builder.js");
 const fs = require("fs");
 const path = require("path");
 
diff --git a/web/.eslintrc b/web/.eslintrc
deleted file mode 100644
index 08e6f9e38..000000000
--- a/web/.eslintrc
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": [
-    "../.eslintrc"
-  ],
-
-  "rules": {
-    // Plugins
-    "import/no-unresolved": ["error", { "ignore": ["pdfjs-lib"]}],
-  },
-}