From 2111c52443e7641caad291e0daaea8e2fe6c4562 Mon Sep 17 00:00:00 2001
From: Milos Djermanovic <milos.djermanovic@gmail.com>
Date: Tue, 24 Mar 2020 01:16:17 +0100
Subject: [PATCH] Upgrade: esquery@1.2.0 (#13076)

---
 lib/linter/node-event-generator.js | 4 ++--
 package.json                       | 2 +-
 webpack.config.js                  | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/linter/node-event-generator.js b/lib/linter/node-event-generator.js
index fc7b879f641..6f3b2513998 100644
--- a/lib/linter/node-event-generator.js
+++ b/lib/linter/node-event-generator.js
@@ -159,8 +159,8 @@ function tryParseSelector(rawSelector) {
     try {
         return esquery.parse(rawSelector.replace(/:exit$/u, ""));
     } catch (err) {
-        if (typeof err.offset === "number") {
-            throw new SyntaxError(`Syntax error in selector "${rawSelector}" at position ${err.offset}: ${err.message}`);
+        if (err.location && err.location.start && typeof err.location.start.offset === "number") {
+            throw new SyntaxError(`Syntax error in selector "${rawSelector}" at position ${err.location.start.offset}: ${err.message}`);
         }
         throw err;
     }
diff --git a/package.json b/package.json
index e6d91d59f19..6732155e43a 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "eslint-utils": "^2.0.0",
     "eslint-visitor-keys": "^1.1.0",
     "espree": "^6.2.1",
-    "esquery": "^1.0.1",
+    "esquery": "^1.2.0",
     "esutils": "^2.0.2",
     "file-entry-cache": "^5.0.1",
     "functional-red-black-tree": "^1.0.1",
diff --git a/webpack.config.js b/webpack.config.js
index 0c8a0b90554..29d60cb4d27 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -42,5 +42,8 @@ module.exports = {
             }
         ]
     },
+    resolve: {
+        mainFields: ["main", "module"]
+    },
     stats: "errors-only"
 };