diff --git a/package.json b/package.json index 27b8e1ac6..9bfeb6f0d 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,9 @@ "scripts": { "dev": "vite", "build": "vite build && node scripts/compileAssets.js", - "preview": "vite preview", + "preview": "vite preview --port 8000", "compileAssets": "node scripts/compileAssets.js --dev", + "lint": "eslint --fix", "lint:dry": "eslint", "stylelint": "stylelint --fix **/*.{less}", diff --git a/server.js b/server.js index 6d052a939..172da0fe2 100644 --- a/server.js +++ b/server.js @@ -10,7 +10,7 @@ async function start() { if (!isProd) { vite = await createViteServer({ - server: { middlewareMode: 'html' }, + server: { middlewareMode: true }, appType: "custom", }); diff --git a/server/app.js b/server/app.js index 3be8fb40c..cea0dde22 100644 --- a/server/app.js +++ b/server/app.js @@ -574,18 +574,18 @@ export default async function createApp(vite) { userThemes : req.userThemes }; - console.log('props: ', !!props); - const htmlPath = isProd ? path.resolve('build', 'index.html') : path.resolve('index.html'); let html = fs.readFileSync(htmlPath, 'utf-8'); + if(!isProd && vite?.transformIndexHtml) { + html = await vite.transformIndexHtml(req.originalUrl, html); + } html = html.replace( '
', - `` + `\n` ); - console.log('html', html); return html; }; diff --git a/vite.config.js b/vite.config.js index 8795d18da..cfeaae3b0 100644 --- a/vite.config.js +++ b/vite.config.js @@ -9,10 +9,6 @@ export default defineConfig({ outDir: "build", emptyOutDir: true, rollupOptions: { - input: { - admin: path.resolve(__dirname, "client/admin/admin.jsx"), - homebrew: path.resolve(__dirname, "client/homebrew/homebrew.jsx"), - }, output: { entryFileNames: "[name]/bundle.js", chunkFileNames: "[name]/[name]-[hash].js",