@slidev/cli 0.48.0-beta.0 → 0.48.0-beta.10

package/dist/{chunk-CTBVOVLQ.mjs → chunk-O6TYYGU6.mjs}

@@ -2,29 +2,17 @@
 import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import fs from "fs-extra";
-import { isObject } from "@antfu/utils";
+import { deepMergeWithArray } from "@antfu/utils";
 import jiti from "jiti";
-function deepMerge(a, b, rootPath = "") {
-  a = { ...a };
-  Object.keys(b).forEach((key) => {
-    if (isObject(a[key]))
-      a[key] = deepMerge(a[key], b[key], rootPath ? `${rootPath}.${key}` : key);
-    else if (Array.isArray(a[key]))
-      a[key] = [...a[key], ...b[key]];
-    else
-      a[key] = b[key];
-  });
-  return a;
-}
-async function loadSetups(roots, name, arg, initial, merge = true) {
+async function loadSetups(clientRoot, roots, name, arg, initial, merge = true) {
   let returns = initial;
-  for (const root of roots) {
+  for (const root of [clientRoot, ...roots].reverse()) {
     const path = resolve(root, "setup", name);
     if (fs.existsSync(path)) {
       const { default: setup } = jiti(fileURLToPath(import.meta.url))(path);
       const result = await setup(arg);
       if (result !== null) {
-        returns = typeof merge === "function" ? merge(returns, result) : merge ? deepMerge(returns, result) : result;
+        returns = typeof merge === "function" ? merge(returns, result) : merge ? deepMergeWithArray(returns, result) : result;
       }
     }
   }