diff --git a/packages/config/package.json b/packages/config/package.json index 25ac96864..9fedd4558 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -81,7 +81,7 @@ "@pandacss/types": "workspace:*", "bundle-n-require": "1.1.2", "escalade": "3.1.2", - "merge-anything": "5.1.7", + "merge-anything": "6.0.6", "microdiff": "1.5.0", "typescript": "5.9.3" }, diff --git a/playground/package.json b/playground/package.json index 8010476fd..ebc2339f6 100644 --- a/playground/package.json +++ b/playground/package.json @@ -30,7 +30,7 @@ "@prisma/client": "5.9.1", "@textea/json-viewer": "4.0.1", "lightningcss-wasm": "1.23.0", - "merge-anything": "5.1.7", + "merge-anything": "6.0.6", "monaco-editor": "0.46.0", "monaco-editor-auto-typings": "0.4.6", "monaco-jsx-syntax-highlight": "1.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6e3a2fac3..4a1a641a6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -186,8 +186,8 @@ importers: specifier: 3.1.2 version: 3.1.2 merge-anything: - specifier: 5.1.7 - version: 5.1.7 + specifier: 6.0.6 + version: 6.0.6 microdiff: specifier: 1.5.0 version: 1.5.0 @@ -801,8 +801,8 @@ importers: specifier: 1.23.0 version: 1.23.0 merge-anything: - specifier: 5.1.7 - version: 5.1.7 + specifier: 6.0.6 + version: 6.0.6 monaco-editor: specifier: 0.46.0 version: 0.46.0 @@ -817,7 +817,7 @@ importers: version: 5.1.5 next: specifier: 15.5.6 - version: 15.5.6(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(react-dom@19.1.1(react@19.1.1))(react@19.1.1) + version: 15.5.6(@babel/core@7.12.9)(@opentelemetry/api@1.9.0)(react-dom@19.1.1(react@19.1.1))(react@19.1.1) next-themes: specifier: 0.4.6 version: 0.4.6(react-dom@19.1.1(react@19.1.1))(react@19.1.1) @@ -1026,7 +1026,7 @@ importers: version: link:../css-lib nuxt: specifier: 3.16.0 - version: 3.16.0(@parcel/watcher@2.5.1)(@types/node@24.8.1)(db0@0.3.4)(eslint@9.39.1(jiti@2.6.1))(ioredis@5.8.2)(less@4.4.2)(lightningcss@1.25.1)(magicast@0.5.1)(optionator@0.9.4)(rollup@4.53.1)(terser@5.44.1)(tsx@4.20.6)(typescript@5.9.3)(vite@7.2.2(@types/node@24.8.1)(jiti@2.6.1)(less@4.4.2)(lightningcss@1.25.1)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1))(yaml@2.8.1) + version: 3.16.0(@parcel/watcher@2.5.1)(@types/node@24.8.1)(db0@0.3.4)(eslint@9.39.1(jiti@2.6.1))(ioredis@5.8.2)(less@4.4.2)(lightningcss@1.25.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.53.1)(terser@5.44.1)(tsx@4.20.6)(typescript@5.9.3)(vite@7.2.2(@types/node@24.8.1)(jiti@2.6.1)(less@4.4.2)(lightningcss@1.25.1)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1))(yaml@2.8.1) postcss: specifier: 8.4.49 version: 8.4.49 @@ -2515,7 +2515,7 @@ packages: '@builder.io/partytown@0.7.6': resolution: {integrity: sha512-snXIGNiZpqjno3XYQN2lbBB+05hsQR/LSttbtIW1c0gmZ7Kh/DIo0YrxlDxCDulAMFPFM8J+4voLwvYepSj3sw==} - deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. + deprecated: Use @qwik.dev/partytown instead hasBin: true '@builder.io/qwik-city@1.17.2': @@ -11680,6 +11680,10 @@ packages: resolution: {integrity: sha512-eRtbOb1N5iyH0tkQDAoQ4Ipsp/5qSR79Dzrz8hEPxRX10RWWR/iQXdoKmBSRCThY1Fh5EhISDtpSc93fpxUniQ==} engines: {node: '>=12.13'} + merge-anything@6.0.6: + resolution: {integrity: sha512-F3K1W45PvTjRZzbcYIhXntNr8cux00gUxR8IzNPPG+80gNlAHZGVBwFyN4x5yjw/7QkLPKDbRQBK4KrJKo69mw==} + engines: {node: '>=18'} + merge-descriptors@1.0.3: resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==} @@ -21598,35 +21602,6 @@ snapshots: transitivePeerDependencies: - magicast - '@nuxt/cli@3.30.0(magicast@0.5.1)': - dependencies: - c12: 3.3.1(magicast@0.5.1) - citty: 0.1.6 - confbox: 0.2.2 - consola: 3.4.2 - copy-paste: 2.2.0 - defu: 6.1.4 - exsolve: 1.0.7 - fuse.js: 7.1.0 - giget: 2.0.0 - jiti: 2.6.1 - listhen: 1.9.0 - nypm: 0.6.2 - ofetch: 1.5.1 - ohash: 2.0.11 - pathe: 2.0.3 - perfect-debounce: 2.0.0 - pkg-types: 2.3.0 - scule: 1.3.0 - semver: 7.7.3 - srvx: 0.9.5 - std-env: 3.10.0 - tinyexec: 1.0.2 - ufo: 1.6.1 - youch: 4.1.0-beta.12 - transitivePeerDependencies: - - magicast - '@nuxt/devalue@2.0.2': {} '@nuxt/devtools-kit@2.7.0(magicast@0.3.5)(vite@7.2.2(@types/node@24.8.1)(jiti@2.6.1)(less@4.4.2)(lightningcss@1.25.1)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1))': @@ -21716,33 +21691,6 @@ snapshots: transitivePeerDependencies: - magicast - '@nuxt/kit@3.16.0(magicast@0.5.1)': - dependencies: - c12: 3.3.1(magicast@0.5.1) - consola: 3.4.2 - defu: 6.1.4 - destr: 2.0.5 - errx: 0.1.0 - exsolve: 1.0.7 - globby: 14.1.0 - ignore: 7.0.5 - jiti: 2.6.1 - klona: 2.0.6 - knitwork: 1.2.0 - mlly: 1.8.0 - ohash: 2.0.11 - pathe: 2.0.3 - pkg-types: 2.3.0 - scule: 1.3.0 - semver: 7.7.3 - std-env: 3.10.0 - ufo: 1.6.1 - unctx: 2.4.1 - unimport: 4.2.0 - untyped: 2.0.0 - transitivePeerDependencies: - - magicast - '@nuxt/kit@3.20.1(magicast@0.3.5)': dependencies: c12: 3.3.1(magicast@0.3.5) @@ -21793,23 +21741,6 @@ snapshots: transitivePeerDependencies: - magicast - '@nuxt/telemetry@2.6.6(magicast@0.5.1)': - dependencies: - '@nuxt/kit': 3.16.0(magicast@0.5.1) - citty: 0.1.6 - consola: 3.4.2 - destr: 2.0.5 - dotenv: 16.6.1 - git-url-parse: 16.1.0 - is-docker: 3.0.0 - ofetch: 1.5.1 - package-manager-detector: 1.5.0 - pathe: 2.0.3 - rc9: 2.1.2 - std-env: 3.10.0 - transitivePeerDependencies: - - magicast - '@nuxt/vite-builder@3.16.0(@types/node@24.8.1)(eslint@9.39.1(jiti@2.6.1))(less@4.4.2)(lightningcss@1.25.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.53.1)(terser@5.44.1)(tsx@4.20.6)(typescript@5.9.3)(vue@3.5.24(typescript@5.9.3))(yaml@2.8.1)': dependencies: '@nuxt/kit': 3.16.0(magicast@0.3.5) @@ -21870,66 +21801,6 @@ snapshots: - vue-tsc - yaml - '@nuxt/vite-builder@3.16.0(@types/node@24.8.1)(eslint@9.39.1(jiti@2.6.1))(less@4.4.2)(lightningcss@1.25.1)(magicast@0.5.1)(optionator@0.9.4)(rollup@4.53.1)(terser@5.44.1)(tsx@4.20.6)(typescript@5.9.3)(vue@3.5.24(typescript@5.9.3))(yaml@2.8.1)': - dependencies: - '@nuxt/kit': 3.16.0(magicast@0.5.1) - '@rollup/plugin-replace': 6.0.3(rollup@4.53.1) - '@vitejs/plugin-vue': 5.2.4(vite@6.4.1(@types/node@24.8.1)(jiti@2.6.1)(less@4.4.2)(lightningcss@1.25.1)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1))(vue@3.5.24(typescript@5.9.3)) - '@vitejs/plugin-vue-jsx': 4.2.0(vite@6.4.1(@types/node@24.8.1)(jiti@2.6.1)(less@4.4.2)(lightningcss@1.25.1)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1))(vue@3.5.24(typescript@5.9.3)) - autoprefixer: 10.4.21(postcss@8.5.6) - consola: 3.4.2 - cssnano: 7.1.2(postcss@8.5.6) - defu: 6.1.4 - esbuild: 0.25.12 - escape-string-regexp: 5.0.0 - exsolve: 1.0.7 - externality: 1.0.2 - get-port-please: 3.2.0 - h3: 1.15.4 - jiti: 2.6.1 - knitwork: 1.2.0 - magic-string: 0.30.19 - mlly: 1.8.0 - ohash: 2.0.11 - pathe: 2.0.3 - perfect-debounce: 1.0.0 - pkg-types: 2.3.0 - postcss: 8.5.6 - rollup-plugin-visualizer: 5.14.0(rollup@4.53.1) - std-env: 3.10.0 - ufo: 1.6.1 - unenv: 2.0.0-rc.24 - unplugin: 2.3.10 - vite: 6.4.1(@types/node@24.8.1)(jiti@2.6.1)(less@4.4.2)(lightningcss@1.25.1)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1) - vite-node: 3.2.4(@types/node@24.8.1)(jiti@2.6.1)(less@4.4.2)(lightningcss@1.25.1)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1) - vite-plugin-checker: 0.9.3(eslint@9.39.1(jiti@2.6.1))(optionator@0.9.4)(typescript@5.9.3)(vite@6.4.1(@types/node@24.8.1)(jiti@2.6.1)(less@4.4.2)(lightningcss@1.25.1)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1)) - vue: 3.5.24(typescript@5.9.3) - vue-bundle-renderer: 2.2.0 - transitivePeerDependencies: - - '@biomejs/biome' - - '@types/node' - - eslint - - less - - lightningcss - - magicast - - meow - - optionator - - rolldown - - rollup - - sass - - sass-embedded - - stylelint - - stylus - - sugarss - - supports-color - - terser - - tsx - - typescript - - vls - - vti - - vue-tsc - - yaml - '@one-ini/wasm@0.1.1': {} '@opentelemetry/api@1.9.0': {} @@ -31105,6 +30976,10 @@ snapshots: dependencies: is-what: 4.1.16 + merge-anything@6.0.6: + dependencies: + is-what: 5.5.0 + merge-descriptors@1.0.3: {} merge-stream@2.0.0: {} @@ -31903,30 +31778,6 @@ snapshots: - '@babel/core' - babel-plugin-macros - next@15.5.6(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(react-dom@19.1.1(react@19.1.1))(react@19.1.1): - dependencies: - '@next/env': 15.5.6 - '@swc/helpers': 0.5.15 - caniuse-lite: 1.0.30001754 - postcss: 8.4.31 - react: 19.1.1 - react-dom: 19.1.1(react@19.1.1) - styled-jsx: 5.1.6(@babel/core@7.26.10)(react@19.1.1) - optionalDependencies: - '@next/swc-darwin-arm64': 15.5.6 - '@next/swc-darwin-x64': 15.5.6 - '@next/swc-linux-arm64-gnu': 15.5.6 - '@next/swc-linux-arm64-musl': 15.5.6 - '@next/swc-linux-x64-gnu': 15.5.6 - '@next/swc-linux-x64-musl': 15.5.6 - '@next/swc-win32-arm64-msvc': 15.5.6 - '@next/swc-win32-x64-msvc': 15.5.6 - '@opentelemetry/api': 1.9.0 - sharp: 0.34.5 - transitivePeerDependencies: - - '@babel/core' - - babel-plugin-macros - nice-try@1.0.5: {} nitropack@2.12.9: @@ -32313,130 +32164,6 @@ snapshots: - xml2js - yaml - nuxt@3.16.0(@parcel/watcher@2.5.1)(@types/node@24.8.1)(db0@0.3.4)(eslint@9.39.1(jiti@2.6.1))(ioredis@5.8.2)(less@4.4.2)(lightningcss@1.25.1)(magicast@0.5.1)(optionator@0.9.4)(rollup@4.53.1)(terser@5.44.1)(tsx@4.20.6)(typescript@5.9.3)(vite@7.2.2(@types/node@24.8.1)(jiti@2.6.1)(less@4.4.2)(lightningcss@1.25.1)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1))(yaml@2.8.1): - dependencies: - '@nuxt/cli': 3.30.0(magicast@0.5.1) - '@nuxt/devalue': 2.0.2 - '@nuxt/devtools': 2.7.0(vite@7.2.2(@types/node@24.8.1)(jiti@2.6.1)(less@4.4.2)(lightningcss@1.25.1)(terser@5.44.1)(tsx@4.20.6)(yaml@2.8.1))(vue@3.5.24(typescript@5.9.3)) - '@nuxt/kit': 3.16.0(magicast@0.5.1) - '@nuxt/schema': 3.16.0 - '@nuxt/telemetry': 2.6.6(magicast@0.5.1) - '@nuxt/vite-builder': 3.16.0(@types/node@24.8.1)(eslint@9.39.1(jiti@2.6.1))(less@4.4.2)(lightningcss@1.25.1)(magicast@0.5.1)(optionator@0.9.4)(rollup@4.53.1)(terser@5.44.1)(tsx@4.20.6)(typescript@5.9.3)(vue@3.5.24(typescript@5.9.3))(yaml@2.8.1) - '@oxc-parser/wasm': 0.56.5 - '@unhead/vue': 2.0.19(vue@3.5.24(typescript@5.9.3)) - '@vue/shared': 3.5.24 - c12: 3.3.1(magicast@0.5.1) - chokidar: 4.0.3 - compatx: 0.1.8 - consola: 3.4.2 - cookie-es: 2.0.0 - defu: 6.1.4 - destr: 2.0.5 - devalue: 5.4.2 - errx: 0.1.0 - esbuild: 0.25.12 - escape-string-regexp: 5.0.0 - estree-walker: 3.0.3 - exsolve: 1.0.7 - globby: 14.1.0 - h3: 1.15.4 - hookable: 5.5.3 - ignore: 7.0.5 - impound: 0.2.2(rollup@4.53.1) - jiti: 2.6.1 - klona: 2.0.6 - knitwork: 1.2.0 - magic-string: 0.30.19 - mlly: 1.8.0 - nanotar: 0.2.0 - nitropack: 2.12.9 - nypm: 0.6.2 - ofetch: 1.5.1 - ohash: 2.0.11 - on-change: 5.0.1 - oxc-parser: 0.56.5 - pathe: 2.0.3 - perfect-debounce: 1.0.0 - pkg-types: 2.3.0 - radix3: 1.1.2 - scule: 1.3.0 - semver: 7.7.3 - std-env: 3.10.0 - strip-literal: 3.1.0 - tinyglobby: 0.2.12 - ufo: 1.6.1 - ultrahtml: 1.6.0 - uncrypto: 0.1.3 - unctx: 2.4.1 - unenv: 2.0.0-rc.24 - unimport: 4.2.0 - unplugin: 2.3.10 - unplugin-vue-router: 0.12.0(vue-router@4.6.3(vue@3.5.24(typescript@5.9.3)))(vue@3.5.24(typescript@5.9.3)) - unstorage: 1.17.2(db0@0.3.4)(ioredis@5.8.2) - untyped: 2.0.0 - vue: 3.5.24(typescript@5.9.3) - vue-bundle-renderer: 2.2.0 - vue-devtools-stub: 0.1.0 - vue-router: 4.6.3(vue@3.5.24(typescript@5.9.3)) - optionalDependencies: - '@parcel/watcher': 2.5.1 - '@types/node': 24.8.1 - transitivePeerDependencies: - - '@azure/app-configuration' - - '@azure/cosmos' - - '@azure/data-tables' - - '@azure/identity' - - '@azure/keyvault-secrets' - - '@azure/storage-blob' - - '@biomejs/biome' - - '@capacitor/preferences' - - '@deno/kv' - - '@electric-sql/pglite' - - '@libsql/client' - - '@netlify/blobs' - - '@planetscale/database' - - '@upstash/redis' - - '@vercel/blob' - - '@vercel/functions' - - '@vercel/kv' - - aws4fetch - - bare-abort-controller - - better-sqlite3 - - bufferutil - - db0 - - drizzle-orm - - encoding - - eslint - - idb-keyval - - ioredis - - less - - lightningcss - - magicast - - meow - - mysql2 - - optionator - - react-native-b4a - - rolldown - - rollup - - sass - - sass-embedded - - sqlite3 - - stylelint - - stylus - - sugarss - - supports-color - - terser - - tsx - - typescript - - uploadthing - - utf-8-validate - - vite - - vls - - vti - - vue-tsc - - xml2js - - yaml - nwsapi@2.2.22: {} nypm@0.6.2: @@ -35648,13 +35375,6 @@ snapshots: optionalDependencies: '@babel/core': 7.12.9 - styled-jsx@5.1.6(@babel/core@7.26.10)(react@19.1.1): - dependencies: - client-only: 0.0.1 - react: 19.1.1 - optionalDependencies: - '@babel/core': 7.26.10 - stylehacks@5.1.1(postcss@8.5.6): dependencies: browserslist: 4.24.4