Merge pull request #63 from eviltester/58-move-web-into-apps

web refactoring and packaging

Author: eviltester

.dockerignore

@@ -5,5 +5,4 @@ coverage
 build
 test-results
 tests
-docs-src
 *.log

.eslintignore

@@ -5,4 +5,6 @@ docs-src/build/
 node_modules/
 js/libs/
 packages/core/js/libs/
+apps/web/libs/
+apps/web/dist/
 js/gui_components/data-grid-editor/tabulator/customHeader-tabulator.js

.eslintrc.cjs

@@ -32,7 +32,7 @@ module.exports = {
   },
   overrides: [
     {
-      files: ["tests/**/*.js"],
+      files: ["tests/**/*.js", "apps/web/src/tests/jest/**/*.js"],
       env: {
         jest: true,
         node: true,

.github/workflows/node.js.yml

@@ -83,6 +83,88 @@ jobs:
       - name: Verify
         run: npm run verify:ci
 
+      - name: Docker smoke test (API)
+        run: |
+          set -euo pipefail
+
+          cleanup() {
+            docker rm -f api-ci >/dev/null 2>&1 || true
+          }
+          trap cleanup EXIT
+          api_curl() {
+            if ! curl -fsS "$@"; then
+              echo "API smoke request failed: curl $*"
+              docker logs api-ci || true
+              exit 1
+            fi
+          }
+
+          docker build -f apps/api/Dockerfile -t anywaydata-api-ci .
+          docker run -d --rm --name api-ci -p 18082:3000 anywaydata-api-ci
+
+          ready=0
+          for i in {1..20}; do
+            if curl -fsS http://127.0.0.1:18082/v1/health >/dev/null; then
+              ready=1
+              break
+            fi
+            sleep 1
+          done
+          if [ "$ready" -ne 1 ]; then
+            docker logs api-ci || true
+            echo "API container did not become ready within timeout"
+            exit 1
+          fi
+          api_curl http://127.0.0.1:18082/v1/health | grep -qi "ok"
+          api_curl -X POST "http://127.0.0.1:18082/v1/generate" \
+            -H "content-type: application/json" \
+            -d '{"textSpec":"Name\nBob","rowCount":2,"outputFormat":"json"}' | grep -q '"format":"json"'
+          echo "API docker smoke test passed"
+
+      - name: Docker smoke test (Web)
+        run: |
+          set -euo pipefail
+
+          cleanup() {
+            docker rm -f web-ci >/dev/null 2>&1 || true
+          }
+          trap cleanup EXIT
+
+          docker build -f apps/web/Dockerfile -t anywaydata-web-ci .
+          docker run -d --rm --name web-ci -p 18080:80 anywaydata-web-ci
+
+          for i in {1..20}; do
+            if curl -fsS http://127.0.0.1:18080/app.html >/dev/null; then
+              break
+            fi
+            sleep 1
+          done
+          curl -fsS http://127.0.0.1:18080/app.html | grep -q "AnyWayData"
+          curl -fsS http://127.0.0.1:18080/generator.html | grep -q "AnyWayData"
+          echo "Web docker smoke test passed"
+
+      - name: Docker smoke test (AnyWayData full site)
+        run: |
+          set -euo pipefail
+
+          cleanup() {
+            docker rm -f site-ci >/dev/null 2>&1 || true
+          }
+          trap cleanup EXIT
+
+          docker build -f apps/anywaydata/Dockerfile -t anywaydata-site-ci .
+          docker run -d --rm --name site-ci -p 18081:8080 anywaydata-site-ci
+
+          for i in {1..20}; do
+            if curl -fsS http://127.0.0.1:18081/ >/dev/null; then
+              break
+            fi
+            sleep 1
+          done
+          curl -fsS http://127.0.0.1:18081/ | grep -q "AnyWayData"
+          curl -fsS http://127.0.0.1:18081/app.html | grep -q "AnyWayData"
+          echo "AnyWayData full-site docker smoke test passed"
+
       - name: Upload coverage artifact
         uses: actions/upload-artifact@v4
         with:

README.md

@@ -24,7 +24,13 @@ A simple Data Table Editor that generates Markdown, CSV or JSON. It can also be
 
 The application is live at [AnyWayData.com](https://anywaydata.com)
 
-- Or clone and run locally by opening index.html in a browser after starting a web server in the folder e.g. `python3 -m http.server`
+- Or clone and run locally with Vite:
+- `npm install`
+- `npm run dev:web`
+- open `http://127.0.0.1:4173/app.html` or `http://127.0.0.1:4173/generator.html`
+
+Use `npm run build:web` to create a production build and `npm run preview:web` to preview the built output.
+The old static-server flow (e.g. `python3 -m http.server`) is no longer the recommended local runtime path.
 
 ### Select Grid Engine
 

app.html

@@ -0,0 +1,22 @@
+# syntax=docker/dockerfile:1
+
+FROM node:20-alpine AS builder
+WORKDIR /app
+
+COPY package*.json ./
+COPY docs-src/package*.json ./docs-src/
+COPY apps ./apps
+COPY docs-src ./docs-src
+COPY packages ./packages
+COPY scripts ./scripts
+
+RUN npm ci
+RUN npm ci --prefix docs-src
+RUN npm run anywaydata --prefix docs-src
+RUN npm run build:web
+RUN node ./scripts/merge-web-build-into-docs-build.js
+
+FROM nginxinc/nginx-unprivileged:1.27-alpine
+WORKDIR /usr/share/nginx/html
+
+COPY --from=builder /app/build/ ./

apps/anywaydata/Dockerfile

@@ -0,0 +1,34 @@
+# AnyWayData Full Site Docker Image
+
+This image builds and serves the full `anywaydata.com` experience by combining:
+
+- Docusaurus docs output (`docs-src` -> `build`)
+- Web app production bundle (`apps/web/dist`)
+
+The build process merges both into a single static site and serves it with nginx.
+
+## Build
+
+From the repo root:
+
+```bash
+docker build -f apps/anywaydata/Dockerfile -t anywaydata-site .
+```
+
+## Run
+
+```bash
+docker run --rm -p 8080:8080 anywaydata-site
+```
+
+Then open:
+
+- `http://localhost:8080/`
+- `http://localhost:8080/app.html`
+- `http://localhost:8080/generator.html`
+
+## Notes
+
+- This Dockerfile is separate from `apps/web/Dockerfile`.
+- `apps/web/Dockerfile` serves only the web app.
+- `apps/anywaydata/Dockerfile` serves docs + web app together.

apps/anywaydata/README.md

@@ -13,7 +13,6 @@ ENV NODE_ENV=production
 COPY --from=deps /app/node_modules ./node_modules
 COPY package.json ./package.json
 COPY packages/core ./packages/core
-COPY js ./js
 COPY apps/api ./apps/api
 EXPOSE 3000
 CMD ["node", "apps/api/src/index.js"]

apps/api/Dockerfile

@@ -1,13 +1,17 @@
 # syntax=docker/dockerfile:1
+
+FROM node:20-alpine AS builder
+WORKDIR /app
+
+COPY package*.json ./
+COPY apps ./apps
+COPY packages ./packages
+
+RUN npm ci
+RUN npm run build:web
+
 FROM nginx:1.27-alpine
 WORKDIR /usr/share/nginx/html
 
-# Serve the browser app only (no docs-src / docusaurus build pipeline)
-COPY index.html ./index.html
-COPY app.html ./app.html
-COPY generator.html ./generator.html
-COPY styles.css ./styles.css
-COPY packages/core ./packages/core
-COPY packages/core-ui ./packages/core-ui
-COPY libs ./libs
-COPY images ./images
+# Serve the built browser app only (no docs-src / docusaurus build pipeline)
+COPY --from=builder /app/apps/web/dist/ ./