Serve frontend from root path

gildesmarais · gildesmarais · commit 0d6284b26561 · 2026-03-15T21:07:27.000+01:00
diff --git a/.dockerignore b/.dockerignore
@@ -20,3 +20,6 @@ renovate.json
 spec/
 tmp/
 work/
+public/assets/
+public/frontend/
+public/index.html
diff --git a/.gitignore b/.gitignore
@@ -38,6 +38,8 @@
 
 # Ignore frontend build output and tooling caches
 /frontend/dist/
+/public/assets/
+/public/index.html
 /frontend/node_modules/
 /public/frontend
 /frontend/playwright-report/
diff --git a/Dockerfile b/Dockerfile
@@ -93,6 +93,7 @@ COPY --chown=$USER:$USER Gemfile Gemfile.lock app.rb config.ru ./
 COPY --chown=$USER:$USER app ./app
 COPY --chown=$USER:$USER config ./config
 COPY --chown=$USER:$USER public ./public
-COPY --from=frontend-builder --chown=$USER:$USER /app/public/frontend ./public/frontend
+COPY --from=frontend-builder --chown=$USER:$USER /app/public/index.html ./public/index.html
+COPY --from=frontend-builder --chown=$USER:$USER /app/public/assets ./public/assets
 
 CMD ["bundle", "exec", "puma", "-C", "./config/puma.rb"]
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ html2rss-web converts arbitrary websites into RSS 2.0 feeds with a slim Ruby bac
 ## Architecture
 
 - **Backend:** Ruby + Roda, backed by the `html2rss` gem for extraction.
-- **Frontend:** Preact app built with Vite into `public/frontend`.
+- **Frontend:** Preact app built with Vite into `public/`.
 - **Distribution:** Docker Compose by default; other deployments require manual wiring.
 - [Project notes](docs/README.md)
 
@@ -101,7 +101,7 @@ The OpenAPI file is generated from Ruby request specs only.
 | Command                 | Purpose                                      |
 | ----------------------- | -------------------------------------------- |
 | `npm run dev`           | Vite dev server with hot reload (port 4001). |
-| `npm run build`         | Build static assets into `public/frontend`.  |
+| `npm run build`         | Build static assets into `public/`.          |
 | `npm run test:run`      | Unit tests (Vitest).                         |
 | `npm run test:contract` | Contract tests with MSW.                     |
 
diff --git a/app.rb b/app.rb
@@ -100,7 +100,7 @@ def development? = self.class.development?
       private
 
       def render_index_page(router)
-        index_path = 'public/frontend/index.html'
+        index_path = 'public/index.html'
         router.response['Content-Type'] = 'text/html'
         File.exist?(index_path) ? File.read(index_path) : FALLBACK_HTML
       end
diff --git a/docs/README.md b/docs/README.md
@@ -9,7 +9,7 @@ The only other file that belongs in `docs/` is the generated OpenAPI contract at
 ## System Snapshot
 
 - Backend: Ruby + Roda under the `Html2rss::Web` namespace.
-- Frontend: Preact + Vite, built into `public/frontend`.
+- Frontend: Preact + Vite, built into `public/`.
 - Feed extraction: delegated to the `html2rss` gem.
 - Distribution: Docker Compose / Dev Container first.
 
diff --git a/frontend/index.html b/frontend/index.html
@@ -8,10 +8,7 @@
       name="description"
       content="html2rss converts fixed demo pages or operator-submitted URLs into feed endpoints."
     />
-    <link
-      rel="icon"
-      href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'%3E%3Crect width='64' height='64' rx='10' fill='%230b0c0d'/%3E%3Cpath d='M14 20h36v6H14zm0 12h25v6H14zm0 12h16v6H14z' fill='%23f3f4f6'/%3E%3C/svg%3E"
-    />
+    <link rel="icon" href="/favicon.ico" />
     <title>html2rss</title>
   </head>
   <body>
diff --git a/frontend/src/__tests__/App.test.tsx b/frontend/src/__tests__/App.test.tsx
@@ -272,13 +272,13 @@ describe('App', () => {
     });
   });
 
-  it('builds a bookmarklet that returns to the current frontend entry', () => {
-    window.history.replaceState({}, '', 'http://localhost:3000/frontend/index.html');
+  it('builds a bookmarklet that returns to the root app entry', () => {
+    window.history.replaceState({}, '', 'http://localhost:3000/');
     render(<App />);
 
     fireEvent.click(screen.getByRole('button', { name: 'More' }));
     const bookmarklet = screen.getByRole('link', { name: 'Bookmarklet' });
-    expect(bookmarklet.getAttribute('href')).toContain('/frontend/index.html?url=');
+    expect(bookmarklet.getAttribute('href')).toContain('/?url=');
     expect(bookmarklet.getAttribute('href')).not.toContain('%27+encodeURIComponent');
   });
 });
diff --git a/frontend/src/components/Bookmarklet.tsx b/frontend/src/components/Bookmarklet.tsx
@@ -6,8 +6,7 @@ export function Bookmarklet() {
     appUrl.search = '';
     appUrl.hash = '';
 
-    const targetPath = appUrl.pathname.endsWith('/frontend/index.html') ? appUrl.pathname : '/';
-    const targetPrefix = `${appUrl.origin}${targetPath}?url=`;
+    const targetPrefix = `${appUrl.origin}/?url=`;
 
     return `javascript:window.location.href=${JSON.stringify(targetPrefix)}+encodeURIComponent(window.location.href);`;
   })();
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from 'vite';
 import preact from '@preact/preset-vite';
 
 export default defineConfig({
+  base: '/',
   plugins: [preact()],
   server: {
     host: true,
@@ -19,7 +20,7 @@ export default defineConfig({
     exclude: ['msw/node'],
   },
   build: {
-    outDir: '../public/frontend',
-    emptyOutDir: true,
+    outDir: '../public',
+    emptyOutDir: false,
   },
 });
diff --git a/spec/html2rss/web/app_spec.rb b/spec/html2rss/web/app_spec.rb
@@ -90,6 +90,12 @@ def app = described_class
       expect(last_response.headers['Strict-Transport-Security']).to include('max-age=31536000')
     end
 
+    it 'does not serve the removed legacy frontend entrypoint' do
+      get '/frontend/index.html'
+
+      expect(last_response.status).to eq(404)
+    end
+
     it 'serves static feed routes with caching headers' do
       stub_static_feed
 
