From 6d0a6d996ba141f73e92e62324c0e6bc0927d03e Mon Sep 17 00:00:00 2001 From: Gerard Soldevila Date: Wed, 18 Dec 2024 16:36:54 +0100 Subject: [PATCH 1/2] Unwrap / cleanup / sort patterns --- .../styled_components_files.js | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/packages/kbn-babel-preset/styled_components_files.js b/packages/kbn-babel-preset/styled_components_files.js index 60dbb2b1053de..79eb243664e99 100644 --- a/packages/kbn-babel-preset/styled_components_files.js +++ b/packages/kbn-babel-preset/styled_components_files.js @@ -13,16 +13,31 @@ 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[\/\\](observability_solution\/apm|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[\/\\](observability_solution\/apm|beats_management|fleet|observability_solution\/infra|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[\/\\]apm[\/\\]/, + /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[\/\\]/, ], }; From 71b506af3cc7f867206f585b02f3ee34afa52f93 Mon Sep 17 00:00:00 2001 From: Gerard Soldevila Date: Wed, 18 Dec 2024 17:03:41 +0100 Subject: [PATCH 2/2] Update x-pack .gitignore --- x-pack/.gitignore | 8 +++++++- x-pack/platform/plugins/shared/screenshotting/.gitignore | 2 ++ x-pack/plugins/reporting/.gitignore | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 x-pack/platform/plugins/shared/screenshotting/.gitignore create mode 100644 x-pack/plugins/reporting/.gitignore diff --git a/x-pack/.gitignore b/x-pack/.gitignore index 918a6a7d1c388..b8d3255bbefd4 100644 --- a/x-pack/.gitignore +++ b/x-pack/.gitignore @@ -5,9 +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/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/