Update to the newest version of Omorphia

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "theseus_gui/locales"]
+	path = theseus_gui/locales
+	url = https://github.com/modrinth/translations

theseus_gui/generated/gameVersions.json

@@ -0,0 +1 @@
+[{"version":"1.19.1","version_type":"release","date":"2022-07-27T09:25:33Z","major":true},{"version":"1.19.1-rc3","version_type":"snapshot","date":"2022-07-26T15:34:35Z","major":false},{"version":"1.19.1-rc2","version_type":"snapshot","date":"2022-07-21T16:25:50Z","major":false},{"version":"1.19.1-pre6","version_type":"snapshot","date":"2022-07-20T15:49:31Z","major":false},{"version":"1.19.1-pre5","version_type":"snapshot","date":"2022-07-15T11:51:44Z","major":false},{"version":"1.19.1-pre4","version_type":"snapshot","date":"2022-07-08T11:41:59Z","major":false},{"version":"1.19.1-pre3","version_type":"snapshot","date":"2022-07-06T14:50:46Z","major":false},{"version":"1.19.1-pre2","version_type":"snapshot","date":"2022-06-30T15:57:20Z","major":false},{"version":"1.19.1-rc1","version_type":"snapshot","date":"2022-06-23T16:32:41Z","major":false},{"version":"1.19.1-pre1","version_type":"snapshot","date":"2022-06-21T17:13:59Z","major":false},{"version":"22w24a","version_type":"snapshot","date":"2022-06-15T16:21:49Z","major":false},{"version":"1.19","version_type":"release","date":"2022-06-07T09:42:18Z","major":true},{"version":"1.19-rc2","version_type":"snapshot","date":"2022-06-03T11:47:25Z","major":false},{"version":"1.19-rc1","version_type":"snapshot","date":"2022-06-02T12:12:52Z","major":false},{"version":"1.19-pre5","version_type":"snapshot","date":"2022-06-01T10:56:23Z","major":false},{"version":"1.19-pre4","version_type":"snapshot","date":"2022-05-30T14:43:01Z","major":false},{"version":"1.19-pre3","version_type":"snapshot","date":"2022-05-25T09:56:47Z","major":false},{"version":"1.19-pre2","version_type":"snapshot","date":"2022-05-23T14:54:00Z","major":false},{"version":"1.19-pre1","version_type":"snapshot","date":"2022-05-18T13:51:54Z","major":false},{"version":"22w19a","version_type":"snapshot","date":"2022-05-12T15:36:11Z","major":false},{"version":"22w18a","version_type":"snapshot","date":"2022-05-04T14:41:35Z","major":false},{"version":"22w17a","version_type":"snapshot","date":"2022-04-27T15:54:15Z","major":false},{"version":"22w16b","version_type":"snapshot","date":"2022-04-20T17:25:32Z","major":false},{"version":"22w16a","version_type":"snapshot","date":"2022-04-20T14:37:07Z","major":false},{"version":"22w15a","version_type":"snapshot","date":"2022-04-13T15:41:17Z","major":false},{"version":"22w14a","version_type":"snapshot","date":"2022-04-06T13:37:12Z","major":false},{"version":"22w13oneblockatatime","version_type":"snapshot","date":"2022-04-01T11:56:58Z","major":false},{"version":"22w13a","version_type":"snapshot","date":"2022-03-31T14:53:25Z","major":false},{"version":"22w12a","version_type":"snapshot","date":"2022-03-24T16:15:02Z","major":false},{"version":"22w11a","version_type":"snapshot","date":"2022-03-16T15:55:38Z","major":false},{"version":"1.18.2","version_type":"release","date":"2022-02-28T10:42:45Z","major":true},{"version":"1.18.2-rc1","version_type":"snapshot","date":"2022-02-25T13:25:40Z","major":false},{"version":"1.18.2-pre3","version_type":"snapshot","date":"2022-02-23T15:23:12Z","major":false},{"version":"1.18.2-pre2","version_type":"snapshot","date":"2022-02-21T15:26:19Z","major":false},{"version":"1.18.2-pre1","version_type":"snapshot","date":"2022-02-18T16:00:32Z","major":false},{"version":"22w07a","version_type":"snapshot","date":"2022-02-16T16:13:58Z","major":false},{"version":"22w06a","version_type":"snapshot","date":"2022-02-09T16:47:48Z","major":false},{"version":"22w05a","version_type":"snapshot","date":"2022-02-02T16:08:39Z","major":false},{"version":"22w03a","version_type":"snapshot","date":"2022-01-19T16:04:59Z","major":false},{"version":"1.18.1","version_type":"release","date":"2021-12-10T08:23:00Z","major":false},{"version":"1.18.1-rc3","version_type":"snapshot","date":"2021-12-10T03:36:38Z","major":false},{"version":"1.18.1-rc2","version_type":"snapshot","date":"2021-12-08T12:29:36Z","major":false},{"version":"1.18.1-rc1","version_type":"snapshot","date":"2021-12-07T15:52:47Z","major":false},{"version":"1.18.1-pre1","version_type":"snapshot","date":"2021-12-03T13:45:38Z","major":false},{"version":"1.18","version_type":"release","date":"2021-11-30T09:16:29Z","major":false},{"version":"1.18-rc4","version_type":"snapshot","date":"2021-11-29T13:43:42Z","major":false},{"version":"1.18-rc3","version_type":"snapshot","date":"2021-11-26T15:51:56Z","major":false},{"version":"1.18-rc2","version_type":"snapshot","date":"2021-11-26T10:02:04Z","major":false},{"version":"1.18-rc1","version_type":"snapshot","date":"2021-11-25T14:28:49Z","major":false},{"version":"1.18-pre8","version_type":"snapshot","date":"2021-11-24T14:57:32Z","major":false},{"version":"1.18-pre7","version_type":"snapshot","date":"2021-11-23T16:37:41Z","major":false},{"version":"1.18-pre6","version_type":"snapshot","date":"2021-11-22T17:09:05Z","major":false},{"version":"1.18-pre5","version_type":"snapshot","date":"2021-11-19T15:47:09Z","major":false},{"version":"1.18-pre4","version_type":"snapshot","date":Line truncated

theseus_gui/generated/state.json

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

theseus_gui/package.json

@@ -24,6 +24,7 @@
     "prettier-plugin-svelte": "^2.5.0",
     "svelte": "^3.46.0",
     "svelte-check": "^2.2.6",
+    "svelte-intl-precompile": "^0.11.1",
     "tslib": "^2.3.1",
     "typescript": "~4.5.4",
     "vite": "^3.0.0"
@@ -35,9 +36,10 @@
     "@iconify-json/heroicons-outline": "^1.1.1",
     "@iconify-json/heroicons-solid": "^1.1.1",
     "@iconify-json/lucide": "^1.1.5",
-    "@tauri-apps/api": "^1.0.0-rc.1",
-    "omorphia": "0.0.17",
-    "svrollbar": "^0.10.4",
-    "unplugin-icons": "^0.14.7"
+    "@tauri-apps/api": "^1.0.2",
+    "omorphia": "0.0.67",
+    "svrollbar": "^0.12.0",
+    "unplugin-icons": "^0.14.7",
+    "highlight.js": "11.5.1"
   }
 }

theseus_gui/postcss.config.cjs

@@ -1 +1 @@
-module.exports = require('omorphia/config/postcss.config.cjs')
+module.exports = require('omorphia/config/postcss.cjs')

theseus_gui/src-tauri/src/main.rs

@@ -9,7 +9,7 @@ use tauri::{
 };
 
 fn main() {
-    let ctx = tauri::generate_context!();
+    let ctx = tauri::generate_context!(); // Run `pnpm build:web` (builds the web app) to get rid of the error.
 
     tauri::Builder::default()
         .invoke_handler(tauri::generate_handler![])

theseus_gui/src/app.html

@@ -3,9 +3,12 @@
 	<head>
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<link rel="preload" href="/fonts/InterRegular.woff2" as="font" type="font/woff2" crossorigin>
+		<link rel="preload" href="/fonts/InterBold.woff2" as="font" type="font/woff2" crossorigin>
+		<link rel="preload" href="/fonts/InterSemiBold.woff2" as="font" type="font/woff2" crossorigin>
 		%sveltekit.head%
 	</head>
-	<body style="background-color: hsl(220, 13%, 15%)">
+	<body class="base theme-dark" style="background-color: hsl(220, 13%, 15%)">
 		%sveltekit.body%
 	</body>
 </html>

theseus_gui/src/components/GlobalSettings.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { FormField, Slider, TextInput, Button } from "omorphia"
+    import { Field, Slider, TextInput, Button } from "omorphia"
     import TitledSection from "$components/TitledSection.svelte"
     import WindowSettings from "$components/WindowSettings.svelte"
 
@@ -8,50 +8,50 @@
 
 <div class="section">
     <TitledSection title="Downloads">
-        <FormField label="Max concurrent downloads">
+        <Field label="Max concurrent downloads">
             <Slider min=1 max=64 bind:value={maxConcurrentDownloads} />
-        </FormField>
+        </Field>
     </TitledSection>
     <TitledSection title="Override game resolution" toggleable=true>
         <WindowSettings />
     </TitledSection>
     <TitledSection title="Profile hooks">
-        <FormField label="Pre-launch">
+        <Field label="Pre-launch">
             <TextInput />
-        </FormField>
-        <FormField label="Wrapper">
+        </Field>
+        <Field label="Wrapper">
             <TextInput />
-        </FormField>
-        <FormField label="Post-exit">
+        </Field>
+        <Field label="Post-exit">
             <TextInput />
-        </FormField>
+        </Field>
     </TitledSection>
     <TitledSection title="Java">
-        <FormField label="Java 8 installation">
+        <Field label="Java 8 installation">
             <TextInput placeholder="/Library/Java/JavaVirtualMachines/zulu-8.jdk/Contents/Home" />
             <div class="button-group">
                 <Button>Auto-detect</Button>
                 <Button>Browse installations</Button>
                 <Button>Test</Button>
             </div>
-        </FormField>
-        <FormField label="Java 17 installation">
+        </Field>
+        <Field label="Java 17 installation">
             <TextInput placeholder="/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home" />
             <div class="button-group">
                 <Button>Auto-detect</Button>
                 <Button>Browse installations</Button>
                 <Button>Test</Button>
             </div>
-        </FormField>
-        <FormField label="Minimum memory allocatted (in MB)">
+        </Field>
+        <Field label="Minimum memory allocatted (in MB)">
             <TextInput />
-        </FormField>
-        <FormField label="Maximum memory allocatted (in MB)">
+        </Field>
+        <Field label="Maximum memory allocatted (in MB)">
             <TextInput value="2048" />
-        </FormField>
-        <FormField label="Arguments">
+        </Field>
+        <Field label="Arguments">
             <TextInput/>
-        </FormField>
+        </Field>
     </TitledSection>
 </div>
 

theseus_gui/src/components/WindowSettings.svelte

@@ -1,14 +1,14 @@
 <script lang="ts">
-    import { FormField, TextInput } from "omorphia"
+    import { Field, TextInput } from "omorphia"
 </script>
 
 <div class="section">
-    <FormField label="Window width">
+    <Field label="Window width">
         <TextInput />
-    </FormField>
-    <FormField label="Window height">
+    </Field>
+    <Field label="Window height">
         <TextInput />
-    </FormField>
+    </Field>
 </div>
 
 <style lang="postcss">

theseus_gui/src/routes/__layout.svelte

@@ -7,6 +7,23 @@
     import Page from "$layout/Page.svelte";
 </script>
 
+<script context="module" lang="ts">
+    import { init, waitLocale, t, getLocaleFromAcceptLanguageHeader } from 'svelte-intl-precompile'
+    import { registerAll, availableLocales } from '$locales'
+
+    registerAll()
+
+    export const load: import('@sveltejs/kit').Load = async ({ session }) => {
+        init({
+            fallbackLocale: 'en',
+            initialLocale: getLocaleFromAcceptLanguageHeader(session.acceptLanguage, availableLocales),
+        })
+        await waitLocale()
+
+        return {}
+    }
+</script>
+
 <div class="app base theme-dark">
     <Sidebar />
     <StatusBar />

theseus_gui/src/routes/library/instance/[id]/settings.svelte

@@ -3,7 +3,6 @@
 </script>
 
 <script lang="ts">
-    import { Checkbox, FormField, TextInput, Button } from "omorphia"
     import GlobalSettings from "$components/GlobalSettings.svelte"
     import TitledSection from "$components/TitledSection.svelte"
 

theseus_gui/src/routes/settings.svelte

@@ -3,7 +3,6 @@
 </script>
 
 <script lang="ts">
-    import { Checkbox, FormField, TextInput, Button } from "omorphia"
     import GlobalSettings from "$components/GlobalSettings.svelte"
 </script>
 

theseus_gui/src/stores/account.ts

@@ -0,0 +1,3 @@
+import { writable } from 'svelte/store'
+
+export const token = writable('')

theseus_gui/svelte.config.js

@@ -1,13 +1,19 @@
 import adapter from '@sveltejs/adapter-static';
-import { preprocess } from 'omorphia/config/svelte.config'
+import { preprocess } from 'omorphia/config/svelte';
+import path from 'path';
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
-    preprocess,
+    preprocess: [ preprocess ],
     kit: {
         adapter: adapter({
             fallback: '200.html',
-        })
+        }),
+
+        alias: {
+            $generated: path.resolve('./generated'),
+            $stores: path.resolve('./src/stores'),
+        }
     }
 };
 

theseus_gui/vite.config.js

@@ -1,13 +1,23 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import path from "path";
-import { plugins } from 'omorphia/config/svelte.config'
+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: [
         sveltekit(),
-        ...plugins
+        ...plugins,
+        precompileIntl('locales'),
+        Generator({
+            gameVersions: true,
+            openapi: true,
+        }),
     ],
+    optimizeDeps: {
+        include: ["highlight.js/lib/core"],
+    },
     resolve: {
         alias: {
             $assets: path.resolve('./src/assets'),
@@ -19,6 +29,11 @@ const config = {
             $generated: path.resolve('./src/generated'),
         },
     },
+    server: {
+        fs: {
+            allow: ['generated'],
+        },
+    },
 };
 
 export default config;