Skip to content

Commit 7d1a6c3

Browse files
jeremy-codejeremy-code
committed
deps: update deps
1 parent 4e9b19a commit 7d1a6c3

File tree

8 files changed

+1647
-2992
lines changed

8 files changed

+1647
-2992
lines changed

‎package.json‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,26 @@
3333
"db:studio": "drizzle-kit studio"
3434
},
3535
"dependencies": {
36-
"@ark-ui/react": "^2.1.1",
36+
"@ark-ui/react": "^2.2.3",
3737
"@auth/core": "^0.28.0",
3838
"@auth/drizzle-adapter": "^0.8.0",
3939
"@neondatabase/serverless": "^0.9.0",
4040
"@next/bundle-analyzer": "^14.2.0-canary.16",
41-
"@react-aria/datepicker": "^3.9.2",
42-
"@react-aria/i18n": "^3.10.1",
43-
"@react-stately/datepicker": "^3.9.1",
44-
"@tanstack/react-virtual": "^3.0.4",
45-
"@tiptap/core": "^2.2.3",
46-
"@tiptap/pm": "^2.2.3",
47-
"@tiptap/react": "^2.2.3",
48-
"@tiptap/starter-kit": "^2.2.3",
49-
"@vercel/analytics": "^1.1.4",
41+
"@react-aria/datepicker": "^3.9.3",
42+
"@react-aria/i18n": "^3.10.2",
43+
"@react-stately/datepicker": "^3.9.2",
44+
"@tanstack/react-virtual": "^3.1.3",
45+
"@tiptap/core": "^2.2.4",
46+
"@tiptap/pm": "^2.2.4",
47+
"@tiptap/react": "^2.2.4",
48+
"@tiptap/starter-kit": "^2.2.4",
49+
"@vercel/analytics": "^1.2.2",
5050
"@vercel/speed-insights": "^1.0.10",
5151
"dotenv": "^16.4.5",
52-
"drizzle-orm": "^0.29.5",
52+
"drizzle-orm": "^0.30.1",
5353
"drizzle-valibot": "^0.1.1",
5454
"jsdom": "^24.0.0",
55-
"lucide-react": "^0.331.0",
55+
"lucide-react": "^0.356.0",
5656
"luxon": "^3.4.4",
5757
"next": "^14.2.0-canary.16",
5858
"next-auth": "^5.0.0-beta.15",
@@ -67,24 +67,24 @@
6767
},
6868
"devDependencies": {
6969
"@ianvs/prettier-plugin-sort-imports": "^4.1.1",
70-
"@pandacss/dev": "^0.31.0",
71-
"@pandacss/eslint-plugin": "^0.0.17",
72-
"@pandacss/preset-panda": "^0.31.0",
73-
"@pandacss/types": "^0.31.0",
74-
"@park-ui/panda-preset": "^0.34.1",
70+
"@pandacss/dev": "^0.34.3",
71+
"@pandacss/eslint-plugin": "^0.1.1",
72+
"@pandacss/preset-panda": "^0.34.3",
73+
"@pandacss/types": "^0.34.3",
74+
"@park-ui/panda-preset": "^0.36.1",
7575
"@types/jsdom": "^21.1.6",
7676
"@types/luxon": "^3.4.2",
77-
"@types/node": "^20.11.19",
78-
"@types/pg": "^8.11.0",
79-
"@types/react": "^18.2.55",
80-
"@types/react-dom": "^18.2.19",
81-
"@types/tinycolor2": "^1",
82-
"@typescript-eslint/eslint-plugin": "^7.0.1",
83-
"@typescript-eslint/parser": "^7.0.1",
84-
"@typescript-eslint/utils": "^7.0.1",
77+
"@types/node": "^20.11.26",
78+
"@types/pg": "^8.11.2",
79+
"@types/react": "^18.2.65",
80+
"@types/react-dom": "^18.2.21",
81+
"@types/tinycolor2": "^1.4.6",
82+
"@typescript-eslint/eslint-plugin": "^7.2.0",
83+
"@typescript-eslint/parser": "^7.2.0",
84+
"@typescript-eslint/utils": "^7.2.0",
8585
"cross-env": "^7.0.3",
8686
"drizzle-kit": "^0.20.14",
87-
"eslint": "^8.56.0",
87+
"eslint": "^8.57.0",
8888
"eslint-config-next": "14.1.3",
8989
"eslint-plugin-drizzle": "^0.2.3",
9090
"eslint-plugin-tsdoc": "^0.2.17",
@@ -93,7 +93,7 @@
9393
"postcss": "^8.4.35",
9494
"prettier": "^3.2.5",
9595
"tsx": "^4.7.1",
96-
"typescript": "^5.3.3"
96+
"typescript": "^5.4.2"
9797
},
9898
"packageManager": "[email protected]+sha256.f3cc0eda8e5560e529c7147565b30faa43b4e472d90e8634d7134a37c7f59781",
9999
"dependenciesMeta": {

‎src/components/calendar/CurrentTime.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const CurrentTime = ({ startHour, endHour }: CurrentTimeProps) => {
4545
pos: "absolute",
4646
// left, right, bottom are set to 0, or full width, bottom aligned
4747
inset: "auto 0 0",
48-
bg: "red",
48+
bg: "red.500",
4949
},
5050
}}
5151
_before={{

‎src/components/course/Course.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { getInterval, getWeekday, TIME_SIMPLE } from "@/utils/time";
66
export const Course = async ({ id, name, weekdays, subject, startTime, endTime }: CourseProps) => {
77
return (
88
<Link href={`/courses/${encodeId(id)}`} underline="none" w="full">
9-
<Card.Root w="full" minW="xs" boxShadow="none" _hover={{ bg: "bg.subtle" }}>
9+
<Card.Root p={4} w="full" minW="xs" boxShadow="none" _hover={{ bg: "bg.subtle" }}>
1010
<Card.Header display="block" pb={0}>
1111
<Badge mb="2">{subject}</Badge>
1212
<Card.Title>{name}</Card.Title>

‎src/components/form/Prompt.tsx‎

Lines changed: 50 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Plus, X } from "lucide-react";
66
import { Form, SubmitButton } from "@/components/form";
77
import { Button, Dialog, IconButton } from "@/components/ui";
88
import type { StatefulFormAction } from "@/interfaces/actions";
9-
import { Stack } from "@/lib/styled/jsx";
9+
import { Box, Stack } from "@/lib/styled/jsx";
1010

1111
type PromptProps<T> = {
1212
title: string;
@@ -34,53 +34,55 @@ export const Prompt = <T,>({ title, description, children, action, ...props }: P
3434
return (
3535
// there is a bug that when submitting twice, Dialog won't close. I suspect it is an issue with the library, and will wait to see if it is fixed, as isOpen
3636
// is correctly set, and onSubmitSuccess is fired. Setting present to false also closes it correctly, though without the right focus
37-
<Dialog.Root
38-
open={isOpen}
39-
onOpenChange={(e) => setIsOpen(e.open)}
40-
closeOnEscapeKeyDown={false}
41-
closeOnInteractOutside={false}
42-
// necessary to ensure form and `isOpen` state are reset on close
43-
unmountOnExit
44-
{...props}
45-
>
46-
<Dialog.Trigger asChild>
47-
<IconButton variant="ghost">
48-
<Plus />
49-
</IconButton>
50-
</Dialog.Trigger>
51-
<Dialog.Backdrop />
52-
<Dialog.Positioner>
53-
<Dialog.Content>
54-
<Stack gap="4" p="6">
55-
<Stack gap="1">
56-
<Dialog.Title>{title}</Dialog.Title>
57-
{description && <Dialog.Description>{description}</Dialog.Description>}
58-
</Stack>
59-
{/* Since there should only ever be one prompt at a time and the submit button
60-
/* has to be nested inside a stack, using the id here is ok and necessary */}
61-
<Form id="prompt-form" action={action} onSubmitSuccess={onSubmitSuccess}>
62-
{children}
63-
<Stack gap="3" direction="row" w="full" mt={6}>
64-
<Dialog.CloseTrigger asChild>
65-
<Button variant="outline" w="full">
66-
Cancel
67-
</Button>
68-
</Dialog.CloseTrigger>
69-
{/* Closes Dialog after completion */}
70-
{/* FormTarget = "prompt-form" based on <Form /> id prop*/}
71-
<SubmitButton w="full" formTarget="prompt-form">
72-
Confirm
73-
</SubmitButton>
37+
<Box>
38+
<Dialog.Root
39+
open={isOpen}
40+
onOpenChange={(e) => setIsOpen(e.open)}
41+
closeOnEscapeKeyDown={false}
42+
closeOnInteractOutside={false}
43+
// necessary to ensure form and `isOpen` state are reset on close
44+
unmountOnExit
45+
{...props}
46+
>
47+
<Dialog.Trigger asChild>
48+
<IconButton variant="ghost">
49+
<Plus />
50+
</IconButton>
51+
</Dialog.Trigger>
52+
<Dialog.Backdrop />
53+
<Dialog.Positioner>
54+
<Dialog.Content>
55+
<Stack gap="4" p="6">
56+
<Stack gap="1">
57+
<Dialog.Title>{title}</Dialog.Title>
58+
{description && <Dialog.Description>{description}</Dialog.Description>}
7459
</Stack>
75-
</Form>
76-
</Stack>
77-
<Dialog.CloseTrigger asChild position="absolute" top="4" right="4">
78-
<IconButton aria-label="Close Dialog" variant="ghost" size="sm">
79-
<X />
80-
</IconButton>
81-
</Dialog.CloseTrigger>
82-
</Dialog.Content>
83-
</Dialog.Positioner>
84-
</Dialog.Root>
60+
{/* Since there should only ever be one prompt at a time and the submit button
61+
/* has to be nested inside a stack, using the id here is ok and necessary */}
62+
<Form id="prompt-form" action={action} onSubmitSuccess={onSubmitSuccess}>
63+
{children}
64+
<Stack gap="3" direction="row" w="full" mt={6}>
65+
<Dialog.CloseTrigger asChild>
66+
<Button variant="outline" w="full">
67+
Cancel
68+
</Button>
69+
</Dialog.CloseTrigger>
70+
{/* Closes Dialog after completion */}
71+
{/* FormTarget = "prompt-form" based on <Form /> id prop*/}
72+
<SubmitButton w="full" formTarget="prompt-form">
73+
Confirm
74+
</SubmitButton>
75+
</Stack>
76+
</Form>
77+
</Stack>
78+
<Dialog.CloseTrigger asChild position="absolute" top="4" right="4">
79+
<IconButton aria-label="Close Dialog" variant="ghost" size="sm">
80+
<X />
81+
</IconButton>
82+
</Dialog.CloseTrigger>
83+
</Dialog.Content>
84+
</Dialog.Positioner>
85+
</Dialog.Root>
86+
</Box>
8587
);
8688
};

‎src/components/layout/NavLink.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ const navLink = cva({
3232
});
3333

3434
export const NavLink = ({ children, href, ...props }: LinkProps) => {
35-
const [cssProps, rest] = splitCssProps(props);
35+
const [{ css: cssProp, ...styleProps }, rest] = splitCssProps(props);
3636
// /courses/1/2/3 -> /courses
3737
const active = usePathname().startsWith(`${href}`);
3838

3939
return (
40-
<Link {...rest} href={href} className={cx(navLink({ active }), css(cssProps))}>
40+
<Link {...rest} href={href} className={cx(navLink({ active }), css(styleProps, cssProp))}>
4141
{children}
4242
</Link>
4343
);

‎src/components/ui/Card.tsx‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@ import { card } from "@/lib/styled/recipes";
99

1010
const { withProvider, withContext } = createStyleContext(card);
1111

12-
const Root = withProvider(styled(ark.div), "root");
13-
const Body = withContext(styled(ark.div), "body");
14-
const Description = withContext(styled(ark.p), "description");
15-
const Footer = withContext(styled(ark.div), "footer");
16-
const Header = withContext(styled(ark.div), "header");
17-
const Title = withContext(styled(ark.h3), "title");
18-
19-
export { Body, Description, Footer, Header, Root, Title };
12+
export const Root = withProvider(styled(ark.div), "root");
13+
export const Body = withContext(styled(ark.div), "body");
14+
export const Description = withContext(styled(ark.p), "description");
15+
export const Footer = withContext(styled(ark.div), "footer");
16+
export const Header = withContext(styled(ark.div), "header");
17+
export const Title = withContext(styled(ark.h3), "title");
2018

2119
export type CardProps = ComponentProps<typeof Root>;
2220
export type CardBodyProps = ComponentProps<typeof Body>;

‎src/components/ui/Progress.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ export interface ProgressProps
2222

2323
export const Progress = forwardRef<HTMLDivElement, ProgressProps>((props, ref) => {
2424
const [variantProps, progressProps] = progress.splitVariantProps(props);
25-
const [cssProps, localProps] = splitCssProps(progressProps);
25+
const [{ css: cssProp, ...styleProps }, localProps] = splitCssProps(progressProps);
2626
const { children, className, type = "linear", ...rootProps } = localProps;
2727
const styles = progress(variantProps);
2828

2929
return (
3030
<ArkProgress.Root
3131
ref={ref}
32-
className={cx(styles.root, css(cssProps), className)}
32+
className={cx(styles.root, css(styleProps, cssProp), className)}
3333
{...rootProps}
3434
>
3535
{children && <ArkProgress.Label className={styles.label}>{children}</ArkProgress.Label>}

0 commit comments

Comments
 (0)