Update ui dependencies

swisstopo · Nov 20, 2024 · 1be08ae · 1be08ae
1 parent f249f05
commit 1be08ae
Show file tree

Hide file tree

Showing 46 changed files with 3,812 additions and 4,661 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +0,0 @@
-package-lock.json -diff

diff --git a/.github/scripts/find-version.js b/.github/scripts/find-version.js
@@ -10,6 +10,7 @@ const findNextVersion = (tags, branch) => {
     if (version.preRelease == null || version.patch !== 0) {
       version.minor += 1;
       version.patch = 0;
+      version.preRelease = null
     }
   } else {
     // It's a patch.

diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,7 @@
 /secrets.txt
 
 # JetBrains IDE files
-/.idea/
+.idea/
 
 # Local Docker volumes
 /volumes/

diff --git a/api/start.sh b/api/start.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/bash
 
 SQLX_VERSION=0.8.2
 if [[ ! -f ~/.cargo/bin/sqlx ]] || [[ $(sqlx --version) != "sqlx-cli $SQLX_VERSION" ]]; then

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -19,20 +19,21 @@ services:
       - .env
 
   ui:
-    image: node:22
+    image: swissgeol-viewer-app/ui:local
+    build:
+      context: ./ui
+      dockerfile: DockerfileDev
     init: true
     ports:
       - "8000:8000"
-    environment:
-      NODE_ENV: development
-    working_dir: /app
-    command: ["sh", "-c", "npm ci && npm run start"]
     depends_on:
       - api
       - abbreviator
     volumes:
-      - ./ui:/app
-      - ui.node_modules:/app/node_modules
+      - ./:/app
+      - ui.node_modules:/app/ui/node_modules
+    tmpfs:
+      - /app/ui/dist
 
   minio:
     image: minio/minio:latest
@@ -84,4 +85,4 @@ volumes:
   db:
   api.cargo:
   api.target:
-  ui.node_modules:
+  ui.node_modules:
diff --git a/ui/.dockerignore b/ui/.dockerignore
@@ -0,0 +1,2 @@
+/node_modules/
+/dist/
diff --git a/ui/.mocharc.json b/ui/.mocharc.json
@@ -1,5 +1,9 @@
 {
-  "spec": "src/test/**/*.ts",
+  "spec": "src/test/**/*.test.ts",
   "extension": ["ts", "js"],
-  "loader": "ts-node/esm"
+  "require": [
+    "ts-node/register/transpile-only",
+    "jsdom-global/register.js",
+    "./src/test/jquery.register.js"
+  ]
 }
diff --git a/ui/DockerfileDev b/ui/DockerfileDev
@@ -0,0 +1,13 @@
+FROM node:22-alpine as build
+
+ENV NODE_ENV=development
+
+RUN apk add --no-cache git bash
+
+WORKDIR /app/ui
+COPY . .
+
+EXPOSE 8000
+
+ENTRYPOINT ["/bin/bash"]
+CMD ["start.sh"]
diff --git a/ui/index.html b/ui/index.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
-<html>
+<html lang="de">
 
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="shortcut icon" type="image/png" href="src/images/swissgeol_favicon_viewer_small.png">
 
-  <link href="bundle.css" rel="stylesheet">
-
   <meta name="description" content="swissgeol.ch is the 3D subsurface viewer of the Swiss Confederation. Geoscientific information below the terrain of Switzerland can be combined with geographic information above terrain.">
   <title>swissgeol</title>
+
+  <link href="index.css" rel="stylesheet">
   <script>window.activeEnvironment="default_active_env"</script>
 </head>
 
@@ -34,15 +34,7 @@
     document.querySelector('#outdated-browser').style.display = '';
     document.querySelector('#loader').style.display = 'none';
   </script>
-  <script type="module">
-    const debug = !location.search.includes('prod') && (location.search.includes('debug') || location.hostname === 'localhost');
-    const script = document.querySelector('#app-script');
-    const l = document.location;
-    const li = l.pathname.lastIndexOf('/');
-    const path = li != -1 ? l.pathname.substring(0, li) : l.pathname;
-    script.src = `${l.origin}${path}/${debug ? 'debug/index.js' : 'index.js'}`;
-  </script>
-  <script type="module" id="app-script" crossorigin="use-credentials"></script>
+  <script type="module" id="app-script" crossorigin="use-credentials" src="index.js"></script>
 </body>
 
 </html>