Skip to content

Commit 558a839

Browse files
committed
Improve vite development server config
1 parent 391e502 commit 558a839

File tree

4 files changed

+27
-16
lines changed

4 files changed

+27
-16
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
"prettier": "^3.5.3",
149149
"prettier-plugin-sql": "^0.19.0",
150150
"prettier-plugin-tailwindcss": "^0.6.11",
151-
"react-router-devtools": "^5.0.1",
151+
"react-router-devtools": "^5.0.3",
152152
"remix-flat-routes": "^0.8.5",
153153
"tsx": "^4.19.4",
154154
"tw-animate-css": "^1.2.9",

server/index.ts

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,28 @@ if (SENTRY_ENABLED) {
2121
void import('./utils/monitoring.js').then(({ init }) => init())
2222
}
2323

24+
const desiredPort = Number(process.env.PORT || 3000)
25+
const portToUse = await getPort({
26+
port: portNumbers(desiredPort, desiredPort + 100),
27+
})
28+
const portAvailable = desiredPort === portToUse
29+
if (!portAvailable && !IS_DEV) {
30+
console.log(`⚠️ Port ${desiredPort} is not available.`)
31+
process.exit(1)
32+
}
33+
2434
const viteDevServer = IS_PROD
2535
? undefined
2636
: await import('vite').then((vite) =>
2737
vite.createServer({
28-
server: { middlewareMode: true },
38+
server: {
39+
middlewareMode: true,
40+
// We tell Vite on what port we're running our dev server
41+
port: portToUse,
42+
},
43+
// We tell Vite we are running a custom app instead of
44+
// the SPA default so it doesn't run HTML middleware
45+
appType: 'custom',
2946
}),
3047
)
3148

@@ -208,16 +225,6 @@ app.all(
208225
}),
209226
)
210227

211-
const desiredPort = Number(process.env.PORT || 3000)
212-
const portToUse = await getPort({
213-
port: portNumbers(desiredPort, desiredPort + 100),
214-
})
215-
const portAvailable = desiredPort === portToUse
216-
if (!portAvailable && !IS_DEV) {
217-
console.log(`⚠️ Port ${desiredPort} is not available.`)
218-
process.exit(1)
219-
}
220-
221228
const server = app.listen(portToUse, () => {
222229
if (!portAvailable) {
223230
console.warn(

tests/mocks/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ server.listen({
2121
if (request.url.includes('.sentry.io')) {
2222
return
2323
}
24+
// React-router-devtools send custom requests internally to handle some functionality, we ignore those
25+
if (request.url.includes('react-router-devtools-request')) {
26+
return
27+
}
2428
// Print the regular MSW unhandled request warning otherwise.
2529
print.warning()
2630
},

0 commit comments

Comments
 (0)