From a899c5ffcacdc4ae185107dcf3c92873d8879b7e Mon Sep 17 00:00:00 2001 From: Davide Passoni Date: Fri, 6 Dec 2024 17:47:08 +0100 Subject: [PATCH] feat: setup app for static compilation Breaking change!: initDraggablePath disabled because it breaks the app --- frontend/react/src/map/map.ts | 2 +- frontend/react/src/ui/ui.tsx | 5 +++- frontend/react/vite.config.js | 3 ++ frontend/server/.vscode/launch.json | 45 +++++++++++++++++++++++++++++ frontend/server/package.json | 3 +- frontend/server/public/vite.svg | 1 + 6 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 frontend/server/public/vite.svg diff --git a/frontend/react/src/map/map.ts b/frontend/react/src/map/map.ts index a582a05b..044aa4a6 100644 --- a/frontend/react/src/map/map.ts +++ b/frontend/react/src/map/map.ts @@ -66,7 +66,7 @@ import { SmokeMarker } from "./markers/smokemarker"; /* Register the handler for the box selection */ L.Map.addInitHook("addHandler", "boxSelect", BoxSelect); -initDraggablePath(L); +//initDraggablePath(L); // TODO: breaks app when compiled export class Map extends L.Map { /* Options */ diff --git a/frontend/react/src/ui/ui.tsx b/frontend/react/src/ui/ui.tsx index 7cb329d9..c8b28985 100644 --- a/frontend/react/src/ui/ui.tsx +++ b/frontend/react/src/ui/ui.tsx @@ -56,13 +56,16 @@ export function UI() { }); }, []); + useEffect(() => { + setupApp(); + }) + return (
diff --git a/frontend/react/vite.config.js b/frontend/react/vite.config.js index e24eb367..8db2f7df 100644 --- a/frontend/react/vite.config.js +++ b/frontend/react/vite.config.js @@ -7,6 +7,9 @@ export default defineConfig({ base: "/vite", build: { outDir: '../server/public/vite' + },esbuild: { + minifyIdentifiers: false, + keepNames: true, } }); \ No newline at end of file diff --git a/frontend/server/.vscode/launch.json b/frontend/server/.vscode/launch.json index 5be90790..3c8a7300 100644 --- a/frontend/server/.vscode/launch.json +++ b/frontend/server/.vscode/launch.json @@ -50,6 +50,51 @@ ], "restart": true, "preLaunchTask": "demo-server" + }, + { + "type": "node", + "request": "launch", + "name": "Launch Server static Vite (DCS)", + "skipFiles": [ + "/**" + ], + "runtimeExecutable": "nodemon", + "runtimeArgs": [ + "--watch", + "src/**/*.ts", + "--exec", + "node", + "--inspect", + "-r", + "ts-node/register", + "src/www.ts", + "-c", + "${input:enterDir}/Config/olympus.json" + ], + "restart": true + }, + { + "type": "node", + "request": "launch", + "name": "Launch Server static Vite (No DCS)", + "skipFiles": [ + "/**" + ], + "runtimeExecutable": "nodemon", + "runtimeArgs": [ + "--watch", + "src/**/*.ts", + "--exec", + "node", + "--inspect", + "-r", + "ts-node/register", + "src/www.ts", + "-c", + "${input:enterDir}/Config/olympus.json" + ], + "restart": true, + "preLaunchTask": "demo-server" } ], "inputs": [ diff --git a/frontend/server/package.json b/frontend/server/package.json index 25cb38f9..49cf8b1b 100644 --- a/frontend/server/package.json +++ b/frontend/server/package.json @@ -35,6 +35,7 @@ }, "devDependencies": { "ts-node": "^10.9.2", - "typescript": "^5.5.3" + "typescript": "^5.5.3", + "vite": "^6.0.3" } } diff --git a/frontend/server/public/vite.svg b/frontend/server/public/vite.svg new file mode 100644 index 00000000..e7b8dfb1 --- /dev/null +++ b/frontend/server/public/vite.svg @@ -0,0 +1 @@ + \ No newline at end of file