Add generated/ to .gitignore & fixes

.gitignore

@@ -2,6 +2,7 @@
 node_modules/
 .svelte-kit/
 theseus_gui/build/
+theseus_gui/generated/
 WixTools
 .direnv/
 

theseus_gui/.npmrc

@@ -1,2 +1 @@
 engine-strict=true
-strict-peer-dependencies=false

theseus_gui/generated/state.json

@@ -1,7 +0,0 @@
-{
-  "lastGenerated": "2022-08-01T14:34:27.819Z",
-  "options": {
-    "gameVersions": true,
-    "openapi": true
-  }
-}

theseus_gui/pnpm-lock.yaml

@@ -36,20 +36,20 @@ dependencies:
   '@iconify-json/heroicons-solid': 1.1.2
   '@iconify-json/lucide': 1.1.38
   '@tauri-apps/api': 1.0.2
+  highlight.js: 11.5.1
   omorphia: 0.0.67_svelte@3.49.0+vite@3.0.4
   svrollbar: 0.12.0
   unplugin-icons: 0.14.8_vite@3.0.4
 
 devDependencies:
   '@sveltejs/adapter-static': 1.0.0-next.38
-  '@sveltejs/kit': 1.0.0-next.401_svelte@3.49.0+vite@3.0.4
+  '@sveltejs/kit': 1.0.0-next.402_svelte@3.49.0+vite@3.0.4
   '@tauri-apps/cli': 1.0.5
   '@typescript-eslint/eslint-plugin': 5.31.0_4jrpqvszkjcwtaspamifhp3x7e
   '@typescript-eslint/parser': 5.31.0_sgaiclxgc5mltnpgmg7py4v6ca
   eslint: 7.32.0
   eslint-config-prettier: 8.5.0_eslint@7.32.0
   eslint-plugin-svelte3: 3.4.1_k4rvtr32uzrs6rwp57u73ssa6q
-  highlight.js: 11.5.1
   kill-port-process: 3.1.0
   prettier: 2.7.1
   prettier-plugin-svelte: 2.7.0_o3ioganyptcsrh6x4hnxvjkpqi
@@ -992,8 +992,8 @@ packages:
       tiny-glob: 0.2.9
     dev: true
 
-  /@sveltejs/kit/1.0.0-next.401_svelte@3.49.0+vite@3.0.4:
+  /@sveltejs/kit/1.0.0-next.402_svelte@3.49.0+vite@3.0.4:
-    resolution: {integrity: sha512-VrpFtSSu1ADRVWWDxLl218GKf9l+TA7tNCCAmVFAuJdj5zVxPgJflu4Dh1p5C4efKP+x1v6W5nvxmNkbZLPoag==}
+    resolution: {integrity: sha512-F0Mm+bTGOnl+vWKab5uwXsY+5YypC/uveGE0wKyYSE9a/pFQD20WwrvRKePGhUCepiHc7S82jxVZRwjCsToaNQ==}
     engines: {node: '>=16.9'}
     hasBin: true
     requiresBuild: true
@@ -2501,6 +2501,7 @@ packages:
   /highlight.js/11.5.1:
     resolution: {integrity: sha512-LKzHqnxr4CrD2YsNoIf/o5nJ09j4yi/GcH5BnYz9UnVpZdS4ucMgvP61TDty5xJcFGRjnH4DpujkS9bHT3hq0Q==}
     engines: {node: '>=12.0.0'}
+    dev: false
 
   /human-signals/2.1.0:
     resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}

theseus_gui/src-tauri/src/main.rs

@@ -31,7 +31,7 @@ fn main() {
             MenuEntry::Submenu(Submenu::new(
                 &ctx.package_info().name,
                 Menu::with_items([
-                    MenuItem::About(ctx.package_info().name.clone()).into(),
+                    // MenuItem::About(ctx.package_info().name.clone()).into(),
                     MenuItem::Separator.into(),
                     MenuItem::Services.into(),
                     MenuItem::Separator.into(),

theseus_gui/src/routes/__layout.svelte

@@ -1,58 +1,58 @@
-<script lang="ts">
+<script context="module" lang="ts">
-    import '@fontsource/inter'
+  import { init, waitLocale, t, getLocaleFromAcceptLanguageHeader } from 'svelte-intl-precompile';
-    import 'omorphia/styles.postcss'
+  import { registerAll, availableLocales } from '$locales';
-    import '$styles/global.postcss'
+
-    import Sidebar from '$layout/Sidebar.svelte'
+  registerAll();
-    import StatusBar from "$layout/StatusBar.svelte";
+
-    import Page from "$layout/Page.svelte";
+  export const load: import('@sveltejs/kit').Load = async ({ session }) => {
+    init({
+      fallbackLocale: 'en',
+      initialLocale: getLocaleFromAcceptLanguageHeader(session.acceptLanguage, availableLocales)
+    });
+    await waitLocale();
+
+    return {};
+  };
 </script>
 
-<script context="module" lang="ts">
+<script lang="ts">
-    import { init, waitLocale, t, getLocaleFromAcceptLanguageHeader } from 'svelte-intl-precompile'
+  import '@fontsource/inter';
-    import { registerAll, availableLocales } from '$locales'
+  import 'omorphia/styles.postcss';
-
+  import '$styles/global.postcss';
-    registerAll()
+  import Sidebar from '$layout/Sidebar.svelte';
-
+  import StatusBar from '$layout/StatusBar.svelte';
-    export const load: import('@sveltejs/kit').Load = async ({ session }) => {
+  import Page from '$layout/Page.svelte';
-        init({
-            fallbackLocale: 'en',
-            initialLocale: getLocaleFromAcceptLanguageHeader(session.acceptLanguage, availableLocales),
-        })
-        await waitLocale()
-
-        return {}
-    }
 </script>
 
 <div class="app base theme-dark">
-    <Sidebar />
+  <Sidebar />
-    <StatusBar />
+  <StatusBar />
-    <Page>
+  <Page>
-        <slot/>
+    <slot />
-    </Page>
+  </Page>
 </div>
 
 <style lang="postcss">
-    .app {
+  .app {
-        height: 100%;
+    height: 100%;
-        width: 100%;
+    width: 100%;
-        display: grid;
+    display: grid;
-        grid-template-areas:
+    grid-template-areas:
-            "sidebar status-bar"
+      'sidebar status-bar'
-            "sidebar page";
+      'sidebar page';
-        grid-template-rows: 2.5rem 1fr;
+    grid-template-rows: 2.5rem 1fr;
-        grid-template-columns: 14rem 1fr;
+    grid-template-columns: 14rem 1fr;
-    }
+  }
 
-    :global(.page) {
+  :global(.page) {
-        grid-area: page;
+    grid-area: page;
-    }
+  }
 
-    :global(.sidebar) {
+  :global(.sidebar) {
-        grid-area: sidebar;
+    grid-area: sidebar;
-    }
+  }
 
-    :global(.status-bar) {
+  :global(.status-bar) {
-        grid-area: status-bar;
+    grid-area: status-bar;
-    }
+  }
 </style>

theseus_gui/svelte.config.js

@@ -4,17 +4,22 @@ import path from 'path';
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
-    preprocess: [ preprocess ],
+  preprocess: [preprocess],
-    kit: {
+  kit: {
-        adapter: adapter({
+    adapter: adapter({
-            fallback: '200.html',
+      fallback: '200.html'
-        }),
+    }),
 
-        alias: {
+    alias: {
-            $generated: path.resolve('./generated'),
+      $generated: path.resolve('./generated'),
-            $stores: path.resolve('./src/stores'),
+      $stores: path.resolve('./src/stores'),
-        }
+      $assets: path.resolve('./src/assets'),
+      $components: path.resolve('./src/components'),
+      $layout: path.resolve('./src/layout'),
+      $lib: path.resolve('./src/lib'),
+      $styles: path.resolve('./src/styles')
     }
+  }
 };
 
 export default config;

theseus_gui/vite.config.js

@@ -1,39 +1,28 @@
 import { sveltekit } from '@sveltejs/kit/vite';
-import path from "path";
+import path from 'path';
 import { plugins } from 'omorphia/config/vite';
 import precompileIntl from 'svelte-intl-precompile/sveltekit-plugin';
 import { Generator } from 'omorphia/plugins';
 
 /** @type {import('vite').UserConfig} */
 const config = {
-    plugins: [
+  plugins: [
-        sveltekit(),
+    sveltekit(),
-        ...plugins,
+    ...plugins,
-        precompileIntl('locales'),
+    precompileIntl('locales'),
-        Generator({
+    Generator({
-            gameVersions: true,
+      gameVersions: true,
-            openapi: true,
+      openapi: true
-        }),
+    })
-    ],
+  ],
-    optimizeDeps: {
+  optimizeDeps: {
-        include: ["highlight.js/lib/core"],
+    include: ['highlight.js/lib/core']
-    },
+  },
-    resolve: {
+  server: {
-        alias: {
+    fs: {
-            $assets: path.resolve('./src/assets'),
+      allow: ['generated']
-            $components: path.resolve('./src/components'),
+    }
-            $layout: path.resolve('./src/layout'),
+  }
-            $lib: path.resolve('./src/lib'),
-            $stores: path.resolve('./src/stores'),
-            $styles: path.resolve('./src/styles'),
-            $generated: path.resolve('./src/generated'),
-        },
-    },
-    server: {
-        fs: {
-            allow: ['generated'],
-        },
-    },
 };
 
 export default config;