From fbc337d7b2fc4324768404a4076a04c734007bac Mon Sep 17 00:00:00 2001 From: Bernie Reiter Date: Mon, 26 Jun 2023 15:41:25 +0000 Subject: [PATCH] Tools: Fix unresolvable conflicts computation in package sync script. Computation of unresolvable version conflicts in the Gutenberg package sync script had a few issues that were causing it to fail, among them two type errors in the destructuring of function arguments. Furthermore, de-duplication of required package versions was missing, leading to false positives being reported, when multiple instances of the same package all required the same version. Props dmsnell. Fixes #58628. git-svn-id: https://develop.svn.wordpress.org/trunk@56035 602fd350-edb4-49c9-b593-d223f7449a82 --- tools/release/sync-gutenberg-packages.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/release/sync-gutenberg-packages.js b/tools/release/sync-gutenberg-packages.js index a57134ff29..f5c8fbcdf7 100644 --- a/tools/release/sync-gutenberg-packages.js +++ b/tools/release/sync-gutenberg-packages.js @@ -120,8 +120,8 @@ function getMismatchedNonWordPressDependencies() { ; // Ensure that all the conflicts can be resolved with the same version - const unresolvableConflicts = Object.entries( groupBy( versionConflicts, ( [name] ) => name ) ) - .map( ( [name, group] ) => [name, group.map( ( [, { required }] ) => required )] ) + const unresolvableConflicts = Object.entries( groupBy( versionConflicts, ( {name} ) => name ) ) + .map( ( [name, group] ) => [name, uniq( group.map( ( { required } ) => required ) )] ) .filter( ( [, group] ) => group.length > 1 ); if ( unresolvableConflicts.length > 0 ) { console.error( "Can't resolve some conflicts automatically." );