-
-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #369 from braden-w/braden-w/whi-147-chore-upgrade-…
…svelte-5
- Loading branch information
Showing
87 changed files
with
1,755 additions
and
1,500 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,23 @@ | ||
| .DS_Store | ||
| node_modules | ||
| /build | ||
|
|
||
| # Output | ||
| .output | ||
| .vercel | ||
| .netlify | ||
| .wrangler | ||
| /.svelte-kit | ||
| /package | ||
| /build | ||
|
|
||
| # OS | ||
| .DS_Store | ||
| Thumbs.db | ||
|
|
||
| # Env | ||
| .env | ||
| .env.* | ||
| !.env.example | ||
| !.env.test | ||
|
|
||
| # Vite | ||
| vite.config.js.timestamp-* | ||
| vite.config.ts.timestamp-* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,17 @@ | ||
| { | ||
| "$schema": "https://shadcn-svelte.com/schema.json", | ||
| "$schema": "https://next.shadcn-svelte.com/schema.json", | ||
| "style": "default", | ||
| "tailwind": { | ||
| "config": "tailwind.config.ts", | ||
| "css": "src/app.pcss", | ||
| "css": "src/app.css", | ||
| "baseColor": "slate" | ||
| }, | ||
| "aliases": { | ||
| "components": "$lib/components", | ||
| "utils": "$lib/utils" | ||
| "utils": "$lib/utils", | ||
| "ui": "$lib/components/ui", | ||
| "hooks": "$lib/hooks" | ||
| }, | ||
| "typescript": true | ||
| "typescript": true, | ||
| "registry": "https://next.shadcn-svelte.com/registry" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| // export * from '@repo/ui/postcss.config'; | ||
| export default { | ||
| plugins: { | ||
| tailwindcss: {}, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
apps/app/src/lib/components/CancelOrEndRecordingSessionButton.svelte
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,78 @@ | ||
| <script lang="ts"> | ||
| import { cn } from '$lib/utils.js'; | ||
| import { Button as ButtonPrimitive } from 'bits-ui'; | ||
| import { type Events, type Props, buttonVariants } from './index.js'; | ||
| <script lang="ts" module> | ||
| import type { WithElementRef } from 'bits-ui'; | ||
| import type { | ||
| HTMLAnchorAttributes, | ||
| HTMLButtonAttributes, | ||
| } from 'svelte/elements'; | ||
| import { type VariantProps, tv } from 'tailwind-variants'; | ||
| export const buttonVariants = tv({ | ||
| base: 'ring-offset-background focus-visible:ring-ring inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0', | ||
| variants: { | ||
| variant: { | ||
| default: 'bg-primary text-primary-foreground hover:bg-primary/90', | ||
| destructive: | ||
| 'bg-destructive text-destructive-foreground hover:bg-destructive/90', | ||
| outline: | ||
| 'border-input bg-background hover:bg-accent hover:text-accent-foreground border', | ||
| secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80', | ||
| ghost: 'hover:bg-accent hover:text-accent-foreground', | ||
| link: 'text-primary underline-offset-4 hover:underline', | ||
| }, | ||
| size: { | ||
| default: 'h-10 px-4 py-2', | ||
| sm: 'h-9 rounded-md px-3', | ||
| lg: 'h-11 rounded-md px-8', | ||
| icon: 'h-10 w-10', | ||
| }, | ||
| }, | ||
| defaultVariants: { | ||
| variant: 'default', | ||
| size: 'default', | ||
| }, | ||
| }); | ||
| export type ButtonVariant = VariantProps<typeof buttonVariants>['variant']; | ||
| export type ButtonSize = VariantProps<typeof buttonVariants>['size']; | ||
| type $$Props = Props; | ||
| type $$Events = Events; | ||
| export type ButtonProps = WithElementRef<HTMLButtonAttributes> & | ||
| WithElementRef<HTMLAnchorAttributes> & { | ||
| variant?: ButtonVariant; | ||
| size?: ButtonSize; | ||
| }; | ||
| </script> | ||
|
|
||
| <script lang="ts"> | ||
| import { cn } from "$lib/utils.js"; | ||
| let className: $$Props['class'] = undefined; | ||
| export let variant: $$Props['variant'] = 'default'; | ||
| export let size: $$Props['size'] = 'default'; | ||
| export let builders: $$Props['builders'] = []; | ||
| export { className as class }; | ||
| let { | ||
| class: className, | ||
| variant = "default", | ||
| size = "default", | ||
| ref = $bindable(null), | ||
| href = undefined, | ||
| type = "button", | ||
| children, | ||
| ...restProps | ||
| }: ButtonProps = $props(); | ||
| </script> | ||
|
|
||
| <ButtonPrimitive.Root | ||
| {builders} | ||
| class={cn(buttonVariants({ variant, size, className }))} | ||
| type="button" | ||
| {...$$restProps} | ||
| on:click | ||
| on:keydown | ||
| > | ||
| <slot /> | ||
| </ButtonPrimitive.Root> | ||
| {#if href} | ||
| <a | ||
| bind:this={ref} | ||
| class={cn(buttonVariants({ variant, size, className }))} | ||
| {href} | ||
| {...restProps} | ||
| > | ||
| {@render children?.()} | ||
| </a> | ||
| {:else} | ||
| <button | ||
| bind:this={ref} | ||
| class={cn(buttonVariants({ variant, size, className }))} | ||
| {type} | ||
| {...restProps} | ||
| > | ||
| {@render children?.()} | ||
| </button> | ||
| {/if} |
Oops, something went wrong.