diff --git a/Dockerfile b/Dockerfile index d5b6796..733a457 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,16 +8,11 @@ COPY tsconfig.json ./ COPY tsconfig.backend.json ./ COPY . . -### NEW ### RUN npm install cors - RUN npm install -g npm@11.2.0 RUN npm install -# Danach server.ts kompilieren, nachdem broker.mjs existiert RUN npx tsc -p tsconfig.backend.json - -# Danach können wir die Frontend-Dateien auch kompilieren RUN npx tsc -p tsconfig.frontend.json # 2. Rust build-Stage @@ -29,25 +24,18 @@ FROM forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/node:20.18.1 WORKDIR /app -# Kopiere Node-Modules und alle generierten Dateien +# Copy node_modules and all generated data COPY --from=build /app/node_modules ./node_modules COPY --from=build /app/dist ./dist COPY --from=build /app/frontend/index.html ./dist/frontend/ COPY --from=build /app/package.json ./dist/backend/ -# Neu: Konfigurationsdatei ins Backend-Verzeichnis -#COPY --from=build /app/backend/config.json ./dist/backend/ - +# Copy iching library COPY --from=rust-build /usr/local/cargo/bin/iching /usr/local/bin/iching -# Falls notwendig: Umbenennen von .js zu .mjs +# Frontend: rename from .js to .mjs RUN find dist/frontend -name "*.js" -exec bash -c 'mv "$0" "${0%.js}.mjs"' {} \; -# Starte den Backend-Server -#CMD ["node", "--loader", "ts-node/esm", "/app/dist/backend/server.js"] -# Starte den Frontend-Server -#CMD ["npx", "http-server", "dist/frontend", "-p", "8080", "--mime", "application/javascript=js"] - COPY start.sh ./start.sh RUN chmod +x ./start.sh diff --git a/backend/broker.test.ts b/backend/broker.test.ts index d3766ab..c4232d1 100644 --- a/backend/broker.test.ts +++ b/backend/broker.test.ts @@ -1,5 +1,5 @@ /*import { html } from "./broker"; -import { test, beforeAll, afterAll } from "@jest/globals"; +import { test } from "@jest/globals"; jest.useFakeTimers(); diff --git a/frontend/event.ts b/frontend/event.ts index 321c88b..4a7a778 100644 --- a/frontend/event.ts +++ b/frontend/event.ts @@ -1,6 +1,5 @@ function handleClick(): void { console.log("Der Button wurde geklickt!"); - //alert("Hallo von TypeScript!"); fetch("/iching/api/command", { method: "POST" }) .then(res => res.text()) diff --git a/jest.config.js b/jest.config.js deleted file mode 100644 index 7ee809b..0000000 --- a/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -"use strict"; -module.exports = { - transform: { - "^.+\\.tsx?$": "ts-jest" - } -}; diff --git a/start.sh b/start.sh index c7274f8..a48ebb0 100644 --- a/start.sh +++ b/start.sh @@ -1,6 +1,5 @@ -#!/bin/bash -# Starte Backend im Hintergrund +# start backend in the background node dist/backend/server.js & -# Starte Frontend +# start frontend npx http-server dist/frontend -p 8080 --cors --mime application/javascript=js \ No newline at end of file