From da1095c29a5377f7c3b4a91affb4cf176f6e7640 Mon Sep 17 00:00:00 2001
From: Bobby <bobbyskhs@gmail.com>
Date: Wed, 22 Apr 2026 08:14:32 +0530
Subject: Move screens to lib/screens, version to lib/version, inject version
 via Vite define; lib is folders-only

---
 app/app.d.ts                            |  6 ++--
 lib/components/AppVersion.svelte        |  2 +-
 lib/components/BeginScreen.svelte       | 48 ----------------------------
 lib/components/InitialLoadScreen.svelte | 56 ---------------------------------
 lib/screens/BeginScreen.svelte          | 48 ++++++++++++++++++++++++++++
 lib/screens/InitialLoadScreen.svelte    | 56 +++++++++++++++++++++++++++++++++
 lib/version.ts                          | 12 -------
 lib/version/version.ts                  | 11 +++++++
 routes/+page.svelte                     |  4 +--
 vite.config.ts                          |  4 +++
 10 files changed, 125 insertions(+), 122 deletions(-)
 delete mode 100644 lib/components/BeginScreen.svelte
 delete mode 100644 lib/components/InitialLoadScreen.svelte
 create mode 100644 lib/screens/BeginScreen.svelte
 create mode 100644 lib/screens/InitialLoadScreen.svelte
 delete mode 100644 lib/version.ts
 create mode 100644 lib/version/version.ts

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/components/BeginScreen.svelte
deleted file mode 100644
index 5832a42..0000000
--- a/lib/components/BeginScreen.svelte
+++ /dev/null
@@ -1,48 +0,0 @@
-<script lang="ts">
-  import AppTitle from '@hollowdark/lib/components/AppTitle.svelte'
-  import AppVersion from '@hollowdark/lib/components/AppVersion.svelte'
-  import BeginActions from '@hollowdark/lib/components/BeginActions.svelte'
-  import type { BeginState } from '@hollowdark/loading/session'
-
-  interface Props {
-    state: BeginState
-    onBegin: () => void
-    onContinue?: () => void
-    onSettings: () => void
-    onCredits: () => void
-  }
-
-  let {
-    state,
-    onBegin,
-    onContinue,
-    onSettings,
-    onCredits
-  }: Props = $props()
-</script>
-
-<section class="begin">
-  <div class="top">
-    <AppTitle size={38} subtitle="A Literary Life Simulation" />
-  </div>
-
-  <BeginActions {state} {onBegin} {onContinue} {onSettings} {onCredits} />
-
-  <AppVersion />
-</section>
-
-<style>
-  .begin {
-    min-height: 100dvh;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: var(--space-12);
-    position: relative;
-  }
-
-  .top {
-    margin-bottom: 120px;
-  }
-</style>
diff --git a/lib/components/InitialLoadScreen.svelte b/lib/components/InitialLoadScreen.svelte
deleted file mode 100644
index 3800715..0000000
--- a/lib/components/InitialLoadScreen.svelte
+++ /dev/null
@@ -1,56 +0,0 @@
-<script lang="ts">
-  import AppTitle from '@hollowdark/lib/components/AppTitle.svelte'
-  import ProgressBar from '@hollowdark/lib/components/ProgressBar.svelte'
-  import { loadingProgress } from '@hollowdark/loading/progress'
-
-  const progress = $derived($loadingProgress)
-</script>
-
-<section class="initial-load">
-  <div class="top">
-    <AppTitle size={32} letterSpacing={1} />
-  </div>
-
-  <div class="bar">
-    <ProgressBar value={progress.percentage} />
-  </div>
-
-  <p class="message">{progress.currentMessage}</p>
-  <p class="note">This will happen once. It will not happen again.</p>
-</section>
-
-<style>
-  .initial-load {
-    min-height: 100dvh;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: var(--space-12);
-    text-align: center;
-  }
-
-  .top {
-    margin-bottom: 120px;
-  }
-
-  .bar {
-    margin-bottom: var(--space-6);
-  }
-
-  .message {
-    font-family: var(--font-ui);
-    font-size: 12px;
-    color: var(--color-text-secondary);
-    letter-spacing: 0.5px;
-    margin: 0 0 var(--space-2);
-  }
-
-  .note {
-    font-family: var(--font-ui);
-    font-size: 11px;
-    color: var(--color-text-tertiary);
-    letter-spacing: 0.3px;
-    margin: 0;
-  }
-</style>
diff --git a/lib/screens/BeginScreen.svelte b/lib/screens/BeginScreen.svelte
new file mode 100644
index 0000000..5832a42
--- /dev/null
+++ b/lib/screens/BeginScreen.svelte
@@ -0,0 +1,48 @@
+<script lang="ts">
+  import AppTitle from '@hollowdark/lib/components/AppTitle.svelte'
+  import AppVersion from '@hollowdark/lib/components/AppVersion.svelte'
+  import BeginActions from '@hollowdark/lib/components/BeginActions.svelte'
+  import type { BeginState } from '@hollowdark/loading/session'
+
+  interface Props {
+    state: BeginState
+    onBegin: () => void
+    onContinue?: () => void
+    onSettings: () => void
+    onCredits: () => void
+  }
+
+  let {
+    state,
+    onBegin,
+    onContinue,
+    onSettings,
+    onCredits
+  }: Props = $props()
+</script>
+
+<section class="begin">
+  <div class="top">
+    <AppTitle size={38} subtitle="A Literary Life Simulation" />
+  </div>
+
+  <BeginActions {state} {onBegin} {onContinue} {onSettings} {onCredits} />
+
+  <AppVersion />
+</section>
+
+<style>
+  .begin {
+    min-height: 100dvh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: var(--space-12);
+    position: relative;
+  }
+
+  .top {
+    margin-bottom: 120px;
+  }
+</style>
diff --git a/lib/screens/InitialLoadScreen.svelte b/lib/screens/InitialLoadScreen.svelte
new file mode 100644
index 0000000..3800715
--- /dev/null
+++ b/lib/screens/InitialLoadScreen.svelte
@@ -0,0 +1,56 @@
+<script lang="ts">
+  import AppTitle from '@hollowdark/lib/components/AppTitle.svelte'
+  import ProgressBar from '@hollowdark/lib/components/ProgressBar.svelte'
+  import { loadingProgress } from '@hollowdark/loading/progress'
+
+  const progress = $derived($loadingProgress)
+</script>
+
+<section class="initial-load">
+  <div class="top">
+    <AppTitle size={32} letterSpacing={1} />
+  </div>
+
+  <div class="bar">
+    <ProgressBar value={progress.percentage} />
+  </div>
+
+  <p class="message">{progress.currentMessage}</p>
+  <p class="note">This will happen once. It will not happen again.</p>
+</section>
+
+<style>
+  .initial-load {
+    min-height: 100dvh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: var(--space-12);
+    text-align: center;
+  }
+
+  .top {
+    margin-bottom: 120px;
+  }
+
+  .bar {
+    margin-bottom: var(--space-6);
+  }
+
+  .message {
+    font-family: var(--font-ui);
+    font-size: 12px;
+    color: var(--color-text-secondary);
+    letter-spacing: 0.5px;
+    margin: 0 0 var(--space-2);
+  }
+
+  .note {
+    font-family: var(--font-ui);
+    font-size: 11px;
+    color: var(--color-text-tertiary);
+    letter-spacing: 0.3px;
+    margin: 0;
+  }
+</style>
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'],
-- 
cgit v1.2.3