From 8566b2b8dc06e52b28ee2068ae121e605884fc9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Chalk?= Date: Tue, 4 Mar 2025 10:51:24 +0100 Subject: [PATCH 1/2] fix(utils): remove partial from mergeConfigs return type --- packages/utils/src/lib/merge-configs.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/utils/src/lib/merge-configs.ts b/packages/utils/src/lib/merge-configs.ts index 975737506..61d5331c7 100644 --- a/packages/utils/src/lib/merge-configs.ts +++ b/packages/utils/src/lib/merge-configs.ts @@ -9,8 +9,8 @@ import type { export function mergeConfigs( config: CoreConfig, ...configs: Partial[] -): Partial { - return configs.reduce( +): CoreConfig { + return configs.reduce( (acc, obj) => ({ ...acc, ...mergeCategories(acc.categories, obj.categories), From cf942ab6325eab637ac74873a68ab16fc1255569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Chalk?= Date: Tue, 4 Mar 2025 12:32:06 +0100 Subject: [PATCH 2/2] test(plugin-eslint): increase runner timeout to prevent windows flakiness --- packages/plugin-eslint/src/lib/runner.integration.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/plugin-eslint/src/lib/runner.integration.test.ts b/packages/plugin-eslint/src/lib/runner.integration.test.ts index 8a58d60eb..ffe036223 100644 --- a/packages/plugin-eslint/src/lib/runner.integration.test.ts +++ b/packages/plugin-eslint/src/lib/runner.integration.test.ts @@ -91,5 +91,5 @@ describe('executeRunner', () => { }, }), ); - }, 15_000); -}); + }); +}, 20_000);