Skip to content

Commit 4cefcfe

Browse files
kentcdoddskentcdodds
committed
fix: update deps
Did not update tailwind related deps
1 parent a44483d commit 4cefcfe

17 files changed

Lines changed: 16254 additions & 19598 deletions

File tree

‎package-lock.json‎

Lines changed: 16018 additions & 19370 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,27 @@
2222
"example/epicshop"
2323
],
2424
"dependencies": {
25-
"@epic-web/config": "^1.11.3",
26-
"@nx/devkit": "19.8.2",
27-
"@nx/eslint": "19.8.2",
28-
"@nx/js": "19.8.2",
29-
"@nx/linter": "19.8.2",
30-
"@nx/playwright": "19.8.2",
31-
"@nx/workspace": "19.8.2",
32-
"@playwright/test": "^1.44.1",
33-
"@types/yargs": "^17.0.32",
25+
"@epic-web/config": "^1.21.0",
26+
"@nx/devkit": "21.2.2",
27+
"@nx/eslint": "21.2.2",
28+
"@nx/js": "21.2.2",
29+
"@nx/linter": "19.8.4",
30+
"@nx/playwright": "21.2.2",
31+
"@nx/workspace": "21.2.2",
32+
"@playwright/test": "^1.53.2",
33+
"@types/yargs": "^17.0.33",
3434
"cross-env": "^7.0.3",
35-
"dotenv": "^16.4.5",
36-
"eslint": "^9.3.0",
35+
"dotenv": "^17.0.1",
36+
"eslint": "^9.30.1",
3737
"get-stream": "^9.0.1",
38-
"globby": "^14.0.1",
38+
"globby": "^14.1.0",
3939
"npm-run-all": "^4.1.5",
40-
"nx": "19.8.2",
41-
"prettier": "^3.2.5",
42-
"prettier-plugin-tailwindcss": "^0.6.8",
43-
"tsx": "^4.11.0",
44-
"yargs": "^17.7.2",
45-
"yoctocolors": "^2.0.2"
40+
"nx": "21.2.2",
41+
"prettier": "^3.6.2",
42+
"prettier-plugin-tailwindcss": "^0.6.13",
43+
"tsx": "^4.20.3",
44+
"yargs": "^18.0.0",
45+
"yoctocolors": "^2.1.1"
4646
},
4747
"nx": {
4848
"includedScripts": []

‎packages/update-epic-workshop/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
],
1111
"type": "module",
1212
"dependencies": {
13-
"execa": "^9.4.0"
13+
"execa": "^9.6.0"
1414
},
1515
"repository": {
1616
"type": "git",

‎packages/workshop-app/app/components/accordion.tsx‎

Lines changed: 41 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -92,42 +92,49 @@ const AccordionComponent: React.FC<AccordionProps> = ({
9292

9393
export default AccordionComponent
9494

95-
const AccordionTrigger: React.FC<any> = React.forwardRef(
96-
({ children, className, variant, ...props }, forwardedRef) => (
97-
<Accordion.Header className="flex" asChild>
98-
<Accordion.Trigger
99-
className={clsx(
100-
'group flex w-full items-center justify-between border-b p-4 pr-3 font-mono text-sm font-medium leading-none hover:bg-foreground/20',
101-
102-
className,
103-
)}
104-
{...props}
105-
ref={forwardedRef}
106-
>
107-
<div className="flex items-center gap-1.5">{children}</div>
108-
<div className="flex items-center gap-2">
109-
<span className="font-mono text-xs font-normal uppercase text-muted-foreground">
110-
{variant}
111-
</span>
112-
<Icon
113-
name="TriangleDownSmall"
114-
className="transition group-radix-state-open:rotate-180"
115-
aria-hidden
116-
/>
117-
</div>
118-
</Accordion.Trigger>
119-
</Accordion.Header>
120-
),
121-
)
95+
const AccordionTrigger: React.FC<any> = ({
96+
ref: forwardedRef,
97+
children,
98+
className,
99+
variant,
100+
...props
101+
}) => (
102+
<Accordion.Header className="flex" asChild>
103+
<Accordion.Trigger
104+
className={clsx(
105+
'group flex w-full items-center justify-between border-b p-4 pr-3 font-mono text-sm font-medium leading-none hover:bg-foreground/20',
122106

123-
const AccordionContent: React.FC<any> = React.forwardRef(
124-
({ children, className, ...props }, forwardedRef) => (
125-
<Accordion.Content
126-
className={clsx('', className)}
107+
className,
108+
)}
127109
{...props}
128110
ref={forwardedRef}
129111
>
130-
<div>{children}</div>
131-
</Accordion.Content>
132-
),
112+
<div className="flex items-center gap-1.5">{children}</div>
113+
<div className="flex items-center gap-2">
114+
<span className="font-mono text-xs font-normal uppercase text-muted-foreground">
115+
{variant}
116+
</span>
117+
<Icon
118+
name="TriangleDownSmall"
119+
className="transition group-radix-state-open:rotate-180"
120+
aria-hidden
121+
/>
122+
</div>
123+
</Accordion.Trigger>
124+
</Accordion.Header>
125+
)
126+
127+
const AccordionContent: React.FC<any> = ({
128+
ref: forwardedRef,
129+
children,
130+
className,
131+
...props
132+
}) => (
133+
<Accordion.Content
134+
className={clsx('', className)}
135+
{...props}
136+
ref={forwardedRef}
137+
>
138+
<div>{children}</div>
139+
</Accordion.Content>
133140
)

‎packages/workshop-app/app/components/diff.tsx‎

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -241,33 +241,39 @@ function SelectFileToDiff({
241241
)
242242
}
243243

244-
const SelectItem: React.FC<any> = React.forwardRef(
245-
({ children, className, ...props }, forwardedRef) => {
246-
return (
247-
<Select.Item
248-
className={clsx(
249-
'relative flex cursor-pointer select-none items-center rounded px-10 py-2 leading-none opacity-80 radix-disabled:text-red-500 radix-highlighted:opacity-100 radix-highlighted:outline-none radix-state-checked:opacity-100',
244+
const SelectItem: React.FC<any> = ({
245+
ref: forwardedRef,
246+
children,
247+
className,
248+
...props
249+
}) => {
250+
return (
251+
<Select.Item
252+
className={clsx(
253+
'relative flex cursor-pointer select-none items-center rounded px-10 py-2 leading-none opacity-80 radix-disabled:text-red-500 radix-highlighted:opacity-100 radix-highlighted:outline-none radix-state-checked:opacity-100',
250254

251-
className,
252-
)}
253-
{...props}
254-
ref={forwardedRef}
255-
>
256-
<Select.ItemText>{children}</Select.ItemText>
257-
<Select.ItemIndicator className="absolute left-0 inline-flex w-[25px] items-center justify-center">
258-
<Icon name="CheckSmall" />
259-
</Select.ItemIndicator>
260-
</Select.Item>
261-
)
262-
},
263-
)
255+
className,
256+
)}
257+
{...props}
258+
ref={forwardedRef}
259+
>
260+
<Select.ItemText>{children}</Select.ItemText>
261+
<Select.ItemIndicator className="absolute left-0 inline-flex w-[25px] items-center justify-center">
262+
<Icon name="CheckSmall" />
263+
</Select.ItemIndicator>
264+
</Select.Item>
265+
)
266+
}
264267

265-
const SelectValue: React.FC<any> = React.forwardRef(
266-
({ children, className, ...props }, forwardedRef) => {
267-
return (
268-
<Select.Value {...props} ref={forwardedRef}>
269-
{props.value}
270-
</Select.Value>
271-
)
272-
},
273-
)
268+
const SelectValue: React.FC<any> = ({
269+
ref: forwardedRef,
270+
children,
271+
className,
272+
...props
273+
}) => {
274+
return (
275+
<Select.Value {...props} ref={forwardedRef}>
276+
{props.value}
277+
</Select.Value>
278+
)
279+
}

‎packages/workshop-app/app/routes/_app+/_layout.tsx‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ import {
1010
makeTimings,
1111
} from '@epic-web/workshop-utils/timing.server'
1212
import { clsx } from 'clsx'
13-
import {
14-
motion,
15-
useAnimationControls,
16-
type AnimationControls,
17-
} from 'framer-motion'
13+
import { motion, useAnimationControls } from 'framer-motion'
1814
import * as React from 'react'
1915
import {
2016
Link,
@@ -1297,7 +1293,7 @@ function NavToggle({
12971293
title: string
12981294
isMenuOpened: boolean
12991295
setMenuOpened: (value: boolean) => void
1300-
menuControls?: AnimationControls
1296+
menuControls?: ReturnType<typeof useAnimationControls>
13011297
}) {
13021298
const initialOpenRef = React.useRef(isMenuOpened)
13031299
const menuButtonRef = React.useRef<HTMLButtonElement>(null)

‎packages/workshop-app/app/routes/_app+/exercise+/$exerciseNumber_.$stepNumber.$type+/__shared/playground-window.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export function PlaygroundWindow({
2323
<Icon
2424
size="xl"
2525
name="Unlinked"
26-
className="text-foreground-destructive animate-pulse"
26+
className="animate-pulse text-foreground-destructive"
2727
/>
2828
)
2929
let setPlaygroundTooltipText = 'Click to reset Playground.'

‎packages/workshop-app/app/utils/forms.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export function ErrorList({
1212
return (
1313
<ul id={id} className="space-y-1">
1414
{errorsToRender.map((e) => (
15-
<li key={e} className="text-foreground-destructive text-[10px]">
15+
<li key={e} className="text-[10px] text-foreground-destructive">
1616
{e}
1717
</li>
1818
))}

‎packages/workshop-app/app/utils/misc.tsx‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ type AnchorProps = React.DetailedHTMLProps<
1919
HTMLAnchorElement
2020
>
2121

22-
export const AnchorOrLink = React.forwardRef<
23-
HTMLAnchorElement,
24-
AnchorProps & {
22+
export const AnchorOrLink = function AnchorOrLink({
23+
ref,
24+
...props
25+
}: AnchorProps &
26+
LinkProps & {
2527
reload?: boolean
26-
to?: LinkProps['to']
27-
prefetch?: LinkProps['prefetch']
28-
}
29-
>(function AnchorOrLink(props, ref) {
28+
}) {
3029
const {
3130
to,
3231
href,
@@ -69,7 +68,7 @@ export const AnchorOrLink = React.forwardRef<
6968
</Link>
7069
)
7170
}
72-
})
71+
}
7372

7473
export function ensureUndeployed() {
7574
if (ENV.EPICSHOP_DEPLOYED) {
@@ -106,12 +105,20 @@ export function useAltDown() {
106105
return altDown
107106
}
108107

109-
export const Heading = React.forwardRef<
110-
HTMLHeadingElement,
111-
React.ComponentPropsWithoutRef<'h1'> & {
112-
as?: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6'
113-
}
114-
>(function Heading({ id, children, as: asProp, className, ...props }, ref) {
108+
export const Heading = function Heading({
109+
ref,
110+
id,
111+
children,
112+
as: asProp,
113+
className,
114+
...props
115+
}: {
116+
ref: React.RefObject<HTMLHeadingElement>
117+
id?: string
118+
children: React.ReactNode
119+
as?: React.ElementType
120+
className?: string
121+
}) {
115122
const Comp = asProp ?? 'h1'
116123
const slugId = id ?? slugify(children ? String(children) : '')
117124
return (
@@ -134,7 +141,7 @@ export const Heading = React.forwardRef<
134141
{children}
135142
</Comp>
136143
)
137-
})
144+
}
138145
export function getUserImgSrc(imageId?: string | null) {
139146
return imageId ? `/resources/user-images/${imageId}` : '/img/user.png'
140147
}

‎packages/workshop-app/index.test.tsx‎

Whitespace-only changes.

0 commit comments

Comments
 (0)