@pandacss/config 0.42.0 → 0.44.0

package/dist/{chunk-F5ESIWB7.mjs → chunk-K5ODX2PU.mjs}

@@ -1,5 +1,5 @@
 // src/merge-config.ts
-import { assign, mergeWith, walkObject } from "@pandacss/shared";
+import { PANDA_CONFIG_NAME, assign, mergeWith, walkObject } from "@pandacss/shared";
 import { mergeAndConcat } from "merge-anything";
 
 // src/merge-hooks.ts
@@ -188,24 +188,26 @@ var compact = (obj) => {
 };
 var tokenKeys = ["description", "extensions", "type", "value", "deprecated"];
 function mergeConfigs(configs) {
-  const [userConfig] = configs;
+  const userConfig = configs.at(-1);
   const pluginHooks = userConfig.plugins ?? [];
   if (userConfig.hooks) {
-    pluginHooks.push({ name: "__panda.config__", hooks: userConfig.hooks });
+    pluginHooks.push({ name: PANDA_CONFIG_NAME, hooks: userConfig.hooks });
   }
+  const reversed = Array.from(configs).reverse();
   const mergedResult = assign(
     {
-      conditions: mergeExtensions(configs.map((config) => config.conditions ?? {})),
-      theme: mergeExtensions(configs.map((config) => config.theme ?? {})),
-      patterns: mergeExtensions(configs.map((config) => config.patterns ?? {})),
-      utilities: mergeExtensions(configs.map((config) => config.utilities ?? {})),
-      globalCss: mergeExtensions(configs.map((config) => config.globalCss ?? {})),
-      globalVars: mergeExtensions(configs.map((config) => config.globalVars ?? {})),
-      staticCss: mergeExtensions(configs.map((config) => config.staticCss ?? {})),
-      themes: mergeExtensions(configs.map((config) => config.themes ?? {})),
+      conditions: mergeExtensions(reversed.map((config) => config.conditions ?? {})),
+      theme: mergeExtensions(reversed.map((config) => config.theme ?? {})),
+      patterns: mergeExtensions(reversed.map((config) => config.patterns ?? {})),
+      utilities: mergeExtensions(reversed.map((config) => config.utilities ?? {})),
+      globalCss: mergeExtensions(reversed.map((config) => config.globalCss ?? {})),
+      globalVars: mergeExtensions(reversed.map((config) => config.globalVars ?? {})),
+      globalFontface: mergeExtensions(reversed.map((config) => config.globalFontface ?? {})),
+      staticCss: mergeExtensions(reversed.map((config) => config.staticCss ?? {})),
+      themes: mergeExtensions(reversed.map((config) => config.themes ?? {})),
       hooks: mergeHooks(pluginHooks)
     },
-    ...configs
+    ...reversed
   );
   const withoutEmpty = compact(mergedResult);
   if (withoutEmpty.theme?.tokens) {

package/dist/index.d.mts

@@ -40,9 +40,9 @@ type Extendable<T> = T & {
 };
 type ExtendableConfig = Extendable<Config>;
 /**
- * Recursively merge all presets into a single config
+ * Recursively merge all presets into a single config (depth-first using stack)
  */
-declare function getResolvedConfig(config: ExtendableConfig, cwd: string): Promise<_pandacss_types.UserConfig>;
+declare function getResolvedConfig(config: ExtendableConfig, cwd: string): Promise<Config>;
 
 /**
  * Find, load and resolve the final config (including presets)

package/dist/index.d.ts

@@ -40,9 +40,9 @@ type Extendable<T> = T & {
 };
 type ExtendableConfig = Extendable<Config>;
 /**
- * Recursively merge all presets into a single config
+ * Recursively merge all presets into a single config (depth-first using stack)
  */
-declare function getResolvedConfig(config: ExtendableConfig, cwd: string): Promise<_pandacss_types.UserConfig>;
+declare function getResolvedConfig(config: ExtendableConfig, cwd: string): Promise<Config>;
 
 /**
  * Find, load and resolve the final config (including presets)

package/dist/index.js

@@ -577,24 +577,26 @@ var compact = (obj) => {
 };
 var tokenKeys = ["description", "extensions", "type", "value", "deprecated"];
 function mergeConfigs(configs) {
-  const [userConfig] = configs;
+  const userConfig = configs.at(-1);
   const pluginHooks = userConfig.plugins ?? [];
   if (userConfig.hooks) {
-    pluginHooks.push({ name: "__panda.config__", hooks: userConfig.hooks });
+    pluginHooks.push({ name: import_shared5.PANDA_CONFIG_NAME, hooks: userConfig.hooks });
   }
+  const reversed = Array.from(configs).reverse();
   const mergedResult = (0, import_shared5.assign)(
     {
-      conditions: mergeExtensions(configs.map((config) => config.conditions ?? {})),
-      theme: mergeExtensions(configs.map((config) => config.theme ?? {})),
-      patterns: mergeExtensions(configs.map((config) => config.patterns ?? {})),
-      utilities: mergeExtensions(configs.map((config) => config.utilities ?? {})),
-      globalCss: mergeExtensions(configs.map((config) => config.globalCss ?? {})),
-      globalVars: mergeExtensions(configs.map((config) => config.globalVars ?? {})),
-      staticCss: mergeExtensions(configs.map((config) => config.staticCss ?? {})),
-      themes: mergeExtensions(configs.map((config) => config.themes ?? {})),
+      conditions: mergeExtensions(reversed.map((config) => config.conditions ?? {})),
+      theme: mergeExtensions(reversed.map((config) => config.theme ?? {})),
+      patterns: mergeExtensions(reversed.map((config) => config.patterns ?? {})),
+      utilities: mergeExtensions(reversed.map((config) => config.utilities ?? {})),
+      globalCss: mergeExtensions(reversed.map((config) => config.globalCss ?? {})),
+      globalVars: mergeExtensions(reversed.map((config) => config.globalVars ?? {})),
+      globalFontface: mergeExtensions(reversed.map((config) => config.globalFontface ?? {})),
+      staticCss: mergeExtensions(reversed.map((config) => config.staticCss ?? {})),
+      themes: mergeExtensions(reversed.map((config) => config.themes ?? {})),
       hooks: mergeHooks(pluginHooks)
     },
-    ...configs
+    ...reversed
   );
   const withoutEmpty = compact(mergedResult);
   if (withoutEmpty.theme?.tokens) {
@@ -623,21 +625,24 @@ function mergeConfigs(configs) {
 
 // src/get-resolved-config.ts
 async function getResolvedConfig(config, cwd) {
-  const presets = config.presets ?? [];
+  const stack = [config];
   const configs = [];
-  while (presets.length > 0) {
-    const preset = await presets.shift();
-    if (typeof preset === "string") {
-      const presetModule = await bundle(preset, cwd);
-      configs.unshift(await presetModule.config);
-      presets.unshift(...await presetModule.config.presets ?? []);
-    } else {
-      configs.unshift(preset);
-      presets.unshift(...preset.presets ?? []);
+  while (stack.length > 0) {
+    const current = stack.pop();
+    const subPresets = current.presets ?? [];
+    for (const subPreset of subPresets) {
+      if (typeof subPreset === "string") {
+        const presetModule = await bundle(subPreset, cwd);
+        stack.push(presetModule.config);
+      } else {
+        stack.push(await subPreset);
+      }
     }
+    configs.unshift(current);
   }
-  configs.unshift(config);
-  return mergeConfigs(configs);
+  const merged = mergeConfigs(configs);
+  merged.presets = configs.slice(0, -1);
+  return merged;
 }
 
 // src/resolve-config.ts
@@ -972,7 +977,7 @@ async function resolveConfig(result, cwd) {
       loadConfigResult.config = result2;
     }
   }
-  const serialized = (0, import_shared10.stringifyJson)(loadConfigResult.config);
+  const serialized = (0, import_shared10.stringifyJson)(Object.assign({}, loadConfigResult.config, { name: import_shared10.PANDA_CONFIG_NAME, presets: [] }));
   const deserialize = () => (0, import_shared10.parseJson)(serialized);
   return { ...loadConfigResult, serialized, deserialize, hooks };
 }

package/dist/index.mjs

@@ -6,7 +6,7 @@ import {
   isValidToken,
   mergeConfigs,
   serializeTokenValue
-} from "./chunk-F5ESIWB7.mjs";
+} from "./chunk-K5ODX2PU.mjs";
 import {
   diffConfigs
 } from "./chunk-Q2O7DCQS.mjs";
@@ -208,26 +208,29 @@ function getConfigDependencies(filePath, tsOptions = { pathMappings: [] }, compi
 
 // src/get-resolved-config.ts
 async function getResolvedConfig(config, cwd) {
-  const presets = config.presets ?? [];
+  const stack = [config];
   const configs = [];
-  while (presets.length > 0) {
-    const preset = await presets.shift();
-    if (typeof preset === "string") {
-      const presetModule = await bundle(preset, cwd);
-      configs.unshift(await presetModule.config);
-      presets.unshift(...await presetModule.config.presets ?? []);
-    } else {
-      configs.unshift(preset);
-      presets.unshift(...preset.presets ?? []);
+  while (stack.length > 0) {
+    const current = stack.pop();
+    const subPresets = current.presets ?? [];
+    for (const subPreset of subPresets) {
+      if (typeof subPreset === "string") {
+        const presetModule = await bundle(subPreset, cwd);
+        stack.push(presetModule.config);
+      } else {
+        stack.push(await subPreset);
+      }
     }
+    configs.unshift(current);
   }
-  configs.unshift(config);
-  return mergeConfigs(configs);
+  const merged = mergeConfigs(configs);
+  merged.presets = configs.slice(0, -1);
+  return merged;
 }
 
 // src/resolve-config.ts
 import { logger as logger3 } from "@pandacss/logger";
-import { omit, parseJson, stringifyJson, traverse } from "@pandacss/shared";
+import { PANDA_CONFIG_NAME, omit, parseJson, stringifyJson, traverse } from "@pandacss/shared";
 
 // src/bundled-preset.ts
 import { preset as presetBase } from "@pandacss/preset-base";
@@ -557,7 +560,7 @@ async function resolveConfig(result, cwd) {
       loadConfigResult.config = result2;
     }
   }
-  const serialized = stringifyJson(loadConfigResult.config);
+  const serialized = stringifyJson(Object.assign({}, loadConfigResult.config, { name: PANDA_CONFIG_NAME, presets: [] }));
   const deserialize = () => parseJson(serialized);
   return { ...loadConfigResult, serialized, deserialize, hooks };
 }

package/dist/merge-config.d.mts

@@ -1,4 +1,4 @@
-import { UserConfig, Config } from '@pandacss/types';
+import { Config } from '@pandacss/types';
 
 type Extendable<T> = T & {
     extend?: T;
@@ -7,6 +7,6 @@ type ExtendableConfig = Extendable<Config>;
 /**
  * Merge all configs into a single config
  */
-declare function mergeConfigs(configs: ExtendableConfig[]): UserConfig;
+declare function mergeConfigs(configs: ExtendableConfig[]): any;
 
 export { mergeConfigs };

package/dist/merge-config.d.ts

@@ -1,4 +1,4 @@
-import { UserConfig, Config } from '@pandacss/types';
+import { Config } from '@pandacss/types';
 
 type Extendable<T> = T & {
     extend?: T;
@@ -7,6 +7,6 @@ type ExtendableConfig = Extendable<Config>;
 /**
  * Merge all configs into a single config
  */
-declare function mergeConfigs(configs: ExtendableConfig[]): UserConfig;
+declare function mergeConfigs(configs: ExtendableConfig[]): any;
 
 export { mergeConfigs };

package/dist/merge-config.js

@@ -185,24 +185,26 @@ var compact = (obj) => {
 };
 var tokenKeys = ["description", "extensions", "type", "value", "deprecated"];
 function mergeConfigs(configs) {
-  const [userConfig] = configs;
+  const userConfig = configs.at(-1);
   const pluginHooks = userConfig.plugins ?? [];
   if (userConfig.hooks) {
-    pluginHooks.push({ name: "__panda.config__", hooks: userConfig.hooks });
+    pluginHooks.push({ name: import_shared2.PANDA_CONFIG_NAME, hooks: userConfig.hooks });
   }
+  const reversed = Array.from(configs).reverse();
   const mergedResult = (0, import_shared2.assign)(
     {
-      conditions: mergeExtensions(configs.map((config) => config.conditions ?? {})),
-      theme: mergeExtensions(configs.map((config) => config.theme ?? {})),
-      patterns: mergeExtensions(configs.map((config) => config.patterns ?? {})),
-      utilities: mergeExtensions(configs.map((config) => config.utilities ?? {})),
-      globalCss: mergeExtensions(configs.map((config) => config.globalCss ?? {})),
-      globalVars: mergeExtensions(configs.map((config) => config.globalVars ?? {})),
-      staticCss: mergeExtensions(configs.map((config) => config.staticCss ?? {})),
-      themes: mergeExtensions(configs.map((config) => config.themes ?? {})),
+      conditions: mergeExtensions(reversed.map((config) => config.conditions ?? {})),
+      theme: mergeExtensions(reversed.map((config) => config.theme ?? {})),
+      patterns: mergeExtensions(reversed.map((config) => config.patterns ?? {})),
+      utilities: mergeExtensions(reversed.map((config) => config.utilities ?? {})),
+      globalCss: mergeExtensions(reversed.map((config) => config.globalCss ?? {})),
+      globalVars: mergeExtensions(reversed.map((config) => config.globalVars ?? {})),
+      globalFontface: mergeExtensions(reversed.map((config) => config.globalFontface ?? {})),
+      staticCss: mergeExtensions(reversed.map((config) => config.staticCss ?? {})),
+      themes: mergeExtensions(reversed.map((config) => config.themes ?? {})),
       hooks: mergeHooks(pluginHooks)
     },
-    ...configs
+    ...reversed
   );
   const withoutEmpty = compact(mergedResult);
   if (withoutEmpty.theme?.tokens) {

package/dist/merge-config.mjs

@@ -1,6 +1,6 @@
 import {
   mergeConfigs
-} from "./chunk-F5ESIWB7.mjs";
+} from "./chunk-K5ODX2PU.mjs";
 export {
   mergeConfigs
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pandacss/config",
-  "version": "0.42.0",
+  "version": "0.44.0",
   "description": "Find and load panda config",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -73,11 +73,11 @@
     "merge-anything": "5.1.7",
     "microdiff": "1.3.2",
     "typescript": "5.3.3",
-    "@pandacss/logger": "0.42.0",
-    "@pandacss/preset-base": "0.42.0",
-    "@pandacss/preset-panda": "0.42.0",
-    "@pandacss/shared": "0.42.0",
-    "@pandacss/types": "0.42.0"
+    "@pandacss/logger": "0.44.0",
+    "@pandacss/preset-base": "0.44.0",
+    "@pandacss/preset-panda": "0.44.0",
+    "@pandacss/shared": "0.44.0",
+    "@pandacss/types": "0.44.0"
   },
   "devDependencies": {
     "pkg-types": "1.0.3"