From 237c0f1d4fe33b7ba7e7a02d57adcebb34dc6bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <sorenlouv@gmail.com>
Date: Wed, 6 May 2020 01:50:10 +0200
Subject: [PATCH] [7.x] [APM] Update path to APM app after move to NP (#65034)
 (#65296)

---
 .eslintignore | 2 +-
 .eslintrc.js  | 8 ++++----
 .gitignore    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 4913192e81c1..53b3d8072043 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -25,7 +25,7 @@ target
 /src/plugins/vis_type_timelion/public/_generated_/**
 /src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
 /x-pack/legacy/plugins/**/__tests__/fixtures/**
-/x-pack/legacy/plugins/apm/e2e/cypress/**/snapshots.js
+/x-pack/plugins/apm/e2e/cypress/**/snapshots.js
 /x-pack/legacy/plugins/canvas/canvas_plugin
 /x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts
 /x-pack/legacy/plugins/canvas/shareable_runtime/build
diff --git a/.eslintrc.js b/.eslintrc.js
index 081eb049c28b..ae6671139c8b 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -310,7 +310,7 @@ module.exports = {
     {
       files: [
         'x-pack/test/functional/apps/**/*.js',
-        'x-pack/legacy/plugins/apm/**/*.js',
+        'x-pack/plugins/apm/**/*.js',
         'test/*/config.ts',
         'test/*/config_open.ts',
         'test/*/{tests,test_suites,apis,apps}/**/*',
@@ -397,7 +397,7 @@ module.exports = {
         'x-pack/**/*.test.js',
         'x-pack/test_utils/**/*',
         'x-pack/gulpfile.js',
-        'x-pack/legacy/plugins/apm/public/utils/testHelpers.js',
+        'x-pack/plugins/apm/public/utils/testHelpers.js',
       ],
       rules: {
         'import/no-extraneous-dependencies': [
@@ -523,7 +523,7 @@ module.exports = {
      * APM overrides
      */
     {
-      files: ['x-pack/legacy/plugins/apm/**/*.js'],
+      files: ['x-pack/plugins/apm/**/*.js'],
       rules: {
         'no-unused-vars': ['error', { ignoreRestSiblings: true }],
         'no-console': ['warn', { allow: ['error'] }],
@@ -531,7 +531,7 @@ module.exports = {
     },
     {
       plugins: ['react-hooks'],
-      files: ['x-pack/legacy/plugins/apm/**/*.{ts,tsx}'],
+      files: ['x-pack/plugins/apm/**/*.{ts,tsx}'],
       rules: {
         'react-hooks/rules-of-hooks': 'error', // Checks rules of Hooks
         'react-hooks/exhaustive-deps': ['error', { additionalHooks: '^useFetcher$' }],
diff --git a/.gitignore b/.gitignore
index bd7a954f950e..13c7cd5fb276 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,6 @@ package-lock.json
 *.sublime-*
 npm-debug.log*
 .tern-project
-x-pack/legacy/plugins/apm/tsconfig.json
+x-pack/plugins/apm/tsconfig.json
 apm.tsconfig.json
-/x-pack/legacy/plugins/apm/e2e/snapshots.js
+/x-pack/plugins/apm/e2e/snapshots.js