bartvdbraak/hellob.art
1
0
Fork 0
mirror of https://github.com/bartvdbraak/hellob.art.git synced 2025-10-29 19:29:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12 from bartvdbraak/dependabot/npm_and_yarn/tailwind-merge-1.13.2

Browse source
This commit is contained in:
Bart van der Braak 2023-06-16 08:32:13 +02:00 • committed by GitHub
commit f1f90c6091
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -33,7 +33,7 @@
"postcss": "8.4.24", "postcss": "8.4.24",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"tailwind-merge": "^1.13.1", "tailwind-merge": "^1.13.2",
"tailwindcss": "3.3.2", "tailwindcss": "3.3.2",
"tailwindcss-animate": "^1.0.6", "tailwindcss-animate": "^1.0.6",
"typescript": "5.1.3" "typescript": "5.1.3"

16
pnpm-lock.yaml generated
View file

@ -1,9 +1,5 @@
lockfileVersion: '6.0' lockfileVersion: '6.0'
settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
dependencies: dependencies:
'@t3-oss/env-nextjs': '@t3-oss/env-nextjs':
specifier: ^0.4.0 specifier: ^0.4.0
@ -54,8 +50,8 @@ dependencies:
specifier: 18.2.0 specifier: 18.2.0
version: 18.2.0(react@18.2.0) version: 18.2.0(react@18.2.0)
tailwind-merge: tailwind-merge:
specifier: ^1.13.1 specifier: ^1.13.2
version: 1.13.1 version: 1.13.2
tailwindcss: tailwindcss:
specifier: 3.3.2 specifier: 3.3.2
version: 3.3.2 version: 3.3.2
@ -2610,8 +2606,8 @@ packages:
tslib: 2.5.3 tslib: 2.5.3
dev: false dev: false
/tailwind-merge@1.13.1: /tailwind-merge@1.13.2:
resolution: {integrity: sha512-tRtRN22TDokGi2TuYSvuHQuuW6BJ/zlUEG+iYpAQ9i66msc/0eU/+HPccbPnNNH0mCPp0Ob8thaC8Uy9CxHitQ==} resolution: {integrity: sha512-R2/nULkdg1VR/EL4RXg4dEohdoxNUJGLMnWIQnPKL+O9Twu7Cn3Rxi4dlXkDzZrEGtR+G+psSXFouWlpTyLhCQ==}
dev: false dev: false
/tailwindcss-animate@1.0.6(tailwindcss@3.3.2): /tailwindcss-animate@1.0.6(tailwindcss@3.3.2):
@ -2844,3 +2840,7 @@ packages:
/zod@3.21.4: /zod@3.21.4:
resolution: {integrity: sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==} resolution: {integrity: sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==}
dev: false dev: false
settings:
autoInstallPeers: true
excludeLinksFromLockfile: false