mv web (#130)

Author: p-hoffmann

.github/workflows/plugin-ci.yml

@@ -77,6 +77,7 @@ jobs:
           - PKGPATH: ./plugins/bao
             RUNNER: ubuntu-24.04
           - PKGPATH: ./plugins/docs
+          - PKGPATH: ./plugins/web
           - PKGPATH: ./plugins/runtime
 
     runs-on: ${{ matrix.RUNNER || needs.pick_runner.outputs.random_runner }}

core/server/index.ts

@@ -545,26 +545,8 @@ try {
   console.log("Serving Shinylive assets from shinylive/");
 } catch { /* shinylive assets not present — skip */ }
 
-try {
-  const schemaDir = Deno.env.get("SCHEMA_DIR");
-  const coreRoot = schemaDir ? join(schemaDir, "..") : join(Deno.cwd(), "core");
-  const webDistPath = join(coreRoot, "web", "dist");
-  await Deno.stat(webDistPath);
-  const serveStatic = (await import("express")).default.static;
-  app.use(BASE_PATH, serveStatic(webDistPath));
-  app.get(`${BASE_PATH}/*`, (_req, res, next) => {
-    if (_req.path.startsWith(`${BASE_PATH}/api/`) || _req.path.startsWith(`${BASE_PATH}/graphql`) || _req.path.startsWith(`${BASE_PATH}/graphiql`) || _req.path.startsWith(`${BASE_PATH}/_internal`)) {
-      return next();
-    }
-    res.sendFile(join(webDistPath, "index.html"));
-  });
-  console.log("Serving static files from core/web/dist/");
-} catch (e) {
-  console.warn("Static file serving disabled:", e);
-}
-
 app.get("/", (_req, res) => {
-  res.redirect(`${BASE_PATH}/`);
+  res.redirect("/plugins/trex/web/");
 });
 
 await initAuthFromDB();

core/server/plugin/ui.ts

@@ -1,4 +1,5 @@
 import type { Express } from "express";
+import { join } from "jsr:@std/path@^1.0";
 import { PLUGINS_BASE_PATH } from "../config.ts";
 import { scopeUrlPrefix } from "./utils.ts";
 
@@ -14,21 +15,35 @@ export function getPluginsJson(): string {
   return pluginsJson;
 }
 
-export function addPlugin(_app: Express, value: any, dir: string, fullName: string = "") {
+export function addPlugin(app: Express, value: any, dir: string, fullName: string = "") {
   const scopePrefix = scopeUrlPrefix(fullName);
   if (value.routes) {
     for (const r of value.routes) {
       const urlPrefix = r.path || r.source;
       const fsPath = `${dir}/${r.dir || r.target}`;
       const fullPrefix = `${PLUGINS_BASE_PATH}${scopePrefix}${urlPrefix}`;
       console.log(`Registering static route: ${fullPrefix} -> ${fsPath}`);
-      REGISTERED_UI_ROUTES.push({ pluginName: name, urlPrefix: fullPrefix, fsPath });
+      REGISTERED_UI_ROUTES.push({ pluginName: fullName, urlPrefix: fullPrefix, fsPath });
       try {
         // deno-lint-ignore no-explicit-any
         (Deno as any).core.ops.op_register_static_route(fullPrefix, fsPath);
       } catch (e) {
         console.error(`Failed to register static route ${fullPrefix}: ${e}`);
       }
+
+      // SPA fallback: serve index.html for non-file paths
+      if (r.spa) {
+        const indexPath = join(fsPath, "index.html");
+        try {
+          const html = Deno.readTextFileSync(indexPath);
+          app.use(fullPrefix, (_req, res) => {
+            res.type("html").send(html);
+          });
+          console.log(`Registered SPA fallback: ${fullPrefix}/* -> ${indexPath}`);
+        } catch {
+          console.warn(`SPA fallback skipped (index.html not found): ${indexPath}`);
+        }
+      }
     }
   }
 

core/web/src/lib/config.ts

@@ -30,6 +30,7 @@ services:
       - ./functions:/usr/src/functions
       - ./plugins-dev:/usr/src/plugins-dev
       - ./plugins/docs:/usr/src/plugins/@trex/docs
+      - ./plugins/web/dist:/usr/src/plugins/@trex/web/dist
     depends_on:
       postgres:
         condition: service_healthy

docker-compose.yml

@@ -16,6 +16,7 @@
     "@trex/pgwire": "latest",
     "@trex/tpm": "latest",
     "@trex/docs": "latest",
-    "@trex/transform": "latest"
+    "@trex/transform": "latest",
+    "@trex/web": "latest"
   }
 }