Skip to content

Commit a1f3100

Browse files
authored
Updated Remix Dev Tools to latest version (#353)
1 parent 68d7e7f commit a1f3100

File tree

5 files changed

+28
-12
lines changed

5 files changed

+28
-12
lines changed

app/entry.client.tsx

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ if (ENV.MODE === 'development') {
88
if (ENV.MODE === 'production' && ENV.SENTRY_DSN) {
99
import('~/utils/monitoring.client.tsx').then(({ init }) => init())
1010
}
11-
startTransition(() => {
12-
hydrateRoot(document, <RemixBrowser />)
13-
})
11+
if (process.env.NODE_ENV === 'development') {
12+
import('remix-development-tools').then(({ initRouteBoundariesClient }) => {
13+
initRouteBoundariesClient()
14+
startTransition(() => {
15+
hydrateRoot(document, <RemixBrowser />)
16+
})
17+
})
18+
} else {
19+
startTransition(() => {
20+
hydrateRoot(document, <RemixBrowser />)
21+
})
22+
}

app/entry.server.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ export default async function handleRequest(...args: DocRequestArgs) {
2727
remixContext,
2828
loadContext,
2929
] = args
30+
const context =
31+
process.env.NODE_ENV === 'development'
32+
? await import('remix-development-tools').then(
33+
({ initRouteBoundariesServer }) =>
34+
initRouteBoundariesServer(remixContext),
35+
)
36+
: remixContext
3037
const { currentInstance, primaryInstance } = await getInstanceInfo()
3138
responseHeaders.set('fly-region', process.env.FLY_REGION ?? 'unknown')
3239
responseHeaders.set('fly-app', process.env.FLY_APP_NAME ?? 'unknown')
@@ -47,7 +54,7 @@ export default async function handleRequest(...args: DocRequestArgs) {
4754

4855
const { pipe, abort } = renderToPipeableStream(
4956
<NonceProvider value={nonce}>
50-
<RemixServer context={remixContext} url={request.url} />
57+
<RemixServer context={context} url={request.url} />
5158
</NonceProvider>,
5259
{
5360
[callbackName]: () => {

app/root.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ function App() {
238238
<Toaster />
239239
{RemixDevTools && (
240240
<Suspense>
241-
<RemixDevTools showRouteBoundaries />
241+
<RemixDevTools />
242242
</Suspense>
243243
)}
244244
</Document>

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
"prettier": "^2.8.8",
138138
"prettier-plugin-sql": "^0.15.1",
139139
"prettier-plugin-tailwindcss": "^0.3.0",
140-
"remix-development-tools": "^1.2.2",
140+
"remix-development-tools": "^1.4.0",
141141
"remix-flat-routes": "^0.5.10",
142142
"tsconfig-paths": "^4.2.0",
143143
"tsx": "^3.12.7",
@@ -152,4 +152,4 @@
152152
"prisma": {
153153
"seed": "tsx prisma/seed.ts"
154154
}
155-
}
155+
}

0 commit comments

Comments
 (0)