Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(deps): update react monorepo (major) #603

Merged
merged 10 commits into from
Dec 11, 2024
Merged

feat(deps): update react monorepo (major) #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
36a822c
chore(deps): update react monorepo
renovate[bot] Dec 9, 2024
cd6cf01
chore: committing generated code
renovate[bot] Dec 9, 2024
c7dfad3
bump react router
danadajian Dec 11, 2024
2973a20
Merge branch 'main' into renovate/major-react-monorepo
danadajian Dec 11, 2024
981a2d2
bump react router
danadajian Dec 11, 2024
c6c1e01
import
danadajian Dec 11, 2024
1e9c5ff
make vite dep
danadajian Dec 11, 2024
6295bf3
fix browser error
danadajian Dec 11, 2024
144d98c
get component tests running
danadajian Dec 11, 2024
aa901be
fix tests
danadajian Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions app/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,19 @@ export function App(props: {
const hash = commitHash ?? diffId;

return (
<PageWrapper>
{bucket && hash ? (
<MainPage bucket={bucket} hash={hash} />
) : (
<LandingPage />
)}
</PageWrapper>
<ClientProvider>
<BaseImageStateProvider>
{bucket && hash ? (
<MainPage bucket={bucket} hash={hash} />
) : (
<LandingPage />
)}
</BaseImageStateProvider>
</ClientProvider>
);
}

function PageWrapper(props: PropsWithChildren) {
export function OuterHtml(props: PropsWithChildren) {
return (
<html lang="en">
<head>
Expand All @@ -44,11 +46,7 @@ function PageWrapper(props: PropsWithChildren) {
<link rel="stylesheet" href="/public/globals.css" />
<title>Comparadise</title>
</head>
<body>
<ClientProvider>
<BaseImageStateProvider>{props.children}</BaseImageStateProvider>
</ClientProvider>
</body>
<body>{props.children}</body>
</html>
);
}
6 changes: 4 additions & 2 deletions app/client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
import React from 'react';
import { hydrateRoot } from 'react-dom/client';
import { BrowserRouter } from 'react-router-dom';
import { App } from './app';
import { App, OuterHtml } from './app';

hydrateRoot(
document,
<BrowserRouter>
<App />
<OuterHtml>
<App />
</OuterHtml>
</BrowserRouter>
);
31 changes: 12 additions & 19 deletions app/frontend/components/main-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,8 @@ const preloadNextPage = async (images?: Images) => {
}

const newViewType = await getViewType(images);
switch (newViewType) {
case ImageViews.SIDE_BY_SIDE:
await preloadAllImages(images.map(image => image.url));
break;
case ImageViews.SINGLE:
default:
break;
if (newViewType === ImageViews.SIDE_BY_SIDE) {
await preloadAllImages(images.map(image => image.url));
}

return newViewType;
Expand Down Expand Up @@ -73,19 +68,17 @@ export const MainPage = ({
}

React.useEffect(() => {
if (!isNextPageReady && data?.images) {
preloadNextPage(data.images).then(newViewType => {
if (newViewType) {
setIsNextPageReady(true);
setViewType(newViewType);
if (newViewType === ImageViews.SIDE_BY_SIDE) {
setAvailableView('BOTH');
} else {
setAvailableView('SINGLE');
}
preloadNextPage(data?.images).then(newViewType => {
if (newViewType) {
setIsNextPageReady(true);
setViewType(newViewType);
if (newViewType === ImageViews.SIDE_BY_SIDE) {
setAvailableView('BOTH');
} else {
setAvailableView('SINGLE');
}
});
}
}
});
}, [isNextPageReady, data?.images]);

if (error) {
Expand Down
10 changes: 5 additions & 5 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"@trpc/react-query": "next",
"@trpc/server": "next",
"@types/lodash": "4.17.13",
"@types/react": "18.3.14",
"@types/react-dom": "18.3.2",
"@types/react": "19.0.1",
"@types/react-dom": "19.0.1",
"elysia": "1.1.26",
"lodash": "4.17.21",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "6.28.0",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-router-dom": "7.0.2",
"tailwindcss": "3.4.16",
"zod": "3.23.8"
},
Expand Down
25 changes: 14 additions & 11 deletions app/server.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import { staticPlugin } from '@elysiajs/static';
import Elysia from 'elysia';
import { router, trpcRouter } from './backend/src/router';
import { StaticRouter } from 'react-router-dom/server';
import { StaticRouter } from 'react-router-dom';
import React from 'react';
import { App } from './app';
import { App, OuterHtml } from './app';
// @ts-expect-error - have to import from server.browser for some reason
import { renderToReadableStream } from 'react-dom/server.browser';

await Bun.build({
entrypoints: ['./client.tsx'],
outdir: './public',
minify: true
minify: true,
target: 'bun'
});

const app = new Elysia()
Expand All @@ -20,14 +21,16 @@ const app = new Elysia()
.get('*', async context => {
const stream = await renderToReadableStream(
<StaticRouter location={context.path}>
<App
bucket={context.query.bucket}
commitHash={context.query.commitHash}
diffId={context.query.diffId}
/>
{process.env.NODE_ENV === 'development' && (
<script src="https://cdn.tailwindcss.com" />
)}
<OuterHtml>
<App
bucket={context.query.bucket}
commitHash={context.query.commitHash}
diffId={context.query.diffId}
/>
{process.env.NODE_ENV === 'development' && (
<script src="https://cdn.tailwindcss.com" />
)}
</OuterHtml>
</StaticRouter>,
{
bootstrapScripts: ['./public/client.js']
Expand Down
Binary file modified bun.lockb
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"@docusaurus/preset-classic": "3.6.3",
"@docusaurus/types": "3.6.3",
"@mdx-js/react": "3.1.0",
"@types/react": "18.3.14",
"@types/react": "19.0.1",
"ajv": "8.17.1",
"clsx": "2.1.1",
"react": "18.3.1",
"react-dom": "18.3.1"
"react": "19.0.0",
"react-dom": "19.0.0"
}
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "comparadise",
"packageManager": "[email protected].36",
"packageManager": "[email protected].38",
"devDependencies": {
"@swc/jest": "0.2.37",
"@total-typescript/ts-reset": "0.6.1",
Expand Down
Loading