From 313b908944fccd282baee63d88c7c33aadb1cec5 Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Wed, 7 Nov 2018 08:33:39 -0800
Subject: [PATCH] [canvas] unify eslint config in .eslintrc.js (#25260)

Simply remove the remaining eslint config files from canvas and merge with other canvas related overrides in `.eslintrc.js`
---
 .eslintrc.js                                         | 12 ++++++++++++
 .../canvas_plugin_src/lib/flot-charts/.eslintrc      |  2 --
 x-pack/plugins/canvas/public/.eslintrc               |  2 --
 3 files changed, 12 insertions(+), 4 deletions(-)
 delete mode 100644 x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/.eslintrc
 delete mode 100644 x-pack/plugins/canvas/public/.eslintrc

diff --git a/.eslintrc.js b/.eslintrc.js
index dcda237f9e2f..c07b3723f0d4 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -444,5 +444,17 @@ module.exports = {
         ],
       },
     },
+    {
+      files: ['x-pack/plugins/canvas/public/**/*'],
+      env: {
+        browser: true,
+      },
+    },
+    {
+      files: ['x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/**/*'],
+      env: {
+        jquery: true,
+      },
+    },
   ],
 };
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/.eslintrc b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/.eslintrc
deleted file mode 100644
index 2a22ef440bd4..000000000000
--- a/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/.eslintrc
+++ /dev/null
@@ -1,2 +0,0 @@
-env:
-  jquery: true
\ No newline at end of file
diff --git a/x-pack/plugins/canvas/public/.eslintrc b/x-pack/plugins/canvas/public/.eslintrc
deleted file mode 100644
index 5c9fc4c25534..000000000000
--- a/x-pack/plugins/canvas/public/.eslintrc
+++ /dev/null
@@ -1,2 +0,0 @@
-env:
-  browser: true