Skip to content

Commit 280fd04

Browse files
authored
chore: bump dependencies (#235)
* chore: bump remix and react router deps * chore: bump deps
1 parent fb7ecef commit 280fd04

File tree

6 files changed

+1510
-1224
lines changed

6 files changed

+1510
-1224
lines changed

api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"author": "<[email protected]>",
88
"license": "MIT",
99
"dependencies": {
10-
"@code-hike/mdx": "^0.7.3",
10+
"@code-hike/mdx": "^0.7.4",
1111
"@ltd/j-toml": "^1.30.0",
1212
"@octokit/graphql": "^5.0.0",
1313
"@types/cors": "^2.8.12",

website/app/entry.client.tsx

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { hydrate } from 'react-dom';
1+
import { hydrateRoot } from 'react-dom/client';
2+
import { BrowserRouter } from 'react-router-dom';
23
import { RemixBrowser } from 'remix';
34
//@ts-ignore
45
if (window.ENV.MSW_ENABLED === '1') {
@@ -18,4 +19,14 @@ if (
1819
delete window.__remixManifest.routes['routes/preview-fetch'];
1920
}
2021

21-
hydrate(<RemixBrowser />, document);
22+
const container = document.getElementById('app');
23+
if (!container) {
24+
throw new Error('No element with id "app" found');
25+
}
26+
27+
hydrateRoot(
28+
container,
29+
<BrowserRouter>
30+
<RemixBrowser />
31+
</BrowserRouter>,
32+
);

website/app/entry.server.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { renderToString } from 'react-dom/server';
22
import { RemixServer } from 'remix';
33
import type { EntryContext } from 'remix';
4+
import { StaticRouter } from 'react-router-dom/server';
45

56
if (process.env.MSW_ENABLED === '1') {
67
require('../tests/mocks');
@@ -11,7 +12,11 @@ export default function handleRequest(
1112
headers: Headers,
1213
remixContext: EntryContext,
1314
): Response {
14-
const markup = renderToString(<RemixServer context={remixContext} url={request.url} />);
15+
const markup = renderToString(
16+
<StaticRouter location={new URL(request.url)}>
17+
<RemixServer context={remixContext} url={request.url} />
18+
</StaticRouter>,
19+
);
1520

1621
headers.set('Content-Type', 'text/html');
1722

website/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
"test:headed": "yarn rimraf tests/screenshots/* && MSW_ENABLED=1 playwright test --headed"
1515
},
1616
"dependencies": {
17-
"@code-hike/mdx": "^0.7.3",
17+
"@code-hike/mdx": "^0.7.4",
1818
"@docs.page/client": "^1.0.4",
1919
"@docs.page/server": "^1.0.1",
20-
"@docsearch/react": "^3.1.0",
20+
"@docsearch/react": "^3.2.2",
2121
"@heroicons/react": "^1.0.6",
2222
"@playwright/test": "^1.22.2",
23-
"@remix-run/express": "^1.6.1",
24-
"@remix-run/react": "^1.6.1",
25-
"@remix-run/serve": "^1.6.1",
26-
"@remix-run/vercel": "^1.6.1",
23+
"@remix-run/express": "^1.7.3",
24+
"@remix-run/react": "^1.7.3",
25+
"@remix-run/serve": "^1.7.3",
26+
"@remix-run/vercel": "^1.7.3",
2727
"@rollup/plugin-commonjs": "^22.0.1",
2828
"@rollup/plugin-json": "^4.1.0",
2929
"@rollup/plugin-node-resolve": "^13.3.0",
@@ -49,7 +49,7 @@
4949
},
5050
"devDependencies": {
5151
"@playwright/test": "^1.22.2",
52-
"@remix-run/dev": "^1.6.1",
52+
"@remix-run/dev": "^1.7.3",
5353
"@tailwindcss/typography": "^0.5.2",
5454
"@types/color": "^3.0.3",
5555
"@types/lodash.get": "^4.4.7",
@@ -60,10 +60,10 @@
6060
"@types/react-helmet": "^6.1.5",
6161
"@types/wicg-file-system-access": "^2020.9.5",
6262
"concurrently": "^7.2.2",
63-
"msw": "^0.44.2",
63+
"msw": "^0.47.4",
6464
"postcss": "^8.4.14",
6565
"prettier": "^2.7.1",
66-
"tailwindcss": "^3.1.4",
66+
"tailwindcss": "^3.2.0",
6767
"typescript": "^4.7.4"
6868
},
6969
"engines": {

0 commit comments

Comments
 (0)