Move screens to lib/screens, version to lib/version, inject version via Vite define; lib is folders-only

8 files changed, 21 insertions, 18 deletions

diff --git a/app/app.d.ts b/app/app.d.ts
index 242ec56..ef194db 100644
--- a/app/app.d.ts
+++ b/app/app.d.ts
@@ -1,7 +1,7 @@
-
 declare global {
-  namespace App {
-  }
+  namespace App {}
+
+  const __APP_VERSION__: string
 }
 
 export {}
diff --git a/lib/components/AppVersion.svelte b/lib/components/AppVersion.svelte
index 315a47b..28554a7 100644
--- a/lib/components/AppVersion.svelte
+++ b/lib/components/AppVersion.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { APP_VERSION } from '@hollowdark/lib/version'
+  import { APP_VERSION } from '@hollowdark/lib/version/version'
 </script>
 
 <p class="app-version">v {APP_VERSION}</p>
diff --git a/lib/components/BeginScreen.svelte b/lib/screens/BeginScreen.svelte
index 5832a42..5832a42 100644
--- a/lib/components/BeginScreen.svelte
+++ b/lib/screens/BeginScreen.svelte
diff --git a/lib/components/InitialLoadScreen.svelte b/lib/screens/InitialLoadScreen.svelte
index 3800715..3800715 100644
--- a/lib/components/InitialLoadScreen.svelte
+++ b/lib/screens/InitialLoadScreen.svelte
diff --git a/lib/version.ts b/lib/version.ts
deleted file mode 100644
index e8322e3..0000000
--- a/lib/version.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import pkg from '@hollowdark/package.json'
-
-const [major, minor] = pkg.version.split('.')
-
-/**
- * The app's version in short display form (`<major>.<minor>`), derived from
- * the `version` field in `package.json`. Displayed in the UI footer.
- */
-export const APP_VERSION: string = `${major}.${minor}`
-
-/** The full semver string from `package.json`. */
-export const APP_VERSION_FULL: string = pkg.version
diff --git a/lib/version/version.ts b/lib/version/version.ts
new file mode 100644
index 0000000..69377b8
--- /dev/null
+++ b/lib/version/version.ts
@@ -0,0 +1,11 @@
+const [major, minor] = __APP_VERSION__.split('.')
+
+/**
+ * The app's version in short display form (`<major>.<minor>`), derived
+ * from the `version` field in `package.json` at build time via Vite's
+ * `define`. Used in the UI footer.
+ */
+export const APP_VERSION: string = `${major}.${minor}`
+
+/** The full semver string from `package.json`. */
+export const APP_VERSION_FULL: string = __APP_VERSION__
diff --git a/routes/+page.svelte b/routes/+page.svelte
index 6ffde47..3153e35 100644
--- a/routes/+page.svelte
+++ b/routes/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount } from 'svelte'
-  import BeginScreen from '@hollowdark/lib/components/BeginScreen.svelte'
-  import InitialLoadScreen from '@hollowdark/lib/components/InitialLoadScreen.svelte'
+  import BeginScreen from '@hollowdark/lib/screens/BeginScreen.svelte'
+  import InitialLoadScreen from '@hollowdark/lib/screens/InitialLoadScreen.svelte'
   import { runStubInitialLoad } from '@hollowdark/loading/stub'
   import { detectBeginState, type BeginState } from '@hollowdark/loading/session'
 
diff --git a/vite.config.ts b/vite.config.ts
index c8915e1..9b97a5d 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,8 +1,12 @@
 import { sveltekit } from '@sveltejs/kit/vite'
 import { defineConfig } from 'vitest/config'
+import pkg from './package.json' with { type: 'json' }
 
 export default defineConfig({
   plugins: [sveltekit()],
+  define: {
+    __APP_VERSION__: JSON.stringify(pkg.version)
+  },
   test: {
     include: ['tests/**/*.{test,spec}.ts', '**/*.{test,spec}.ts'],
     exclude: ['node_modules', '.svelte-kit', 'dist', 'build'],