|
@@ -21,46 +21,46 @@ async function createServer(
|
|
|
* @type {import('vite').ViteDevServer}
|
|
|
*/
|
|
|
let vite
|
|
|
- if (!isProd) {
|
|
|
- vite = await require('vite').createServer({
|
|
|
- root,
|
|
|
- logLevel: isTest ? 'error' : 'info',
|
|
|
- server: {
|
|
|
- middlewareMode: 'ssr',
|
|
|
- watch: {
|
|
|
- // During tests we edit the files too fast and sometimes chokidar
|
|
|
- // misses change events, so enforce polling for consistency
|
|
|
- usePolling: true,
|
|
|
- interval: 100
|
|
|
- }
|
|
|
- }
|
|
|
- })
|
|
|
- // use vite's connect instance as middleware
|
|
|
- app.use(vite.middlewares)
|
|
|
- } else {
|
|
|
+ // if (!isProd) {
|
|
|
+ // vite = await require('vite').createServer({
|
|
|
+ // root,
|
|
|
+ // logLevel: isTest ? 'error' : 'info',
|
|
|
+ // server: {
|
|
|
+ // middlewareMode: 'ssr',
|
|
|
+ // watch: {
|
|
|
+ // // During tests we edit the files too fast and sometimes chokidar
|
|
|
+ // // misses change events, so enforce polling for consistency
|
|
|
+ // usePolling: true,
|
|
|
+ // interval: 100
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // // use vite's connect instance as middleware
|
|
|
+ // app.use(vite.middlewares)
|
|
|
+ // } else {
|
|
|
app.use(require('compression')())
|
|
|
app.use(
|
|
|
require('serve-static')(resolve('dist/client'), {
|
|
|
index: false
|
|
|
})
|
|
|
)
|
|
|
- }
|
|
|
+ // }
|
|
|
|
|
|
app.use('*', async (req, res) => {
|
|
|
try {
|
|
|
const url = req.originalUrl
|
|
|
|
|
|
let template, render
|
|
|
- if (!isProd) {
|
|
|
- // always read fresh template in dev
|
|
|
- template = fs.readFileSync(resolve('index.html'), 'utf-8')
|
|
|
- template = await vite.transformIndexHtml(url, template)
|
|
|
- render = (await vite.ssrLoadModule('/src/entry-server.js')).render
|
|
|
- } else {
|
|
|
+ // if (!isProd) {
|
|
|
+ // // always read fresh template in dev
|
|
|
+ // template = fs.readFileSync(resolve('index.html'), 'utf-8')
|
|
|
+ // template = await vite.transformIndexHtml(url, template)
|
|
|
+ // render = (await vite.ssrLoadModule('/src/entry-server.js')).render
|
|
|
+ // } else {
|
|
|
template = indexProd
|
|
|
// @ts-ignore
|
|
|
render = require('./dist/server/entry-server.js').render
|
|
|
- }
|
|
|
+ // }
|
|
|
|
|
|
const [appHtml, preloadLinks] = await render(url, manifest)
|
|
|
|