From 7164a847f0b3e463e2cc184429de982d4f8ad6e2 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Tue, 21 Jan 2020 17:00:32 +0000
Subject: [PATCH] Bug 1608799 - Load devtools debugger's .eslintignore directly
 into ESLint to avoid duplication. r=jdescottes

Differential Revision: https://phabricator.services.mozilla.com/D60148

--HG--
extra : moz-landing-system : lando
---
 .eslintignore                          | 13 -------------
 .eslintrc.js                           | 13 ++++++++++---
 devtools/client/debugger/.eslintignore |  4 +---
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index c1b108fc34d2..4276d10b5dba 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -66,19 +66,6 @@ devtools/server/tests/browser/storage-*.html
 !devtools/server/tests/browser/storage-unsecured-iframe.html
 devtools/server/tests/browser/stylesheets-nested-iframes.html
 devtools/client/webreplay/mochitest/examples/*.html
-
-# Ignore devtools debugger files
-# Keep in sync with devtools/client/debugger/.eslintignore
-devtools/client/debugger/assets/*
-devtools/client/debugger/src/test/examples/
-devtools/client/debugger/src/test/integration/
-devtools/client/debugger/src/test/unit-sources/
-devtools/client/debugger/src/**/fixtures/
-devtools/client/debugger/src/test/mochitest/
-devtools/client/debugger/bin/
-devtools/client/debugger/packages/**/fixtures/
-devtools/client/debugger/node_modules
-devtools/client/debugger/out
 devtools/client/webreplay/mochitest/examples/
 
 # Ignore devtools debugger files which aren't intended for linting, and also
diff --git a/.eslintrc.js b/.eslintrc.js
index 17ac374549e4..6f5db017f50f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -33,9 +33,16 @@ const chromeTestPaths = [
   "**/test*/chrome/",
 ];
 
-const ignorePatterns =
-  fs.readFileSync("tools/rewriting/ThirdPartyPaths.txt")
-    .toString("utf-8").split("\n");
+const ignorePatterns = [
+  ...fs.readFileSync("tools/rewriting/ThirdPartyPaths.txt")
+    .toString("utf-8")
+    .split("\n"),
+  ...fs.readFileSync("devtools/client/debugger/.eslintignore")
+    .toString("utf-8")
+    .split("\n")
+    .filter(p => p && !p.startsWith("#"))
+    .map(p => `devtools/client/debugger/${p}`),
+]
 
 module.exports = {
   ignorePatterns,
diff --git a/devtools/client/debugger/.eslintignore b/devtools/client/debugger/.eslintignore
index c6e30f7c69b7..0c011b6f80c0 100644
--- a/devtools/client/debugger/.eslintignore
+++ b/devtools/client/debugger/.eslintignore
@@ -1,5 +1,3 @@
-# Keep in sync with top-level .eslintignore
-
 assets/*
 src/test/examples/**
 src/test/integration/**
@@ -9,4 +7,4 @@ src/test/mochitest/**
 bin/
 packages/**/fixtures/**
 node_modules
-out
\ No newline at end of file
+out