Skip to content

Commit 7d724ba

Browse files
geekdadageekdada
committed
chore: upgrade deps
1 parent 5cd0292 commit 7d724ba

File tree

9 files changed

+4215
-3518
lines changed

9 files changed

+4215
-3518
lines changed

‎package.json

Lines changed: 5 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
"snyk-protect": "snyk-protect",
2424
"prepare": "npm run snyk-protect && husky install",
2525
"verify-translation": "zx scripts/verify-translations.mjs",
26-
"shadcn": "shadcn-ui",
2726
"shadcn:add": "zx scripts/shadcn-add.mjs"
2827
},
2928
"dependencies": {
@@ -41,15 +40,15 @@
4140
"@emotion/react": "^11.11.1",
4241
"@emotion/styled": "^11.11.0",
4342
"@hookform/resolvers": "^3.2.0",
44-
"@radix-ui/react-alert-dialog": "^1.0.4",
43+
"@radix-ui/react-alert-dialog": "^1.1.1",
4544
"@radix-ui/react-checkbox": "^1.0.4",
46-
"@radix-ui/react-dialog": "^1.0.4",
45+
"@radix-ui/react-dialog": "^1.1.1",
4746
"@radix-ui/react-dropdown-menu": "^2.0.5",
4847
"@radix-ui/react-icons": "^1.3.0",
4948
"@radix-ui/react-label": "^2.0.2",
5049
"@radix-ui/react-popover": "^1.0.6",
5150
"@radix-ui/react-select": "^1.2.2",
52-
"@radix-ui/react-slot": "^1.0.2",
51+
"@radix-ui/react-slot": "^1.1.0",
5352
"@radix-ui/react-switch": "^1.0.3",
5453
"@radix-ui/react-tabs": "^1.0.4",
5554
"@radix-ui/react-toggle": "^1.0.3",
@@ -142,7 +141,7 @@
142141
"react-wrap-balancer": "^1.0.0",
143142
"rimraf": "^5.0.1",
144143
"semver": "^7.5.4",
145-
"shadcn-ui": "^0.3.0",
144+
"shadcn": "^2.0.4",
146145
"smoothscroll-polyfill": "^0.4.4",
147146
"store2": "^2.12.0",
148147
"swr": "^2.2.0",
@@ -158,62 +157,7 @@
158157
"zx": "~7.2.3"
159158
},
160159
"resolutions": {
161-
"react-virtualized/**/@types/react": "^18",
162-
"array-buffer-byte-length": "npm:@nolyfill/array-buffer-byte-length@latest",
163-
"array-includes": "npm:@nolyfill/array-includes@latest",
164-
"array.prototype.findlastindex": "npm:@nolyfill/array.prototype.findlastindex@latest",
165-
"array.prototype.flat": "npm:@nolyfill/array.prototype.flat@latest",
166-
"array.prototype.flatmap": "npm:@nolyfill/array.prototype.flatmap@latest",
167-
"array.prototype.reduce": "npm:@nolyfill/array.prototype.reduce@latest",
168-
"array.prototype.tosorted": "npm:@nolyfill/array.prototype.tosorted@latest",
169-
"arraybuffer.prototype.slice": "npm:@nolyfill/arraybuffer.prototype.slice@latest",
170-
"available-typed-arrays": "npm:@nolyfill/available-typed-arrays@latest",
171-
"deep-equal": "npm:@nolyfill/deep-equal@latest",
172-
"define-properties": "npm:@nolyfill/define-properties@latest",
173-
"es-set-tostringtag": "npm:@nolyfill/es-set-tostringtag@latest",
174-
"function-bind": "npm:@nolyfill/function-bind@latest",
175-
"function.prototype.name": "npm:@nolyfill/function.prototype.name@latest",
176-
"get-symbol-description": "npm:@nolyfill/get-symbol-description@latest",
177-
"globalthis": "npm:@nolyfill/globalthis@latest",
178-
"gopd": "npm:@nolyfill/gopd@latest",
179-
"harmony-reflect": "npm:@nolyfill/harmony-reflect@latest",
180-
"has": "npm:@nolyfill/has@latest",
181-
"has-property-descriptors": "npm:@nolyfill/has-property-descriptors@latest",
182-
"has-proto": "npm:@nolyfill/has-proto@latest",
183-
"has-symbols": "npm:@nolyfill/has-symbols@latest",
184-
"has-tostringtag": "npm:@nolyfill/has-tostringtag@latest",
185-
"is-arguments": "npm:@nolyfill/is-arguments@latest",
186-
"is-array-buffer": "npm:@nolyfill/is-array-buffer@latest",
187-
"is-date-object": "npm:@nolyfill/is-date-object@latest",
188-
"is-generator-function": "npm:@nolyfill/is-generator-function@latest",
189-
"is-regex": "npm:@nolyfill/is-regex@latest",
190-
"is-shared-array-buffer": "npm:@nolyfill/is-shared-array-buffer@latest",
191-
"is-string": "npm:@nolyfill/is-string@latest",
192-
"is-symbol": "npm:@nolyfill/is-symbol@latest",
193-
"is-weakref": "npm:@nolyfill/is-weakref@latest",
194-
"object-is": "npm:@nolyfill/object-is@latest",
195-
"object-keys": "npm:@nolyfill/object-keys@latest",
196-
"object.assign": "npm:@nolyfill/object.assign@latest",
197-
"object.entries": "npm:@nolyfill/object.entries@latest",
198-
"object.fromentries": "npm:@nolyfill/object.fromentries@latest",
199-
"object.getownpropertydescriptors": "npm:@nolyfill/object.getownpropertydescriptors@latest",
200-
"object.groupby": "npm:@nolyfill/object.groupby@latest",
201-
"object.hasown": "npm:@nolyfill/object.hasown@latest",
202-
"object.values": "npm:@nolyfill/object.values@latest",
203-
"regexp.prototype.flags": "npm:@nolyfill/regexp.prototype.flags@latest",
204-
"safe-array-concat": "npm:@nolyfill/safe-array-concat@latest",
205-
"safe-regex-test": "npm:@nolyfill/safe-regex-test@latest",
206-
"string.prototype.matchall": "npm:@nolyfill/string.prototype.matchall@latest",
207-
"string.prototype.trim": "npm:@nolyfill/string.prototype.trim@latest",
208-
"string.prototype.trimend": "npm:@nolyfill/string.prototype.trimend@latest",
209-
"string.prototype.trimstart": "npm:@nolyfill/string.prototype.trimstart@latest",
210-
"typed-array-buffer": "npm:@nolyfill/typed-array-buffer@latest",
211-
"typed-array-byte-length": "npm:@nolyfill/typed-array-byte-length@latest",
212-
"typed-array-byte-offset": "npm:@nolyfill/typed-array-byte-offset@latest",
213-
"typed-array-length": "npm:@nolyfill/typed-array-length@latest",
214-
"unbox-primitive": "npm:@nolyfill/unbox-primitive@latest",
215-
"which-boxed-primitive": "npm:@nolyfill/which-boxed-primitive@latest",
216-
"which-typed-array": "npm:@nolyfill/which-typed-array@latest"
160+
"react-virtualized/**/@types/react": "^18"
217161
},
218162
"browserslist": {
219163
"production": [

‎scripts/shadcn-add.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* global $ */
22

33
;(async () => {
4-
await $`npx shadcn-ui add ${process.argv[3]}`
4+
await $`npx shadcn add ${process.argv[3]}`
55
await $`npx eslint --fix --ext .ts,.tsx ./src/components/ui`
66
})()

‎src/components/ui/alert-dialog.tsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,15 @@ const AlertDialog = AlertDialogPrimitive.Root
88

99
const AlertDialogTrigger = AlertDialogPrimitive.Trigger
1010

11-
const AlertDialogPortal = ({
12-
className,
13-
...props
14-
}: AlertDialogPrimitive.AlertDialogPortalProps) => (
15-
<AlertDialogPrimitive.Portal className={cn(className)} {...props} />
16-
)
17-
AlertDialogPortal.displayName = AlertDialogPrimitive.Portal.displayName
11+
const AlertDialogPortal = AlertDialogPrimitive.Portal
1812

1913
const AlertDialogOverlay = React.forwardRef<
2014
React.ElementRef<typeof AlertDialogPrimitive.Overlay>,
2115
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Overlay>
2216
>(({ className, ...props }, ref) => (
2317
<AlertDialogPrimitive.Overlay
2418
className={cn(
25-
'fixed inset-0 z-50 bg-background/80 backdrop-blur-sm data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
19+
'fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
2620
className,
2721
)}
2822
{...props}
@@ -40,7 +34,7 @@ const AlertDialogContent = React.forwardRef<
4034
<AlertDialogPrimitive.Content
4135
ref={ref}
4236
className={cn(
43-
'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg md:w-full',
37+
'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
4438
className,
4539
)}
4640
{...props}
@@ -132,6 +126,8 @@ AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName
132126

133127
export {
134128
AlertDialog,
129+
AlertDialogPortal,
130+
AlertDialogOverlay,
135131
AlertDialogTrigger,
136132
AlertDialogContent,
137133
AlertDialogHeader,

‎src/components/ui/dialog.tsx

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,9 @@ const Dialog = DialogPrimitive.Root
88

99
const DialogTrigger = DialogPrimitive.Trigger
1010

11-
const DialogPortal = ({
12-
className,
13-
...props
14-
}: DialogPrimitive.DialogPortalProps) => (
15-
<DialogPrimitive.Portal className={cn(className)} {...props} />
16-
)
17-
DialogPortal.displayName = DialogPrimitive.Portal.displayName
11+
const DialogPortal = DialogPrimitive.Portal
12+
13+
const DialogClose = DialogPrimitive.Close
1814

1915
const DialogOverlay = React.forwardRef<
2016
React.ElementRef<typeof DialogPrimitive.Overlay>,
@@ -23,7 +19,7 @@ const DialogOverlay = React.forwardRef<
2319
<DialogPrimitive.Overlay
2420
ref={ref}
2521
className={cn(
26-
'fixed inset-0 z-50 bg-background/80 backdrop-blur-sm data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
22+
'fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
2723
className,
2824
)}
2925
{...props}
@@ -40,14 +36,14 @@ const DialogContent = React.forwardRef<
4036
<DialogPrimitive.Content
4137
ref={ref}
4238
className={cn(
43-
'rounded-t-xl sm:rounded-xl fixed max-sm:bottom-0 max-sm:pb-10 left-[50%] sm:top-[50%] z-50 grid w-full sm:max-w-lg md:max-w-2xl lg:max-w-3xl max-h-[90vh] overflow-y-scroll translate-x-[-50%] sm:translate-y-[-50%] gap-4 border-t sm:border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-bottom-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-bottom-[48%] md:w-full',
39+
'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
4440
className,
4541
)}
4642
{...props}
4743
>
4844
{children}
4945
<DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
50-
<Cross2Icon className="h-6 w-6" />
46+
<Cross2Icon className="h-4 w-4" />
5147
<span className="sr-only">Close</span>
5248
</DialogPrimitive.Close>
5349
</DialogPrimitive.Content>
@@ -112,7 +108,10 @@ DialogDescription.displayName = DialogPrimitive.Description.displayName
112108

113109
export {
114110
Dialog,
111+
DialogPortal,
112+
DialogOverlay,
115113
DialogTrigger,
114+
DialogClose,
116115
DialogContent,
117116
DialogHeader,
118117
DialogFooter,

‎src/pages/Landing/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ export const getSurgeHost = (): {
5555
const port = window.location.port
5656
? window.location.port
5757
: protocol === 'https:'
58-
? '443'
59-
: '80'
58+
? '443'
59+
: '80'
6060

6161
return {
6262
protocol,

‎src/pages/Profiles/Manage/Manage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ const ManageProfiles = () => {
103103
},
104104
})
105105

106-
await mutateCurrentProfile('/profiles/current?sensitive=1')
106+
await mutateCurrentProfile()
107107

108108
toast.success(t('select_profile_success'))
109109
}

‎src/pages/Requests/components/MethodBadge.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ const MethodBadge: React.FC<MethodBadgeProps> = ({
3131
isTruthy(failed)
3232
? tw`bg-red-500`
3333
: status === 'Active'
34-
? tw`bg-green-500`
35-
: tw`bg-blue-500`,
34+
? tw`bg-green-500`
35+
: tw`bg-blue-500`,
3636
cssProp,
3737
]}
3838
{...args}

‎src/utils/with-profile.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const withProfile = <P extends object>(
1212
return null
1313
}
1414

15+
// @ts-ignore
1516
return <Component {...(props as P)} profile={profile} />
1617
}
1718

0 commit comments

Comments
 (0)