paul/picpeak
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat(native): auto-serve SPA when dist exists (unless SERVE_FRONTEND=false); add clear logging; serve index.html for /admin
Mirror to GitHub / mirror (push) Successful in 42s
Details
Test and Lint / backend-test (push) Successful in 1m34s
Details
Test and Lint / frontend-test (push) Successful in 2m10s
Details
Version and Release / version-bump (push) Successful in 59s
Details
Version and Release / trigger-drone (push) Successful in 3s
Details

Browse Source
This commit is contained in:
paul
2025-09-09 19:52:02 +02:00
parent 8404125ff0
commit fb16b7bbb8
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/server.js
+8 -3
View File
@@ -222,15 +222,20 @@ app.use('/api/secure-images', secureImagesRoutes);
// Optional: Serve built frontend (native installs) // Optional: Serve built frontend (native installs)
try { try {
const serveFrontend = process.env.SERVE_FRONTEND === 'true'; const serveFrontendEnv = process.env.SERVE_FRONTEND; // 'true' | 'false' | undefined
const frontendDir = process.env.FRONTEND_DIR || path.join(__dirname, '../frontend/dist'); const frontendDir = process.env.FRONTEND_DIR || path.join(__dirname, '../frontend/dist');
if (serveFrontend && fs.existsSync(frontendDir)) { const indexPath = path.join(frontendDir, 'index.html');
// Auto-serve when dist exists unless explicitly disabled
const shouldServe = (serveFrontendEnv === 'true') || ((serveFrontendEnv === undefined || serveFrontendEnv === 'auto') && fs.existsSync(indexPath));
if (shouldServe) {
logger.info(`Serving frontend from ${frontendDir}`); logger.info(`Serving frontend from ${frontendDir}`);
app.use(express.static(frontendDir)); app.use(express.static(frontendDir));
// SPA fallback for non-API routes // SPA fallback for non-API routes
app.get([ '/', '/admin', '/admin/*', '/gallery/*' ], (req, res) => { app.get([ '/', '/admin', '/admin/*', '/gallery/*' ], (req, res) => {
res.sendFile(path.join(frontendDir, 'index.html')); res.sendFile(indexPath);
}); });
} else {
logger.info('Frontend static serving disabled or dist not found', { serveFrontendEnv, frontendDir });
} }
} catch (e) { } catch (e) {
logger.warn('Failed to enable frontend static serving', { error: e.message }); logger.warn('Failed to enable frontend static serving', { error: e.message });