build(webui): finish webui SPA build config

2024-01-26 22:02:37 +01:00 · 2024-01-26 22:02:37 +01:00 · c0daf59d46
parent f1b3f84ee3
commit c0daf59d46
5 changed files with 19 additions and 39 deletions
--- a/webui/.gitignore
+++ b/webui/.gitignore
@ -1,6 +1,6 @@
 .DS_Store
 node_modules
-/build
+/dist
 /.svelte-kit
 /package
 .env
--- a/webui/package.json
+++ b/webui/package.json
@ -33,6 +33,7 @@
 	"dependencies": {
 		"@ibm/plex": "^6.3.0",
 		"@recogito/annotorious": "^2.7.11",
+		"@sveltejs/adapter-static": "^3.0.1",
 		"@types/d3": "^7.4.3",
 		"@types/debug": "^4.1.12",
 		"@types/dompurify": "^3.0.5",
--- a/webui/pnpm-lock.yaml
+++ b/webui/pnpm-lock.yaml
@ -11,6 +11,9 @@ dependencies:
  '@recogito/annotorious':
    specifier: ^2.7.11
    version: 2.7.12(react-dom@16.14.0)(react@16.14.0)
+  '@sveltejs/adapter-static':
+    specifier: ^3.0.1
+    version: 3.0.1(@sveltejs/kit@2.4.1)
  '@types/d3':
    specifier: ^7.4.3
    version: 7.4.3
@ -601,7 +604,6 @@ packages:

  /@polka/url@1.0.0-next.24:
    resolution: {integrity: sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==}
-    dev: true

  /@recogito/annotorious@2.7.12(react-dom@16.14.0)(react@16.14.0):
    resolution: {integrity: sha512-cnlbT4Y/Q8P2EAhhMCib24M9UaHSJB7R5cZLpBMpApXtTqCqMH+sL7W0S9xB8MuDPz96LskQEaYalTl7h8ZNpg==}
@ -734,6 +736,14 @@ packages:
      import-meta-resolve: 4.0.0
    dev: true

+  /@sveltejs/adapter-static@3.0.1(@sveltejs/kit@2.4.1):
+    resolution: {integrity: sha512-6lMvf7xYEJ+oGeR5L8DFJJrowkefTK6ZgA4JiMqoClMkKq0s6yvsd3FZfCFvX1fQ0tpCD7fkuRVHsnUVgsHyNg==}
+    peerDependencies:
+      '@sveltejs/kit': ^2.0.0
+    dependencies:
+      '@sveltejs/kit': 2.4.1(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.9)(vite@5.0.12)
+    dev: false
+
  /@sveltejs/kit@2.4.1(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.9)(vite@5.0.12):
    resolution: {integrity: sha512-NnDrPOmTjzhgWkwJNPcth3vBMWQmI/QhwbMRXow1p/RkM+17HxP2yQR3GYwIK83rkYSKwQiweyBVWGOjJY4gsg==}
    engines: {node: '>=18.13'}
@ -759,7 +769,6 @@ packages:
      svelte: 4.2.9
      tiny-glob: 0.2.9
      vite: 5.0.12(@types/node@18.19.8)(sass@1.69.0)
-    dev: true

  /@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.9)(vite@5.0.12):
    resolution: {integrity: sha512-gjr9ZFg1BSlIpfZ4PRewigrvYmHWbDrq2uvvPB1AmTWKuM+dI1JXQSUu2pIrYLb/QncyiIGkFDFKTwJ0XqQZZg==}
@ -775,7 +784,6 @@ packages:
      vite: 5.0.12(@types/node@18.19.8)(sass@1.69.0)
    transitivePeerDependencies:
      - supports-color
-    dev: true

  /@sveltejs/vite-plugin-svelte@3.0.1(svelte@4.2.9)(vite@5.0.12):
    resolution: {integrity: sha512-CGURX6Ps+TkOovK6xV+Y2rn8JKa8ZPUHPZ/NKgCxAmgBrXReavzFl8aOSCj3kQ1xqT7yGJj53hjcV/gqwDAaWA==}
@ -795,11 +803,9 @@ packages:
      vitefu: 0.2.5(vite@5.0.12)
    transitivePeerDependencies:
      - supports-color
-    dev: true

  /@types/cookie@0.6.0:
    resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==}
-    dev: true

  /@types/d3-array@3.2.1:
    resolution: {integrity: sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==}
@ -1480,7 +1486,6 @@ packages:
  /cookie@0.6.0:
    resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==}
    engines: {node: '>= 0.6'}
-    dev: true

  /core-js@3.33.0:
    resolution: {integrity: sha512-HoZr92+ZjFEKar5HS6MC776gYslNOKHt75mEBKWKnPeFDpZ6nH5OeF3S6HFT1mUAUZKrzkez05VboaX8myjSuw==}
@ -1797,7 +1802,6 @@ packages:
  /deepmerge@4.3.1:
    resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
    engines: {node: '>=0.10.0'}
-    dev: true

  /define-data-property@1.1.0:
    resolution: {integrity: sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==}
@ -1859,7 +1863,6 @@ packages:

  /devalue@4.3.2:
    resolution: {integrity: sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==}
-    dev: true

  /dir-glob@3.0.1:
    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
@ -2111,7 +2114,6 @@ packages:

  /esm-env@1.0.0:
    resolution: {integrity: sha512-Cf6VksWPsTuW01vU9Mk/3vRue91Zevka5SjyNf3nEpokFRuqt/KjUQoGAwq9qMmhpLTHmXzSIrFRw8zxWzmFBA==}
-    dev: true

  /espree@9.6.1:
    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
@ -2330,7 +2332,6 @@ packages:

  /globalyzer@0.1.0:
    resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
-    dev: true

  /globby@11.1.0:
    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
@ -2346,7 +2347,6 @@ packages:

  /globrex@0.1.2:
    resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
-    dev: true

  /gopd@1.0.1:
    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
@ -2460,7 +2460,6 @@ packages:

  /import-meta-resolve@4.0.0:
    resolution: {integrity: sha512-okYUR7ZQPH+efeuMJGlq4f8ubUgO50kByRPyt/Cy1Io4PSRsPjxME+YlVaCOx+NIToW7hCsZNFJyTPFFKepRSA==}
-    dev: true

  /imurmurhash@0.1.4:
    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
@ -2762,7 +2761,6 @@ packages:
    engines: {node: '>=12'}
    dependencies:
      '@jridgewell/sourcemap-codec': 1.4.15
-    dev: true

  /marked@4.3.0:
    resolution: {integrity: sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==}
@ -2844,7 +2842,6 @@ packages:
  /mrmime@2.0.0:
    resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==}
    engines: {node: '>=10'}
-    dev: true

  /ms@2.1.2:
    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
@ -3406,7 +3403,6 @@ packages:

  /set-cookie-parser@2.6.0:
    resolution: {integrity: sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==}
-    dev: true

  /set-function-name@2.0.1:
    resolution: {integrity: sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==}
@ -3468,7 +3464,6 @@ packages:
      '@polka/url': 1.0.0-next.24
      mrmime: 2.0.0
      totalist: 3.0.1
-    dev: true

  /slash@3.0.0:
    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
@ -3621,7 +3616,6 @@ packages:
      svelte: ^3.19.0 || ^4.0.0
    dependencies:
      svelte: 4.2.9
-    dev: true

  /svelte-i18next@1.2.2(i18next@22.5.1)(svelte@4.2.9):
    resolution: {integrity: sha512-a5eNuDpxAD6TO0s7jlWuFjOYvT4kggbkXpcZCHBeNnWMHj+sNELQdrVsvubD2hLr8WC7OoF0pDfU/IuuvZp7OQ==}
@ -3735,7 +3729,6 @@ packages:
    dependencies:
      globalyzer: 0.1.0
      globrex: 0.1.2
-    dev: true

  /tiny-invariant@1.3.1:
    resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}
@ -3928,7 +3921,6 @@ packages:
        optional: true
    dependencies:
      vite: 5.0.12(@types/node@18.19.8)(sass@1.69.0)
-    dev: true

  /warning@4.0.3:
    resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==}
--- a/webui/svelte.config.js
+++ b/webui/svelte.config.js
@ -1,4 +1,4 @@
-import adapter from '@sveltejs/adapter-auto';
+import adapter from '@sveltejs/adapter-static';
 import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';

 /** @type {import('@sveltejs/kit').Config} */
@ -11,7 +11,10 @@ const config = {
 		// adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
 		// If your environment is not supported or you settled on a specific environment, switch out the adapter.
 		// See https://kit.svelte.dev/docs/adapters for more information about adapters.
-		adapter: adapter()
+		adapter: adapter({
+			pages: 'dist',
+			fallback: 'index.html'
+		})
 	}
 };

--- a/webui/vite.config.ts
+++ b/webui/vite.config.ts
@ -1,25 +1,9 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import { defineConfig } from 'vite';
-import { viteStaticCopy } from 'vite-plugin-static-copy';
-import * as path from 'path';

 // https://vitejs.dev/config/
 export default defineConfig({
-	plugins: [
-		sveltekit(),
-		viteStaticCopy({
-			targets: [
-				{
-					src: path.join(__dirname, 'node_modules/boxicons', 'fonts'),
-					dest: path.resolve(__dirname, 'dist/vendor/boxicons')
-				},
-				{
-					src: path.join(__dirname, 'node_modules/boxicons', 'css'),
-					dest: path.resolve(__dirname, 'dist/vendor/boxicons')
-				}
-			]
-		})
-	],
+	plugins: [sveltekit()],
 	server: {
 		proxy: {
 			'/api': {