update path for resolvePlugin and resolvePreset

torusresearch · Oct 10, 2024 · c58cd67 · c58cd67
1 parent a69e4c9
commit c58cd67
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/packages/torus-scripts/helpers/babelMerge.js b/packages/torus-scripts/helpers/babelMerge.js
@@ -8,15 +8,15 @@ function arrayMerge(source = [], overrides = []) {
 
 function mergeArray(source = [], overrides = [], resolve, deepmergeOpts) {
   return [...source, ...overrides].reduce((reduction, override) => {
-    const overrideName = resolve(Array.isArray(override) ? override[0] : override);
+    const overrideName = resolve(Array.isArray(override) ? override[0] : override).filepath;
     const overrideOptions = Array.isArray(override) ? override[1] : {};
     const base = reduction.find((base) => {
-      const baseName = resolve(Array.isArray(base) ? base[0] : base);
+      const baseName = resolve(Array.isArray(base) ? base[0] : base).filepath;
       return baseName === overrideName || baseName.includes(overrideName);
     });
 
     const index = reduction.includes(base) ? reduction.indexOf(base) : reduction.length;
-    const baseName = base ? resolve(Array.isArray(base) ? base[0] : base) : overrideName;
+    const baseName = base ? resolve(Array.isArray(base) ? base[0] : base).filepath : overrideName;
     const baseOptions = Array.isArray(base) ? base[1] : {};
     const options = merge(baseOptions, overrideOptions, {
       arrayMerge,