Merge branch 'main' into eui/v94.2.0

elastic · May 1, 2024 · f071e08 · f071e08
2 parents f7ba4d7 + 869402b
commit f071e08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/packages/kbn-storybook/src/webpack.config.ts b/packages/kbn-storybook/src/webpack.config.ts
@@ -139,6 +139,9 @@ export default ({ config: storybookConfig }: { config: Configuration }) => {
     stats,
   };
 
+  // Override storybookConfig mainFields instead of merging with config
+  delete storybookConfig.resolve?.mainFields;
+
   const updatedModuleRules = [];
   // clone and modify the module.rules config provided by storybook so that the default babel plugins run after the typescript preset
   for (const originalRule of storybookConfig.module?.rules ?? []) {

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group1/tests/alerting/find.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group1/tests/alerting/find.ts
@@ -20,6 +20,7 @@ const findTestUtils = (
   supertestWithoutAuth: any
 ) => {
   // Failing: See https://github.com/elastic/kibana/issues/182263
+  // Failing: See https://github.com/elastic/kibana/issues/182284
   describe.skip(describeType, () => {
     afterEach(() => objectRemover.removeAll());