Skip to content

Commit

Permalink
SKA: Misc code enhancements to reduce merge conflicts (elastic#204785)
Browse files Browse the repository at this point in the history
## 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
  • Loading branch information
gsoldevila authored Dec 19, 2024
1 parent e4dc35c commit e8e4e75
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 11 deletions.
32 changes: 23 additions & 9 deletions packages/kbn-babel-preset/styled_components_files.js
Original file line number Diff line number Diff line change
Expand Up @@ -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[\/\\]/,
],
};
9 changes: 7 additions & 2 deletions x-pack/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
2 changes: 2 additions & 0 deletions x-pack/platform/plugins/shared/screenshotting/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/chromium/
/.chromium/
3 changes: 3 additions & 0 deletions x-pack/plugins/reporting/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/chromium/
/.chromium/
/.phantom/

0 comments on commit e8e4e75

Please sign in to comment.