From 0c689a25c61c6baf9ef34babd73186161d1b2ece Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 31 Mar 2024 00:29:16 +0000 Subject: [PATCH] chore(deps): bump tailwind-merge from 1.14.0 to 2.2.2 Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 1.14.0 to 2.2.2. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v1.14.0...v2.2.2) --- updated-dependencies: - dependency-name: tailwind-merge dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- apps/web/package.json | 2 +- pnpm-lock.yaml | 85 ++++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 39 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index 2b9548b2..04ec8eb6 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -44,7 +44,7 @@ "react-youtube": "^10.1.0", "styled-components": "^6.0.0-beta.9", "swr": "^2.2.4", - "tailwind-merge": "^1.14.0", + "tailwind-merge": "^2.2.2", "tailwind-scrollbar": "^3.0.5", "uuid": "^9.0.0", "y-indexeddb": "^9.0.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9924e53a..c7166fd5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -123,8 +123,8 @@ importers: specifier: ^2.2.4 version: 2.2.4(react@18.2.0) tailwind-merge: - specifier: ^1.14.0 - version: 1.14.0 + specifier: ^2.2.2 + version: 2.2.2 tailwind-scrollbar: specifier: ^3.0.5 version: 3.0.5(tailwindcss@3.3.3) @@ -1486,6 +1486,13 @@ packages: engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.14.0 + dev: false + + /@babel/runtime@7.24.1: + resolution: {integrity: sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==} + engines: {node: '>=6.9.0'} + dependencies: + regenerator-runtime: 0.14.0 /@babel/template@7.22.15: resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==} @@ -1787,13 +1794,13 @@ packages: /@radix-ui/primitive@1.0.0: resolution: {integrity: sha512-3e7rn8FDMin4CgeL7Z/49smCA3rFYY3Ha2rUQ7HRWFadS5iCRw08ZgVT1LaNTCNqgvrUiyczLflrVrF0SRQtNA==} dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 dev: false /@radix-ui/primitive@1.0.1: resolution: {integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==} dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 dev: false /@radix-ui/react-arrow@1.0.3(@types/react-dom@18.0.6)(@types/react@18.2.8)(react-dom@18.2.0)(react@18.2.0): @@ -1809,7 +1816,7 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.0.6)(@types/react@18.2.8)(react-dom@18.2.0)(react@18.2.0) '@types/react': 18.2.8 '@types/react-dom': 18.0.6 @@ -1843,7 +1850,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 react: 18.2.0 dev: false @@ -1856,7 +1863,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@types/react': 18.2.8 react: 18.2.0 dev: false @@ -1866,7 +1873,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 react: 18.2.0 dev: false @@ -1879,7 +1886,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@types/react': 18.2.8 react: 18.2.0 dev: false @@ -1931,7 +1938,7 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/primitive': 1.0.1 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.8)(react@18.2.0) '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.0.6)(@types/react@18.2.8)(react-dom@18.2.0)(react@18.2.0) @@ -1952,7 +1959,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@types/react': 18.2.8 react: 18.2.0 dev: false @@ -1970,7 +1977,7 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.8)(react@18.2.0) '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.0.6)(@types/react@18.2.8)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.8)(react@18.2.0) @@ -2010,7 +2017,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/react-use-layout-effect': 1.0.0(react@18.2.0) react: 18.2.0 dev: false @@ -2024,7 +2031,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.8)(react@18.2.0) '@types/react': 18.2.8 react: 18.2.0 @@ -2036,7 +2043,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -2055,7 +2062,7 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@floating-ui/react-dom': 2.0.2(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.0.6)(@types/react@18.2.8)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.8)(react@18.2.0) @@ -2085,7 +2092,7 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.0.6)(@types/react@18.2.8)(react-dom@18.2.0)(react@18.2.0) '@types/react': 18.2.8 '@types/react-dom': 18.0.6 @@ -2106,7 +2113,7 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.8)(react@18.2.0) '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.8)(react@18.2.0) '@types/react': 18.2.8 @@ -2121,7 +2128,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/react-slot': 1.0.1(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -2140,7 +2147,7 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/react-slot': 1.0.2(@types/react@18.2.8)(react@18.2.0) '@types/react': 18.2.8 '@types/react-dom': 18.0.6 @@ -2153,7 +2160,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) react: 18.2.0 dev: false @@ -2167,7 +2174,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.8)(react@18.2.0) '@types/react': 18.2.8 react: 18.2.0 @@ -2241,7 +2248,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@types/react': 18.2.8 react: 18.2.0 dev: false @@ -2255,7 +2262,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.8)(react@18.2.0) '@types/react': 18.2.8 react: 18.2.0 @@ -2270,7 +2277,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.8)(react@18.2.0) '@types/react': 18.2.8 react: 18.2.0 @@ -2281,7 +2288,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 react: 18.2.0 dev: false @@ -2294,7 +2301,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@types/react': 18.2.8 react: 18.2.0 dev: false @@ -2308,7 +2315,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@types/react': 18.2.8 react: 18.2.0 dev: false @@ -2322,7 +2329,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/rect': 1.0.1 '@types/react': 18.2.8 react: 18.2.0 @@ -2337,7 +2344,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.8)(react@18.2.0) '@types/react': 18.2.8 react: 18.2.0 @@ -2356,7 +2363,7 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.0.6)(@types/react@18.2.8)(react-dom@18.2.0)(react@18.2.0) '@types/react': 18.2.8 '@types/react-dom': 18.0.6 @@ -2367,7 +2374,7 @@ packages: /@radix-ui/rect@1.0.1: resolution: {integrity: sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==} dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 dev: false /@remirror/core-constants@2.0.2: @@ -3918,7 +3925,7 @@ packages: peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 aria-query: 5.3.0 array-includes: 3.1.7 array.prototype.flatmap: 1.3.2 @@ -5544,7 +5551,7 @@ packages: react-native: optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 '@types/react-redux': 7.1.27 hoist-non-react-statics: 3.3.2 loose-envify: 1.4.0 @@ -5660,7 +5667,7 @@ packages: /redux@4.2.1: resolution: {integrity: sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==} dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 dev: false /reflect.getprototypeof@1.0.4: @@ -5692,7 +5699,7 @@ packages: /regenerator-transform@0.15.2: resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==} dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.24.1 dev: false /regexp.prototype.flags@1.5.1: @@ -6059,8 +6066,10 @@ packages: use-sync-external-store: 1.2.0(react@18.2.0) dev: false - /tailwind-merge@1.14.0: - resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==} + /tailwind-merge@2.2.2: + resolution: {integrity: sha512-tWANXsnmJzgw6mQ07nE3aCDkCK4QdT3ThPMCzawoYA2Pws7vSTCvz3Vrjg61jVUGfFZPJzxEP+NimbcW+EdaDw==} + dependencies: + '@babel/runtime': 7.24.1 dev: false /tailwind-scrollbar@3.0.5(tailwindcss@3.3.3):