Skip to content

Commit e982a2f

Browse files
authored
Merge branch 'main' into twoslash
Signed-off-by: Aviv Keller <[email protected]>
2 parents 88b6568 + 11fa0e5 commit e982a2f

7 files changed

Lines changed: 19 additions & 10 deletions

File tree

.github/workflows/sync-orama.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
name: Sync Orama Cloud
1010

1111
on:
12+
workflow_dispatch:
1213
push:
1314
branches:
1415
- main

apps/site/components/Link.tsx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,20 @@ import type { FC, AnchorHTMLAttributes, ComponentProps } from 'react';
33
import { Link as LocalizedLink } from '#site/navigation.mjs';
44

55
export type LinkProps =
6-
| ComponentProps<typeof LocalizedLink>
7-
| AnchorHTMLAttributes<HTMLAnchorElement>;
6+
| AnchorHTMLAttributes<HTMLAnchorElement>
7+
| ComponentProps<typeof LocalizedLink>;
88

99
const Link: FC<LinkProps> = ({ href, ...props }) => {
1010
if (!href || /^https?:/.test(href as string)) {
1111
return <a href={href as string} {...props} />;
1212
}
1313

14-
return <LocalizedLink href={href} {...props} />;
14+
return (
15+
<LocalizedLink
16+
href={href}
17+
{...(props as Omit<ComponentProps<typeof LocalizedLink>, 'href'>)}
18+
/>
19+
);
1520
};
1621

1722
export default Link;

apps/site/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"next-themes": "~0.4.6",
6666
"postcss-calc": "~10.1.1",
6767
"react": "catalog:",
68-
"react-dom": "^19.1.1",
68+
"react-dom": "^19.2.0",
6969
"reading-time": "~1.5.0",
7070
"rehype-autolink-headings": "~7.1.0",
7171
"rehype-slug": "~6.0.0",

packages/ui-components/src/Common/Select/index.module.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
.select {
44
@apply inline-flex
55
flex-col
6-
gap-1.5;
6+
gap-1.5
7+
align-middle;
78

89
.label {
910
@apply block

packages/ui-components/src/Common/Skeleton/index.module.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
@apply outline-hidden
55
dark:animate-pulse-dark
66
pointer-events-none
7+
inline-flex
78
animate-pulse
89
cursor-default
910
select-none
1011
rounded-md
1112
border-none
1213
bg-clip-border
14+
align-middle
1315
text-transparent
1416
shadow-none;
1517
}

pnpm-lock.yaml

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

pnpm-workspace.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ packages:
44

55
catalog:
66
'@types/node': 22.18.6
7-
'@types/react': ^19.1.12
7+
'@types/react': ^19.2.0
88
classnames: ~2.5.1
99
cross-env: ^10.0.0
10-
react: ^19.1.1
10+
react: ^19.2.0
1111
tailwindcss: ~4.0.17
1212
typescript: 5.8.3
1313

0 commit comments

Comments
 (0)