From b684eaae49d97154a36dcc5b230550e3041fa216 Mon Sep 17 00:00:00 2001
From: Joe Fleming <w33ble@users.noreply.github.com>
Date: Fri, 2 Nov 2018 11:24:11 -0600
Subject: [PATCH] Chore: fix canvas linting (#25024)

This fixes `yarn run lint` from within the Canvas plugin path.

- Point to the correct eslint config file
- Use absolute path for `packageDir`
- Remove extraneous `packageDir` settings
---
 .eslintrc.js                       | 29 +++++++++++------------------
 x-pack/plugins/canvas/package.json |  2 +-
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 49c0e590a112..dcda237f9e2f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -345,6 +345,17 @@ module.exports = {
     /**
      * Canvas overrides
      */
+    {
+      files: ['x-pack/plugins/canvas/*', 'x-pack/plugins/canvas/**/*'],
+      rules: {
+        'import/no-extraneous-dependencies': [
+          'error',
+          {
+            packageDir: resolve(__dirname, 'x-pack'),
+          },
+        ],
+      },
+    },
     {
       files: ['x-pack/plugins/canvas/**/*'],
       plugins: ['prettier'],
@@ -403,17 +414,6 @@ module.exports = {
         ],
       },
     },
-    {
-      files: ['x-pack/plugins/canvas/*', 'x-pack/plugins/canvas/**/*'],
-      rules: {
-        'import/no-extraneous-dependencies': [
-          'error',
-          {
-            packageDir: './x-pack/',
-          },
-        ],
-      },
-    },
     {
       files: [
         'x-pack/plugins/canvas/gulpfile.js',
@@ -428,7 +428,6 @@ module.exports = {
           {
             devDependencies: true,
             peerDependencies: true,
-            packageDir: './x-pack/',
           },
         ],
       },
@@ -437,12 +436,6 @@ module.exports = {
       files: ['x-pack/plugins/canvas/canvas_plugin_src/**/*'],
       globals: { canvas: true, $: true },
       rules: {
-        'import/no-extraneous-dependencies': [
-          'error',
-          {
-            packageDir: './x-pack/',
-          },
-        ],
         'import/no-unresolved': [
           'error',
           {
diff --git a/x-pack/plugins/canvas/package.json b/x-pack/plugins/canvas/package.json
index 57468b9dd9cb..61b4995e4308 100644
--- a/x-pack/plugins/canvas/package.json
+++ b/x-pack/plugins/canvas/package.json
@@ -10,7 +10,7 @@
   "scripts": {
     "kbn": "node ../../../scripts/kbn",
     "start": "../../node_modules/.bin/gulp canvas:dev",
-    "lint": "node ../../../scripts/eslint '*.js' '__tests__/**/*.js' 'tasks/**/*.js' 'server/**/*.js' 'common/**/*.js' 'public/**/*.{js,jsx}' 'canvas_plugin_src/**/*.{js,jsx}' --ignore-pattern 'canvas_plugin_src/lib/flot-charts/**/*' --ignore-pattern 'common/lib/grammar.js' --ignore-pattern 'canvas_plugin/**/*'",
+    "lint": "node ../../../scripts/eslint -c ../../../.eslintrc.js '*.js' '__tests__/**/*.js' 'tasks/**/*.js' 'server/**/*.js' 'common/**/*.js' 'public/**/*.{js,jsx}' 'canvas_plugin_src/**/*.{js,jsx}' --ignore-pattern 'canvas_plugin_src/lib/flot-charts/**/*' --ignore-pattern 'common/lib/grammar.js' --ignore-pattern 'canvas_plugin/**/*'",
     "test": "../../node_modules/.bin/gulp canvas:test",
     "test:common": "../../node_modules/.bin/gulp canvas:test:common",
     "test:server": "../../node_modules/.bin/gulp canvas:test:server",