Merge pull request #1790 from flexn-io/chore/cherry-pick_fix_override

fix override when the original and the override have overlapping subs…
flexn-io · Nov 19, 2024 · d666c3c · d666c3c
2 parents 0b83364 + dd32f4b
commit d666c3c
Showing 1 changed file with 20 additions and 3 deletions.
diff --git a/packages/core/src/plugins/index.ts b/packages/core/src/plugins/index.ts
@@ -830,9 +830,26 @@ export const overrideFileContents = (
                     )}. FIXING...DONE`
                 );
             } else if (overrideExists) {
-                logInfo(
-                    `${chalk().gray(dest)} overridden by: ${chalk().gray(overridePath.split('node_modules').pop())}`
-                );
+                if (originalExists) {
+                    if (fk.includes(override[fk])) {
+                        fileToFix = fileToFix.replace(originalRegEx, `${override[fk]}`);
+                        logSuccess(
+                            `${chalk().bold.white(dest)} requires override by: ${chalk().bold.white(
+                                overridePath.split('node_modules').pop()
+                            )}. FIXING...DONE`
+                        );
+                    } else {
+                        logInfo(
+                            `${chalk().gray(dest)} overridden by: ${chalk().gray(
+                                overridePath.split('node_modules').pop()
+                            )}`
+                        );
+                    }
+                } else {
+                    logInfo(
+                        `${chalk().gray(dest)} overridden by: ${chalk().gray(overridePath.split('node_modules').pop())}`
+                    );
+                }
             } else {
                 failTerms.push(fk);
             }