Merge pull request #17123 from Snuffleupagus/eslint-globals

Update the ESLint `globals` list (PR 17055 follow-up)
mozilla · Oct 15, 2023 · a9a1195 · a9a1195
2 parents 76bf3da + 93f24dd
commit a9a1195
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 11 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -22,12 +22,11 @@
     "browser": true,
     "es2022": true,
     "worker": true,
-    "amd": true,
   },
 
   "globals": {
-    "PDFJSDev": false,
-    "exports": false,
+    "PDFJSDev": "readonly",
+    "__non_webpack_import__": "readonly",
   },
 
   "rules": {

diff --git a/src/display/api.js b/src/display/api.js
@@ -2306,7 +2306,7 @@ class PDFWorker {
       const worker =
         typeof PDFJSDev === "undefined"
           ? await import("pdfjs/pdf.worker.js")
-          : await __non_webpack_import__(this.workerSrc); // eslint-disable-line no-undef
+          : await __non_webpack_import__(this.workerSrc);
       return worker.WorkerMessageHandler;
     };
 

diff --git a/src/display/node_stream.js b/src/display/node_stream.js
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* globals __non_webpack_import__ */
 
 import {
   AbortException,

diff --git a/src/display/node_utils.js b/src/display/node_utils.js
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* globals __non_webpack_import__ */
 
 import {
   BaseCanvasFactory,

diff --git a/src/pdf.worker.entry.js b/src/pdf.worker.entry.js
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/* globals require:readonly */
 /* eslint-disable import/no-commonjs */
 
 (typeof window !== "undefined"

diff --git a/test/unit/node_stream_spec.js b/test/unit/node_stream_spec.js
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* globals __non_webpack_import__ */
 
 import { AbortException, isNodeJS } from "../../src/shared/util.js";
 import { PDFNodeStream } from "../../src/display/node_stream.js";

diff --git a/test/unit/test_utils.js b/test/unit/test_utils.js
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* globals __non_webpack_import__ */
 
 import { NullStream, StringStream } from "../../src/core/stream.js";
 import { Page, PDFDocument } from "../../src/core/document.js";

diff --git a/web/app.js b/web/app.js
@@ -2268,15 +2268,15 @@ async function loadFakeWorker() {
     globalThis.pdfjsWorker = await import("pdfjs/pdf.worker.js");
     return;
   }
-  await __non_webpack_import__(PDFWorker.workerSrc); // eslint-disable-line no-undef
+  await __non_webpack_import__(PDFWorker.workerSrc);
 }
 
 async function loadPDFBug(self) {
   const { debuggerScriptPath } = self.appConfig;
   const { PDFBug } =
     typeof PDFJSDev === "undefined"
       ? await import(debuggerScriptPath) // eslint-disable-line no-unsanitized/method
-      : await __non_webpack_import__(debuggerScriptPath); // eslint-disable-line no-undef
+      : await __non_webpack_import__(debuggerScriptPath);
 
   self._PDFBug = PDFBug;
 }

diff --git a/web/generic_scripting.js b/web/generic_scripting.js
@@ -45,7 +45,7 @@ class GenericScripting {
       const sandbox =
         typeof PDFJSDev === "undefined"
           ? import(sandboxBundleSrc) // eslint-disable-line no-unsanitized/method
-          : __non_webpack_import__(sandboxBundleSrc); // eslint-disable-line no-undef
+          : __non_webpack_import__(sandboxBundleSrc);
       sandbox
         .then(pdfjsSandbox => {
           resolve(pdfjsSandbox.QuickJSSandbox());