diff --git a/index.html b/admin.html similarity index 100% rename from index.html rename to admin.html diff --git a/public/dashboard.html b/dashboard.html similarity index 100% rename from public/dashboard.html rename to dashboard.html diff --git a/public/admin.html b/public/admin.html deleted file mode 100644 index 77a855c..0000000 --- a/public/admin.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - World driven - - - - - - - -
- - - diff --git a/public/pull_request.html b/pull_request.html similarity index 82% rename from public/pull_request.html rename to pull_request.html index d09f6d4..5bc9d12 100644 --- a/public/pull_request.html +++ b/pull_request.html @@ -12,7 +12,7 @@ name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" /> - + @@ -20,6 +20,6 @@
- + diff --git a/server/index.js b/server/index.js index a9170d3..ba5f65e 100644 --- a/server/index.js +++ b/server/index.js @@ -27,7 +27,7 @@ async function startServer() { }); }); - // Proxy API requests to backend - MUST be before Vite middleware + // Proxy API requests to backend - MUST be before static/Vite middleware app.use('/api', proxy); // Setup Vite middleware (development only) @@ -41,10 +41,15 @@ async function startServer() { app.use(vite.middlewares); } - // Serve static files + // Serve static files (landing page, images, css) app.use(express.static('./public')); - // Static pages (no React) + // In production, serve built assets from dist/ + if (isProduction) { + app.use(express.static('./dist')); + } + + // Static pages (no React) - served from public/ app.get('/', (req, res) => { res.sendFile('index.html', { root: './public' }); }); @@ -57,15 +62,17 @@ async function startServer() { res.sendFile('privacyPolicy.html', { root: './public' }); }); - // React pages - use Vite in development + // React pages - serve from dist/ in production, transform with Vite in development const serveReactPage = async (req, res, htmlFile) => { if (isProduction) { - res.sendFile(htmlFile, { root: './public' }); + // Serve pre-built HTML from dist/ + res.sendFile(htmlFile, { root: './dist' }); } else { + // Transform HTML with Vite (handles JSX imports) try { const template = await vite.transformIndexHtml( req.originalUrl, - fs.readFileSync(path.join('./public', htmlFile), 'utf-8') + fs.readFileSync(path.join('.', htmlFile), 'utf-8') ); res.setHeader('Content-Type', 'text/html'); res.send(template); @@ -80,7 +87,8 @@ async function startServer() { app.get('/dashboard', (req, res) => serveReactPage(req, res, 'dashboard.html') ); - app.get('/admin', (req, res) => serveReactPage(req, res, 'dashboard.html')); + + app.get('/admin', (req, res) => serveReactPage(req, res, 'admin.html')); // PR pages: /:owner/:repo/pull/:number app.get('/:owner/:repo/pull/:number', (req, res) => { diff --git a/vite.config.js b/vite.config.js index a8badb8..9b91d15 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,12 +1,30 @@ import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react'; +import { resolve } from 'path'; export default defineConfig({ plugins: [react()], + + // Don't copy public/ to dist/ - we serve static files separately + publicDir: false, + + build: { + outDir: 'dist', + emptyOutDir: true, + rollupOptions: { + input: { + dashboard: resolve(__dirname, 'dashboard.html'), + pullRequest: resolve(__dirname, 'pull_request.html'), + admin: resolve(__dirname, 'admin.html'), + }, + }, + }, + server: { host: '0.0.0.0', port: 3001, }, + css: { modules: { localsConvention: 'camelCaseOnly',