From e2f5964b5e395eb0cbf9f4b8fc3fa2ee42d24471 Mon Sep 17 00:00:00 2001
From: Gerard Soldevila <gerard.soldevila@elastic.co>
Date: Thu, 19 Dec 2024 09:10:58 +0100
Subject: [PATCH] SKA: Misc code enhancements to reduce merge conflicts
 (#204785)

## Summary

* `packages/kbn-babel-preset/styled_components_files.js`
  * unfolded `a|b` patterns
  * removed duplicates
  * removed incorrect patterns

* `x-pack/.gitignore`
  * move plugin patterns to specific `.gitignore` files
---
 .../styled_components_files.js                | 32 +++++++++++++------
 x-pack/.gitignore                             |  9 ++++--
 .../plugins/shared/screenshotting/.gitignore  |  2 ++
 x-pack/plugins/reporting/.gitignore           |  3 ++
 4 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 x-pack/platform/plugins/shared/screenshotting/.gitignore
 create mode 100644 x-pack/plugins/reporting/.gitignore

diff --git a/packages/kbn-babel-preset/styled_components_files.js b/packages/kbn-babel-preset/styled_components_files.js
index 6f6e1ddbb14ac..707053b68585f 100644
--- a/packages/kbn-babel-preset/styled_components_files.js
+++ b/packages/kbn-babel-preset/styled_components_files.js
@@ -13,16 +13,30 @@ module.exports = {
    * Used by `kbn-babel-preset` and `kbn-eslint-config`.
    */
   USES_STYLED_COMPONENTS: [
-    /packages[\/\\]kbn-ui-shared-deps-(npm|src)[\/\\]/,
-    /src[\/\\]plugins[\/\\](kibana_react)[\/\\]/,
-    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\](exploratory_view|investigate|investigate_app|observability|observability_ai_assistant_app|observability_ai_assistant_management|observability_solution|serverless_observability|streams|streams_app|synthetics|uptime|ux)[\/\\]/,
-    /x-pack[\/\\]plugins[\/\\](beats_management|fleet|observability_solution\/observability|observability_solution\/observability_shared|observability_solution\/exploratory_view|security_solution|timelines|observability_solution\/synthetics|observability_solution\/ux|observability_solution\/uptime)[\/\\]/,
-    /x-pack[\/\\]solutions[\/\\]security[\/\\]plugins[\/\\](beats_management|fleet|lists|observability_solution\/observability|observability_solution\/observability_shared|observability_solution\/exploratory_view|security_solution|timelines|observability_solution\/synthetics|observability_solution\/ux|observability_solution\/uptime)[\/\\]/,
-    /x-pack[\/\\]test[\/\\]plugin_functional[\/\\]plugins[\/\\]resolver_test[\/\\]/,
-    /x-pack[\/\\]packages[\/\\]elastic_assistant[\/\\]/,
+    /packages[\/\\]kbn-ui-shared-deps-npm[\/\\]/,
+    /packages[\/\\]kbn-ui-shared-deps-src[\/\\]/,
+    /src[\/\\]plugins[\/\\]kibana_react[\/\\]/,
+    /x-pack[\/\\]platform[\/\\]packages[\/\\]shared[\/\\]kbn-elastic-assistant[\/\\]/,
+    /x-pack[\/\\]plugins[\/\\]fleet[\/\\]/,
+    /x-pack[\/\\]plugins[\/\\]observability_solution[\/\\]observability_shared[\/\\]/,
+    /x-pack[\/\\]plugins[\/\\]security_solution[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]exploratory_view[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]investigate_app[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]investigate[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]observability_ai_assistant_app[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]observability_ai_assistant_management[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]observability_solution[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]observability[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]serverless_observability[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]streams_app[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]streams[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]synthetics[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]uptime[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]ux[\/\\]/,
     /x-pack[\/\\]solutions[\/\\]security[\/\\]packages[\/\\]ecs_data_quality_dashboard[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]security[\/\\]plugins[\/\\]lists[\/\\]/,
     /x-pack[\/\\]solutions[\/\\]security[\/\\]plugins[\/\\]security_solution[\/\\]/,
-    /x-pack[\/\\]platform[\/\\]packages[\/\\]shared[\/\\]kbn-elastic-assistant[\/\\]/,
-    /x-pack[\/\\]solutions[\/\\]security[\/\\]plugins[\/\\]lists/,
+    /x-pack[\/\\]solutions[\/\\]security[\/\\]plugins[\/\\]timelines[\/\\]/,
+    /x-pack[\/\\]test[\/\\]plugin_functional[\/\\]plugins[\/\\]resolver_test[\/\\]/,
   ],
 };
diff --git a/x-pack/.gitignore b/x-pack/.gitignore
index a5ef4968bd3bb..b8d3255bbefd4 100644
--- a/x-pack/.gitignore
+++ b/x-pack/.gitignore
@@ -5,10 +5,15 @@
 /test/functional/screenshots
 /test/functional/apps/**/reports/session
 /test/reporting/configs/failure_debug/
+
+# TODO remove once all of the modules have been relocated
+# we keep them around to avoid conflicts derived of merge commits,
+# suddenly adding a huge amount of files due to these rules being outdated
 /plugins/reporting/.chromium/
-/platform/plugins/shared/screenshotting/chromium/
-/plugins/screenshotting/chromium/
 /plugins/reporting/.phantom/
+/plugins/screenshotting/.chromium/
+/plugins/screenshotting/chromium/
+
 /.aws-config.json
 /.env
 /.kibana-plugin-helpers.dev.*
diff --git a/x-pack/platform/plugins/shared/screenshotting/.gitignore b/x-pack/platform/plugins/shared/screenshotting/.gitignore
new file mode 100644
index 0000000000000..5696171ed6995
--- /dev/null
+++ b/x-pack/platform/plugins/shared/screenshotting/.gitignore
@@ -0,0 +1,2 @@
+/chromium/
+/.chromium/
diff --git a/x-pack/plugins/reporting/.gitignore b/x-pack/plugins/reporting/.gitignore
new file mode 100644
index 0000000000000..71edd798b86b5
--- /dev/null
+++ b/x-pack/plugins/reporting/.gitignore
@@ -0,0 +1,3 @@
+/chromium/
+/.chromium/
+/.phantom/