From d9932097091bd1c264ca5a482437eb6dcbff500d Mon Sep 17 00:00:00 2001 From: aidanCQ Date: Wed, 10 Jan 2024 11:14:07 +0000 Subject: [PATCH] fix(): Fix shacn re-export. --- components.json | 2 +- package-lock.json | 481 +++++++++++++++++++++++- package.json | 2 + src/custom/theme-selector.tsx | 2 +- src/index.ts | 84 ++--- src/shadcn/{ => ui}/accordion.tsx | 0 src/shadcn/{ => ui}/alert-dialog.tsx | 0 src/shadcn/{ => ui}/alert.tsx | 0 src/shadcn/{ => ui}/aspect-ratio.tsx | 0 src/shadcn/{ => ui}/avatar.tsx | 0 src/shadcn/{ => ui}/badge.tsx | 0 src/shadcn/{ => ui}/button.tsx | 0 src/shadcn/{ => ui}/calendar.tsx | 0 src/shadcn/{ => ui}/card.tsx | 0 src/shadcn/{ => ui}/checkbox.tsx | 0 src/shadcn/{ => ui}/collapsible.tsx | 0 src/shadcn/{ => ui}/command.tsx | 0 src/shadcn/{ => ui}/context-menu.tsx | 0 src/shadcn/{ => ui}/dialog.tsx | 0 src/shadcn/{ => ui}/dropdown-menu.tsx | 0 src/shadcn/{ => ui}/form.tsx | 0 src/shadcn/{ => ui}/hover-card.tsx | 0 src/shadcn/{ => ui}/input.tsx | 0 src/shadcn/{ => ui}/label.tsx | 0 src/shadcn/{ => ui}/menubar.tsx | 0 src/shadcn/{ => ui}/navigation-menu.tsx | 0 src/shadcn/{ => ui}/pagination.tsx | 14 +- src/shadcn/{ => ui}/popover.tsx | 0 src/shadcn/{ => ui}/progress.tsx | 0 src/shadcn/{ => ui}/radio-group.tsx | 0 src/shadcn/{ => ui}/resizable.tsx | 0 src/shadcn/{ => ui}/scroll-area.tsx | 0 src/shadcn/{ => ui}/select.tsx | 0 src/shadcn/{ => ui}/separator.tsx | 0 src/shadcn/{ => ui}/sheet.tsx | 0 src/shadcn/{ => ui}/skeleton.tsx | 0 src/shadcn/{ => ui}/slider.tsx | 0 src/shadcn/ui/sonner.tsx | 31 ++ src/shadcn/{ => ui}/switch.tsx | 0 src/shadcn/{ => ui}/table.tsx | 0 src/shadcn/{ => ui}/tabs.tsx | 0 src/shadcn/{ => ui}/textarea.tsx | 0 src/shadcn/{ => ui}/toast.tsx | 0 src/shadcn/{ => ui}/toaster.tsx | 0 src/shadcn/{ => ui}/toggle-group.tsx | 0 src/shadcn/{ => ui}/toggle.tsx | 0 src/shadcn/{ => ui}/tooltip.tsx | 0 src/shadcn/{ => ui}/use-toast.ts | 0 stories/shadcn/pagination.stories.tsx | 2 +- 49 files changed, 555 insertions(+), 63 deletions(-) rename src/shadcn/{ => ui}/accordion.tsx (100%) rename src/shadcn/{ => ui}/alert-dialog.tsx (100%) rename src/shadcn/{ => ui}/alert.tsx (100%) rename src/shadcn/{ => ui}/aspect-ratio.tsx (100%) rename src/shadcn/{ => ui}/avatar.tsx (100%) rename src/shadcn/{ => ui}/badge.tsx (100%) rename src/shadcn/{ => ui}/button.tsx (100%) rename src/shadcn/{ => ui}/calendar.tsx (100%) rename src/shadcn/{ => ui}/card.tsx (100%) rename src/shadcn/{ => ui}/checkbox.tsx (100%) rename src/shadcn/{ => ui}/collapsible.tsx (100%) rename src/shadcn/{ => ui}/command.tsx (100%) rename src/shadcn/{ => ui}/context-menu.tsx (100%) rename src/shadcn/{ => ui}/dialog.tsx (100%) rename src/shadcn/{ => ui}/dropdown-menu.tsx (100%) rename src/shadcn/{ => ui}/form.tsx (100%) rename src/shadcn/{ => ui}/hover-card.tsx (100%) rename src/shadcn/{ => ui}/input.tsx (100%) rename src/shadcn/{ => ui}/label.tsx (100%) rename src/shadcn/{ => ui}/menubar.tsx (100%) rename src/shadcn/{ => ui}/navigation-menu.tsx (100%) rename src/shadcn/{ => ui}/pagination.tsx (91%) rename src/shadcn/{ => ui}/popover.tsx (100%) rename src/shadcn/{ => ui}/progress.tsx (100%) rename src/shadcn/{ => ui}/radio-group.tsx (100%) rename src/shadcn/{ => ui}/resizable.tsx (100%) rename src/shadcn/{ => ui}/scroll-area.tsx (100%) rename src/shadcn/{ => ui}/select.tsx (100%) rename src/shadcn/{ => ui}/separator.tsx (100%) rename src/shadcn/{ => ui}/sheet.tsx (100%) rename src/shadcn/{ => ui}/skeleton.tsx (100%) rename src/shadcn/{ => ui}/slider.tsx (100%) create mode 100644 src/shadcn/ui/sonner.tsx rename src/shadcn/{ => ui}/switch.tsx (100%) rename src/shadcn/{ => ui}/table.tsx (100%) rename src/shadcn/{ => ui}/tabs.tsx (100%) rename src/shadcn/{ => ui}/textarea.tsx (100%) rename src/shadcn/{ => ui}/toast.tsx (100%) rename src/shadcn/{ => ui}/toaster.tsx (100%) rename src/shadcn/{ => ui}/toggle-group.tsx (100%) rename src/shadcn/{ => ui}/toggle.tsx (100%) rename src/shadcn/{ => ui}/tooltip.tsx (100%) rename src/shadcn/{ => ui}/use-toast.ts (100%) diff --git a/components.json b/components.json index 5061aa4..6457255 100644 --- a/components.json +++ b/components.json @@ -11,6 +11,6 @@ }, "aliases": { "components": "src/shadcn", - "utils": "src/utils" + "utils": "src/shadcn" } } diff --git a/package-lock.json b/package-lock.json index cec5875..8124119 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,9 +44,11 @@ "cmdk": "^0.2.0", "date-fns": "^2.30.0", "lucide-react": "^0.298.0", + "next-themes": "^0.2.1", "react-day-picker": "^8.9.1", "react-hook-form": "^7.49.2", "react-resizable-panels": "^1.0.5", + "sonner": "^1.3.1", "tailwind-merge": "^2.1.0" }, "devDependencies": { @@ -3069,6 +3071,156 @@ "tar-fs": "^2.1.1" } }, + "node_modules/@next/env": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/env/-/env-14.0.4.tgz", + "integrity": "sha512-irQnbMLbUNQpP1wcE5NstJtbuA/69kRfzBrpAD7Gsn8zm/CY6YQYc3HQBz8QPxwISG26tIm5afvvVbu508oBeQ==", + "peer": true + }, + "node_modules/@next/swc-darwin-arm64": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.0.4.tgz", + "integrity": "sha512-mF05E/5uPthWzyYDyptcwHptucf/jj09i2SXBPwNzbgBNc+XnwzrL0U6BmPjQeOL+FiB+iG1gwBeq7mlDjSRPg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-darwin-x64": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.0.4.tgz", + "integrity": "sha512-IZQ3C7Bx0k2rYtrZZxKKiusMTM9WWcK5ajyhOZkYYTCc8xytmwSzR1skU7qLgVT/EY9xtXDG0WhY6fyujnI3rw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-arm64-gnu": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.0.4.tgz", + "integrity": "sha512-VwwZKrBQo/MGb1VOrxJ6LrKvbpo7UbROuyMRvQKTFKhNaXjUmKTu7wxVkIuCARAfiI8JpaWAnKR+D6tzpCcM4w==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-arm64-musl": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.0.4.tgz", + "integrity": "sha512-8QftwPEW37XxXoAwsn+nXlodKWHfpMaSvt81W43Wh8dv0gkheD+30ezWMcFGHLI71KiWmHK5PSQbTQGUiidvLQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-x64-gnu": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.0.4.tgz", + "integrity": "sha512-/s/Pme3VKfZAfISlYVq2hzFS8AcAIOTnoKupc/j4WlvF6GQ0VouS2Q2KEgPuO1eMBwakWPB1aYFIA4VNVh667A==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-x64-musl": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.0.4.tgz", + "integrity": "sha512-m8z/6Fyal4L9Bnlxde5g2Mfa1Z7dasMQyhEhskDATpqr+Y0mjOBZcXQ7G5U+vgL22cI4T7MfvgtrM2jdopqWaw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-arm64-msvc": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.0.4.tgz", + "integrity": "sha512-7Wv4PRiWIAWbm5XrGz3D8HUkCVDMMz9igffZG4NB1p4u1KoItwx9qjATHz88kwCEal/HXmbShucaslXCQXUM5w==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-ia32-msvc": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.0.4.tgz", + "integrity": "sha512-zLeNEAPULsl0phfGb4kdzF/cAVIfaC7hY+kt0/d+y9mzcZHsMS3hAS829WbJ31DkSlVKQeHEjZHIdhN+Pg7Gyg==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-x64-msvc": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.0.4.tgz", + "integrity": "sha512-yEh2+R8qDlDCjxVpzOTEpBLQTEFAcP2A8fUFLaWNap9GitYKkKv1//y2S6XY6zsR4rCOPRpU7plYDR+az2n30A==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -6432,6 +6584,15 @@ "url": "https://opencollective.com/storybook" } }, + "node_modules/@swc/helpers": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz", + "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==", + "peer": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/@tailwindcss/typography": { "version": "0.5.10", "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.10.tgz", @@ -7950,6 +8111,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/busboy": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", + "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", + "peer": true, + "dependencies": { + "streamsearch": "^1.1.0" + }, + "engines": { + "node": ">=10.16.0" + } + }, "node_modules/bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", @@ -8019,7 +8192,6 @@ "version": "1.0.30001570", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz", "integrity": "sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==", - "dev": true, "funding": [ { "type": "opencollective", @@ -8296,6 +8468,12 @@ "node": ">=8" } }, + "node_modules/client-only": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", + "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==", + "peer": true + }, "node_modules/clipboardy": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-3.0.0.tgz", @@ -10663,8 +10841,7 @@ "node_modules/glob-to-regexp": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" }, "node_modules/globals": { "version": "11.12.0", @@ -10709,8 +10886,7 @@ "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, "node_modules/gunzip-maybe": { "version": "1.4.2", @@ -12584,6 +12760,91 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/next": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/next/-/next-14.0.4.tgz", + "integrity": "sha512-qbwypnM7327SadwFtxXnQdGiKpkuhaRLE2uq62/nRul9cj9KhQ5LhHmlziTNqUidZotw/Q1I9OjirBROdUJNgA==", + "peer": true, + "dependencies": { + "@next/env": "14.0.4", + "@swc/helpers": "0.5.2", + "busboy": "1.6.0", + "caniuse-lite": "^1.0.30001406", + "graceful-fs": "^4.2.11", + "postcss": "8.4.31", + "styled-jsx": "5.1.1", + "watchpack": "2.4.0" + }, + "bin": { + "next": "dist/bin/next" + }, + "engines": { + "node": ">=18.17.0" + }, + "optionalDependencies": { + "@next/swc-darwin-arm64": "14.0.4", + "@next/swc-darwin-x64": "14.0.4", + "@next/swc-linux-arm64-gnu": "14.0.4", + "@next/swc-linux-arm64-musl": "14.0.4", + "@next/swc-linux-x64-gnu": "14.0.4", + "@next/swc-linux-x64-musl": "14.0.4", + "@next/swc-win32-arm64-msvc": "14.0.4", + "@next/swc-win32-ia32-msvc": "14.0.4", + "@next/swc-win32-x64-msvc": "14.0.4" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.1.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", + "sass": "^1.3.0" + }, + "peerDependenciesMeta": { + "@opentelemetry/api": { + "optional": true + }, + "sass": { + "optional": true + } + } + }, + "node_modules/next-themes": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/next-themes/-/next-themes-0.2.1.tgz", + "integrity": "sha512-B+AKNfYNIzh0vqQQKqQItTS8evEouKD7H5Hj3kmuPERwddR2TxvDSFZuTj6T7Jfn1oyeUyJMydPl1Bkxkh0W7A==", + "peerDependencies": { + "next": "*", + "react": "*", + "react-dom": "*" + } + }, + "node_modules/next/node_modules/postcss": { + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "peer": true, + "dependencies": { + "nanoid": "^3.3.6", + "picocolors": "^1.0.0", + "source-map-js": "^1.0.2" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, "node_modules/node-dir": { "version": "0.1.17", "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", @@ -15816,6 +16077,15 @@ "node": ">=8" } }, + "node_modules/sonner": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.3.1.tgz", + "integrity": "sha512-+rOAO56b2eI3q5BtgljERSn2umRk63KFIvgb2ohbZ5X+Eb5u+a/7/0ZgswYqgBMg8dyl7n6OXd9KasA8QF9ToA==", + "peerDependencies": { + "react": "^18.0.0", + "react-dom": "^18.0.0" + } + }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -16005,6 +16275,15 @@ "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", "dev": true }, + "node_modules/streamsearch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", + "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", + "peer": true, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -16184,6 +16463,29 @@ "integrity": "sha512-IezA2qp+vcdlhJaVm5SOdPPTUu0FCEqfNSli2vRuSIBbu5Nq5UvygTk/VzeCqfLz2Atj3dVII5QBKGZRZ0edzw==", "dev": true }, + "node_modules/styled-jsx": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz", + "integrity": "sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==", + "peer": true, + "dependencies": { + "client-only": "0.0.1" + }, + "engines": { + "node": ">= 12.0.0" + }, + "peerDependencies": { + "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "babel-plugin-macros": { + "optional": true + } + } + }, "node_modules/stylehacks": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz", @@ -17152,7 +17454,6 @@ "version": "2.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", - "dev": true, "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -19500,6 +19801,75 @@ "tar-fs": "^2.1.1" } }, + "@next/env": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/env/-/env-14.0.4.tgz", + "integrity": "sha512-irQnbMLbUNQpP1wcE5NstJtbuA/69kRfzBrpAD7Gsn8zm/CY6YQYc3HQBz8QPxwISG26tIm5afvvVbu508oBeQ==", + "peer": true + }, + "@next/swc-darwin-arm64": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.0.4.tgz", + "integrity": "sha512-mF05E/5uPthWzyYDyptcwHptucf/jj09i2SXBPwNzbgBNc+XnwzrL0U6BmPjQeOL+FiB+iG1gwBeq7mlDjSRPg==", + "optional": true, + "peer": true + }, + "@next/swc-darwin-x64": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.0.4.tgz", + "integrity": "sha512-IZQ3C7Bx0k2rYtrZZxKKiusMTM9WWcK5ajyhOZkYYTCc8xytmwSzR1skU7qLgVT/EY9xtXDG0WhY6fyujnI3rw==", + "optional": true, + "peer": true + }, + "@next/swc-linux-arm64-gnu": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.0.4.tgz", + "integrity": "sha512-VwwZKrBQo/MGb1VOrxJ6LrKvbpo7UbROuyMRvQKTFKhNaXjUmKTu7wxVkIuCARAfiI8JpaWAnKR+D6tzpCcM4w==", + "optional": true, + "peer": true + }, + "@next/swc-linux-arm64-musl": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.0.4.tgz", + "integrity": "sha512-8QftwPEW37XxXoAwsn+nXlodKWHfpMaSvt81W43Wh8dv0gkheD+30ezWMcFGHLI71KiWmHK5PSQbTQGUiidvLQ==", + "optional": true, + "peer": true + }, + "@next/swc-linux-x64-gnu": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.0.4.tgz", + "integrity": "sha512-/s/Pme3VKfZAfISlYVq2hzFS8AcAIOTnoKupc/j4WlvF6GQ0VouS2Q2KEgPuO1eMBwakWPB1aYFIA4VNVh667A==", + "optional": true, + "peer": true + }, + "@next/swc-linux-x64-musl": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.0.4.tgz", + "integrity": "sha512-m8z/6Fyal4L9Bnlxde5g2Mfa1Z7dasMQyhEhskDATpqr+Y0mjOBZcXQ7G5U+vgL22cI4T7MfvgtrM2jdopqWaw==", + "optional": true, + "peer": true + }, + "@next/swc-win32-arm64-msvc": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.0.4.tgz", + "integrity": "sha512-7Wv4PRiWIAWbm5XrGz3D8HUkCVDMMz9igffZG4NB1p4u1KoItwx9qjATHz88kwCEal/HXmbShucaslXCQXUM5w==", + "optional": true, + "peer": true + }, + "@next/swc-win32-ia32-msvc": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.0.4.tgz", + "integrity": "sha512-zLeNEAPULsl0phfGb4kdzF/cAVIfaC7hY+kt0/d+y9mzcZHsMS3hAS829WbJ31DkSlVKQeHEjZHIdhN+Pg7Gyg==", + "optional": true, + "peer": true + }, + "@next/swc-win32-x64-msvc": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.0.4.tgz", + "integrity": "sha512-yEh2+R8qDlDCjxVpzOTEpBLQTEFAcP2A8fUFLaWNap9GitYKkKv1//y2S6XY6zsR4rCOPRpU7plYDR+az2n30A==", + "optional": true, + "peer": true + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -21678,6 +22048,15 @@ "file-system-cache": "2.3.0" } }, + "@swc/helpers": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz", + "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==", + "peer": true, + "requires": { + "tslib": "^2.4.0" + } + }, "@tailwindcss/typography": { "version": "0.5.10", "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.10.tgz", @@ -22860,6 +23239,15 @@ "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", "dev": true }, + "busboy": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", + "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", + "peer": true, + "requires": { + "streamsearch": "^1.1.0" + } + }, "bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", @@ -22910,8 +23298,7 @@ "caniuse-lite": { "version": "1.0.30001570", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz", - "integrity": "sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==", - "dev": true + "integrity": "sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==" }, "chai": { "version": "4.3.10", @@ -23089,6 +23476,12 @@ } } }, + "client-only": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", + "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==", + "peer": true + }, "clipboardy": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-3.0.0.tgz", @@ -24885,8 +25278,7 @@ "glob-to-regexp": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" }, "globals": { "version": "11.12.0", @@ -24922,8 +25314,7 @@ "graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, "gunzip-maybe": { "version": "1.4.2", @@ -26276,6 +26667,50 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "next": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/next/-/next-14.0.4.tgz", + "integrity": "sha512-qbwypnM7327SadwFtxXnQdGiKpkuhaRLE2uq62/nRul9cj9KhQ5LhHmlziTNqUidZotw/Q1I9OjirBROdUJNgA==", + "peer": true, + "requires": { + "@next/env": "14.0.4", + "@next/swc-darwin-arm64": "14.0.4", + "@next/swc-darwin-x64": "14.0.4", + "@next/swc-linux-arm64-gnu": "14.0.4", + "@next/swc-linux-arm64-musl": "14.0.4", + "@next/swc-linux-x64-gnu": "14.0.4", + "@next/swc-linux-x64-musl": "14.0.4", + "@next/swc-win32-arm64-msvc": "14.0.4", + "@next/swc-win32-ia32-msvc": "14.0.4", + "@next/swc-win32-x64-msvc": "14.0.4", + "@swc/helpers": "0.5.2", + "busboy": "1.6.0", + "caniuse-lite": "^1.0.30001406", + "graceful-fs": "^4.2.11", + "postcss": "8.4.31", + "styled-jsx": "5.1.1", + "watchpack": "2.4.0" + }, + "dependencies": { + "postcss": { + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "peer": true, + "requires": { + "nanoid": "^3.3.6", + "picocolors": "^1.0.0", + "source-map-js": "^1.0.2" + } + } + } + }, + "next-themes": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/next-themes/-/next-themes-0.2.1.tgz", + "integrity": "sha512-B+AKNfYNIzh0vqQQKqQItTS8evEouKD7H5Hj3kmuPERwddR2TxvDSFZuTj6T7Jfn1oyeUyJMydPl1Bkxkh0W7A==", + "requires": {} + }, "node-dir": { "version": "0.1.17", "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", @@ -28539,6 +28974,12 @@ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true }, + "sonner": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.3.1.tgz", + "integrity": "sha512-+rOAO56b2eI3q5BtgljERSn2umRk63KFIvgb2ohbZ5X+Eb5u+a/7/0ZgswYqgBMg8dyl7n6OXd9KasA8QF9ToA==", + "requires": {} + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -28684,6 +29125,12 @@ "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", "dev": true }, + "streamsearch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", + "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", + "peer": true + }, "string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -28811,6 +29258,15 @@ "integrity": "sha512-IezA2qp+vcdlhJaVm5SOdPPTUu0FCEqfNSli2vRuSIBbu5Nq5UvygTk/VzeCqfLz2Atj3dVII5QBKGZRZ0edzw==", "dev": true }, + "styled-jsx": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz", + "integrity": "sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==", + "peer": true, + "requires": { + "client-only": "0.0.1" + } + }, "stylehacks": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz", @@ -29515,7 +29971,6 @@ "version": "2.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", - "dev": true, "requires": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" diff --git a/package.json b/package.json index 668943b..7ab3afc 100644 --- a/package.json +++ b/package.json @@ -103,9 +103,11 @@ "cmdk": "^0.2.0", "date-fns": "^2.30.0", "lucide-react": "^0.298.0", + "next-themes": "^0.2.1", "react-day-picker": "^8.9.1", "react-hook-form": "^7.49.2", "react-resizable-panels": "^1.0.5", + "sonner": "^1.3.1", "tailwind-merge": "^2.1.0" }, "peerDependencies": { diff --git a/src/custom/theme-selector.tsx b/src/custom/theme-selector.tsx index c3abc82..370a3aa 100644 --- a/src/custom/theme-selector.tsx +++ b/src/custom/theme-selector.tsx @@ -1,7 +1,7 @@ 'use client' import { ComputerIcon, MoonIcon, SunIcon } from "lucide-react"; import React from "react"; -import { Button } from "src/shadcn/button"; +import { Button } from "src/shadcn/ui/button"; import { theme as _theme } from "src/utils"; export const useTheme = () => { diff --git a/src/index.ts b/src/index.ts index 2f7f38c..55d2cb0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,47 +1,47 @@ export * from "./custom/slide-in"; export * from "./custom/theme-selector"; -export * from "./shadcn/accordion"; -export * from "./shadcn/alert"; -export * from "./shadcn/alert-dialog"; -export * from "./shadcn/aspect-ratio"; -export * from "./shadcn/avatar"; -export * from "./shadcn/badge"; -export * from "./shadcn/button"; -export * from "./shadcn/calendar"; -export * from "./shadcn/card"; -export * from "./shadcn/checkbox"; -export * from "./shadcn/collapsible"; -export * from "./shadcn/command"; -export * from "./shadcn/context-menu"; -export * from "./shadcn/dialog"; -export * from "./shadcn/dropdown-menu"; -export * from "./shadcn/form"; -export * from "./shadcn/hover-card"; -export * from "./shadcn/input"; -export * from "./shadcn/label"; -export * from "./shadcn/menubar"; -export * from "./shadcn/navigation-menu"; -export * from "./shadcn/pagination"; -export * from "./shadcn/popover"; -export * from "./shadcn/progress"; -export * from "./shadcn/radio-group"; -export * from "./shadcn/resizable"; -export * from "./shadcn/scroll-area"; -export * from "./shadcn/select"; -export * from "./shadcn/separator"; -export * from "./shadcn/sheet"; -export * from "./shadcn/skeleton"; -export * from "./shadcn/slider"; -export * from "./shadcn/switch"; -export * from "./shadcn/table"; -export * from "./shadcn/tabs"; -export * from "./shadcn/textarea"; -export * from "./shadcn/toast"; -export * from "./shadcn/toaster"; -export * from "./shadcn/toggle"; -export * from "./shadcn/toggle-group"; -export * from "./shadcn/tooltip"; -export * from "./shadcn/use-toast"; +export * from "./shadcn/ui/accordion"; +export * from "./shadcn/ui/alert"; +export * from "./shadcn/ui/alert-dialog"; +export * from "./shadcn/ui/aspect-ratio"; +export * from "./shadcn/ui/avatar"; +export * from "./shadcn/ui/badge"; +export * from "./shadcn/ui/button"; +export * from "./shadcn/ui/calendar"; +export * from "./shadcn/ui/card"; +export * from "./shadcn/ui/checkbox"; +export * from "./shadcn/ui/collapsible"; +export * from "./shadcn/ui/command"; +export * from "./shadcn/ui/context-menu"; +export * from "./shadcn/ui/dialog"; +export * from "./shadcn/ui/dropdown-menu"; +export * from "./shadcn/ui/form"; +export * from "./shadcn/ui/hover-card"; +export * from "./shadcn/ui/input"; +export * from "./shadcn/ui/label"; +export * from "./shadcn/ui/menubar"; +export * from "./shadcn/ui/navigation-menu"; +export * from "./shadcn/ui/pagination"; +export * from "./shadcn/ui/popover"; +export * from "./shadcn/ui/progress"; +export * from "./shadcn/ui/radio-group"; +export * from "./shadcn/ui/resizable"; +export * from "./shadcn/ui/scroll-area"; +export * from "./shadcn/ui/select"; +export * from "./shadcn/ui/separator"; +export * from "./shadcn/ui/sheet"; +export * from "./shadcn/ui/skeleton"; +export * from "./shadcn/ui/slider"; +export * from "./shadcn/ui/switch"; +export * from "./shadcn/ui/table"; +export * from "./shadcn/ui/tabs"; +export * from "./shadcn/ui/textarea"; +export * from "./shadcn/ui/toast"; +export * from "./shadcn/ui/toaster"; +export * from "./shadcn/ui/toggle"; +export * from "./shadcn/ui/toggle-group"; +export * from "./shadcn/ui/tooltip"; +export * from "./shadcn/ui/use-toast"; export * from "./tailwindTheme"; export * from "./utils"; diff --git a/src/shadcn/accordion.tsx b/src/shadcn/ui/accordion.tsx similarity index 100% rename from src/shadcn/accordion.tsx rename to src/shadcn/ui/accordion.tsx diff --git a/src/shadcn/alert-dialog.tsx b/src/shadcn/ui/alert-dialog.tsx similarity index 100% rename from src/shadcn/alert-dialog.tsx rename to src/shadcn/ui/alert-dialog.tsx diff --git a/src/shadcn/alert.tsx b/src/shadcn/ui/alert.tsx similarity index 100% rename from src/shadcn/alert.tsx rename to src/shadcn/ui/alert.tsx diff --git a/src/shadcn/aspect-ratio.tsx b/src/shadcn/ui/aspect-ratio.tsx similarity index 100% rename from src/shadcn/aspect-ratio.tsx rename to src/shadcn/ui/aspect-ratio.tsx diff --git a/src/shadcn/avatar.tsx b/src/shadcn/ui/avatar.tsx similarity index 100% rename from src/shadcn/avatar.tsx rename to src/shadcn/ui/avatar.tsx diff --git a/src/shadcn/badge.tsx b/src/shadcn/ui/badge.tsx similarity index 100% rename from src/shadcn/badge.tsx rename to src/shadcn/ui/badge.tsx diff --git a/src/shadcn/button.tsx b/src/shadcn/ui/button.tsx similarity index 100% rename from src/shadcn/button.tsx rename to src/shadcn/ui/button.tsx diff --git a/src/shadcn/calendar.tsx b/src/shadcn/ui/calendar.tsx similarity index 100% rename from src/shadcn/calendar.tsx rename to src/shadcn/ui/calendar.tsx diff --git a/src/shadcn/card.tsx b/src/shadcn/ui/card.tsx similarity index 100% rename from src/shadcn/card.tsx rename to src/shadcn/ui/card.tsx diff --git a/src/shadcn/checkbox.tsx b/src/shadcn/ui/checkbox.tsx similarity index 100% rename from src/shadcn/checkbox.tsx rename to src/shadcn/ui/checkbox.tsx diff --git a/src/shadcn/collapsible.tsx b/src/shadcn/ui/collapsible.tsx similarity index 100% rename from src/shadcn/collapsible.tsx rename to src/shadcn/ui/collapsible.tsx diff --git a/src/shadcn/command.tsx b/src/shadcn/ui/command.tsx similarity index 100% rename from src/shadcn/command.tsx rename to src/shadcn/ui/command.tsx diff --git a/src/shadcn/context-menu.tsx b/src/shadcn/ui/context-menu.tsx similarity index 100% rename from src/shadcn/context-menu.tsx rename to src/shadcn/ui/context-menu.tsx diff --git a/src/shadcn/dialog.tsx b/src/shadcn/ui/dialog.tsx similarity index 100% rename from src/shadcn/dialog.tsx rename to src/shadcn/ui/dialog.tsx diff --git a/src/shadcn/dropdown-menu.tsx b/src/shadcn/ui/dropdown-menu.tsx similarity index 100% rename from src/shadcn/dropdown-menu.tsx rename to src/shadcn/ui/dropdown-menu.tsx diff --git a/src/shadcn/form.tsx b/src/shadcn/ui/form.tsx similarity index 100% rename from src/shadcn/form.tsx rename to src/shadcn/ui/form.tsx diff --git a/src/shadcn/hover-card.tsx b/src/shadcn/ui/hover-card.tsx similarity index 100% rename from src/shadcn/hover-card.tsx rename to src/shadcn/ui/hover-card.tsx diff --git a/src/shadcn/input.tsx b/src/shadcn/ui/input.tsx similarity index 100% rename from src/shadcn/input.tsx rename to src/shadcn/ui/input.tsx diff --git a/src/shadcn/label.tsx b/src/shadcn/ui/label.tsx similarity index 100% rename from src/shadcn/label.tsx rename to src/shadcn/ui/label.tsx diff --git a/src/shadcn/menubar.tsx b/src/shadcn/ui/menubar.tsx similarity index 100% rename from src/shadcn/menubar.tsx rename to src/shadcn/ui/menubar.tsx diff --git a/src/shadcn/navigation-menu.tsx b/src/shadcn/ui/navigation-menu.tsx similarity index 100% rename from src/shadcn/navigation-menu.tsx rename to src/shadcn/ui/navigation-menu.tsx diff --git a/src/shadcn/pagination.tsx b/src/shadcn/ui/pagination.tsx similarity index 91% rename from src/shadcn/pagination.tsx rename to src/shadcn/ui/pagination.tsx index c9a3ad9..6dea87a 100644 --- a/src/shadcn/pagination.tsx +++ b/src/shadcn/ui/pagination.tsx @@ -1,12 +1,12 @@ +import * as React from "react" import { ChevronLeftIcon, ChevronRightIcon, DotsHorizontalIcon, } from "@radix-ui/react-icons" -import * as React from "react" -import { ButtonProps, buttonVariants } from "src/shadcn/button" -import { cn } from "src/utils" +import { cn } from "src/shadcn" +import { ButtonProps, buttonVariants } from "src/shadcn/ui/button" const Pagination = ({ className, ...props }: React.ComponentProps<"nav">) => (