From a5f311ebc7e1eaa5dd7d52f3b589df1a7f8043a0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 03:18:28 +0000 Subject: [PATCH] chore(deps): update dependency tailwind-merge to v2.5.4 --- package.json | 2 +- pnpm-lock.yaml | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 9423b49c..a16974df 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "release-it": "17.6.0", "rimraf": "6.0.1", "simple-git-hooks": "2.11.1", - "tailwind-merge": "2.5.2", + "tailwind-merge": "2.5.4", "tailwindcss": "3.4.13", "tailwindcss-animate": "1.0.7", "typescript": "5.6.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cecb0d1a..8a54f432 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -64,7 +64,7 @@ importers: version: 32.1.2 electron-builder: specifier: 25.0.5 - version: 25.0.5(electron-builder-squirrel-windows@24.13.3(dmg-builder@25.0.5)) + version: 25.0.5(electron-builder-squirrel-windows@24.13.3) electron-log: specifier: 5.2.0 version: 5.2.0 @@ -90,8 +90,8 @@ importers: specifier: 2.11.1 version: 2.11.1 tailwind-merge: - specifier: 2.5.2 - version: 2.5.2 + specifier: 2.5.4 + version: 2.5.4 tailwindcss: specifier: 3.4.13 version: 3.4.13 @@ -1404,6 +1404,7 @@ packages: boolean@3.2.0: resolution: {integrity: sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==} + deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. boxen@7.1.1: resolution: {integrity: sha512-2hCgjEmP8YLWQ130n2FerGv7rYpfBmnmp9Uy2Le1vge6X3gZIfSmEzP5QTDElFxcvVcXlEn8Aq6MU/PZygIOog==} @@ -2180,6 +2181,7 @@ packages: eslint@8.57.0: resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options. hasBin: true espree@10.1.0: @@ -4090,8 +4092,8 @@ packages: resolution: {integrity: sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==} engines: {node: ^14.18.0 || >=16.0.0} - tailwind-merge@2.5.2: - resolution: {integrity: sha512-kjEBm+pvD+6eAwzJL2Bi+02/9LFLal1Gs61+QB7HvTfQQ0aXwC5LGT8PEt1gS0CWKktKe6ysPTAy3cBC5MeiIg==} + tailwind-merge@2.5.4: + resolution: {integrity: sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==} tailwindcss-animate@1.0.7: resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==} @@ -5832,7 +5834,7 @@ snapshots: app-builder-bin@5.0.0-alpha.7: {} - app-builder-lib@24.13.3(dmg-builder@25.0.5(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@25.0.5)): + app-builder-lib@24.13.3(dmg-builder@25.0.5)(electron-builder-squirrel-windows@24.13.3): dependencies: '@develar/schema-utils': 2.6.5 '@electron/notarize': 2.2.1 @@ -5866,7 +5868,7 @@ snapshots: transitivePeerDependencies: - supports-color - app-builder-lib@25.0.5(dmg-builder@25.0.5(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@25.0.5)): + app-builder-lib@25.0.5(dmg-builder@25.0.5)(electron-builder-squirrel-windows@24.13.3): dependencies: '@develar/schema-utils': 2.6.5 '@electron/notarize': 2.3.2 @@ -6552,7 +6554,7 @@ snapshots: dmg-builder@25.0.5(electron-builder-squirrel-windows@24.13.3): dependencies: - app-builder-lib: 25.0.5(dmg-builder@25.0.5(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@25.0.5)) + app-builder-lib: 25.0.5(dmg-builder@25.0.5)(electron-builder-squirrel-windows@24.13.3) builder-util: 25.0.3 builder-util-runtime: 9.2.5 fs-extra: 10.1.0 @@ -6625,7 +6627,7 @@ snapshots: electron-builder-squirrel-windows@24.13.3(dmg-builder@25.0.5): dependencies: - app-builder-lib: 24.13.3(dmg-builder@25.0.5(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@25.0.5)) + app-builder-lib: 24.13.3(dmg-builder@25.0.5)(electron-builder-squirrel-windows@24.13.3) archiver: 5.3.2 builder-util: 24.13.1 fs-extra: 10.1.0 @@ -6633,9 +6635,9 @@ snapshots: - dmg-builder - supports-color - electron-builder@25.0.5(electron-builder-squirrel-windows@24.13.3(dmg-builder@25.0.5)): + electron-builder@25.0.5(electron-builder-squirrel-windows@24.13.3): dependencies: - app-builder-lib: 25.0.5(dmg-builder@25.0.5(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@25.0.5)) + app-builder-lib: 25.0.5(dmg-builder@25.0.5)(electron-builder-squirrel-windows@24.13.3) builder-util: 25.0.3 builder-util-runtime: 9.2.5 chalk: 4.1.2 @@ -9210,7 +9212,7 @@ snapshots: '@pkgr/core': 0.1.1 tslib: 2.6.3 - tailwind-merge@2.5.2: {} + tailwind-merge@2.5.4: {} tailwindcss-animate@1.0.7(tailwindcss@3.4.13): dependencies: