@pandacss/config 0.0.0-dev-20230512213429 → 0.0.0-dev-20230513102701

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+import { Config } from '@pandacss/types';
+
 declare function findConfigFile({ cwd, file }: {
     cwd: string;
     file?: string;
@@ -16,15 +18,14 @@ declare function loadConfigFile(options: ConfigFileOptions): Promise<{
 type Extendable<T> = T & {
     extend?: T;
 };
-type Dict = Record<string, any>;
-type ExtendableRecord = Extendable<Dict>;
+type ExtendableConfig = Extendable<Config>;
 /**
  * Merge all configs into a single config
  */
-declare function mergeConfigs(configs: ExtendableRecord[]): any;
+declare function mergeConfigs(configs: ExtendableConfig[]): any;
 /**
  * Recursively merge all presets into a single config
  */
-declare function getResolvedConfig(config: ExtendableRecord, cwd: string): Promise<any>;
+declare function getResolvedConfig(config: ExtendableConfig, cwd: string): Promise<any>;
 
 export { findConfigFile, getResolvedConfig, loadConfigFile, mergeConfigs };

package/dist/index.js

@@ -138,18 +138,19 @@ function mergeConfigs(configs2) {
 }
 async function getResolvedConfig(config, cwd) {
   const presets = config.presets ?? [];
-  const configs2 = await Promise.all(
-    presets.slice().reverse().map(async (preset) => {
-      if (typeof preset === "string") {
-        const presetModule = await bundle(preset, cwd);
-        return getResolvedConfig(presetModule.config, cwd);
-      } else {
-        return getResolvedConfig(preset, cwd);
-      }
-    })
-  );
-  delete config.presets;
-  return mergeConfigs([config, ...configs2]);
+  const configs2 = [config];
+  while (presets.length > 0) {
+    const preset = presets.shift();
+    if (typeof preset === "string") {
+      const presetModule = await bundle(preset, cwd);
+      configs2.push(presetModule.config);
+      presets.unshift(...presetModule.config.presets ?? []);
+    } else {
+      configs2.push(preset);
+      presets.unshift(...preset.presets ?? []);
+    }
+  }
+  return mergeConfigs(configs2);
 }
 
 // src/load-config.ts

package/dist/index.mjs

@@ -99,18 +99,19 @@ function mergeConfigs(configs2) {
 }
 async function getResolvedConfig(config, cwd) {
   const presets = config.presets ?? [];
-  const configs2 = await Promise.all(
-    presets.slice().reverse().map(async (preset) => {
-      if (typeof preset === "string") {
-        const presetModule = await bundle(preset, cwd);
-        return getResolvedConfig(presetModule.config, cwd);
-      } else {
-        return getResolvedConfig(preset, cwd);
-      }
-    })
-  );
-  delete config.presets;
-  return mergeConfigs([config, ...configs2]);
+  const configs2 = [config];
+  while (presets.length > 0) {
+    const preset = presets.shift();
+    if (typeof preset === "string") {
+      const presetModule = await bundle(preset, cwd);
+      configs2.push(presetModule.config);
+      presets.unshift(...presetModule.config.presets ?? []);
+    } else {
+      configs2.push(preset);
+      presets.unshift(...preset.presets ?? []);
+    }
+  }
+  return mergeConfigs(configs2);
 }
 
 // src/load-config.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pandacss/config",
-  "version": "0.0.0-dev-20230512213429",
+  "version": "0.0.0-dev-20230513102701",
   "description": "Find and load panda config",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -17,9 +17,9 @@
     "bundle-n-require": "^1.0.1",
     "merge-anything": "^5.1.6",
     "escalade": "3.1.1",
-    "@pandacss/logger": "0.0.0-dev-20230512213429",
-    "@pandacss/error": "0.0.0-dev-20230512213429",
-    "@pandacss/types": "0.0.0-dev-20230512213429"
+    "@pandacss/logger": "0.0.0-dev-20230513102701",
+    "@pandacss/error": "0.0.0-dev-20230513102701",
+    "@pandacss/types": "0.0.0-dev-20230513102701"
   },
   "scripts": {
     "build": "pnpm tsup src/index.ts --format=esm,cjs --shims --dts",