From 415d36ce3291921cb07c311cbecd4c297e5c70c4 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sun, 29 Jan 2023 06:18:27 -0800
Subject: [PATCH] refactor: move pwa/build-info -> appConfig (#1508)

---
 components/nav/NavFooter.vue                              | 2 +-
 .../notification/NotificationPreferences.client.vue       | 2 +-
 composables/about.ts                                      | 2 +-
 composables/setups.ts                                     | 2 +-
 composables/users.ts                                      | 4 ++--
 modules/build-env.ts                                      | 8 ++++++--
 modules/pwa/index.ts                                      | 3 +++
 modules/tauri/index.ts                                    | 1 +
 modules/tauri/runtime/build-info.ts                       | 1 +
 nuxt.config.ts                                            | 7 ++-----
 pages/notifications.vue                                   | 2 +-
 pages/settings/notifications/index.vue                    | 2 +-
 pages/settings/notifications/push-notifications.vue       | 2 +-
 pages/share-target.vue                                    | 2 +-
 server/shared.ts                                          | 5 ++++-
 15 files changed, 27 insertions(+), 18 deletions(-)
 create mode 100644 modules/tauri/runtime/build-info.ts

diff --git a/components/nav/NavFooter.vue b/components/nav/NavFooter.vue
index ef8484b0..e72ec011 100644
--- a/components/nav/NavFooter.vue
+++ b/components/nav/NavFooter.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const buildInfo = useRuntimeConfig().public.buildInfo
+const buildInfo = useAppConfig().buildInfo
 const timeAgoOptions = useTimeAgoOptions()
 
 const userSettings = useUserSettings()
diff --git a/components/notification/NotificationPreferences.client.vue b/components/notification/NotificationPreferences.client.vue
index 77b8f273..eb553afb 100644
--- a/components/notification/NotificationPreferences.client.vue
+++ b/components/notification/NotificationPreferences.client.vue
@@ -17,7 +17,7 @@ const {
 } = usePushManager()
 const { t } = useI18n()
 
-const pwaEnabled = useRuntimeConfig().public.pwaEnabled
+const pwaEnabled = useAppConfig().pwaEnabled
 
 let busy = $ref<boolean>(false)
 let animateSave = $ref<boolean>(false)
diff --git a/composables/about.ts b/composables/about.ts
index b40608ad..89d9df79 100644
--- a/composables/about.ts
+++ b/composables/about.ts
@@ -35,5 +35,5 @@ export const teams: Team[] = [
 ].sort(() => Math.random() - 0.5)
 
 export function useBuildInfo() {
-  return useRuntimeConfig().public.buildInfo as BuildInfo
+  return useAppConfig().buildInfo as BuildInfo
 }
diff --git a/composables/setups.ts b/composables/setups.ts
index 06d48c72..732be5a8 100644
--- a/composables/setups.ts
+++ b/composables/setups.ts
@@ -43,7 +43,7 @@ export function setupPageHeader() {
 
       return titleTemplate
     },
-    link: process.client && useRuntimeConfig().public.pwaEnabled
+    link: process.client && useAppConfig().pwaEnabled
       ? () => [{
           key: 'webmanifest',
           rel: 'manifest',
diff --git a/composables/users.ts b/composables/users.ts
index 0c0e751e..f5925e7a 100644
--- a/composables/users.ts
+++ b/composables/users.ts
@@ -149,7 +149,7 @@ export async function loginTo(masto: ElkMasto, user: Overwrite<UserLogin, { acco
   const [me, pushSubscription] = await Promise.all([
     fetchAccountInfo(client, user.server),
     // if PWA is not enabled, don't get push subscription
-    useRuntimeConfig().public.pwaEnabled
+    useAppConfig().pwaEnabled
     // we get 404 response instead empty data
       ? client.v1.webPushSubscriptions.fetch().catch(() => Promise.resolve(undefined))
       : Promise.resolve(undefined),
@@ -194,7 +194,7 @@ export async function removePushNotificationData(user: UserLogin, fromSWPushMana
   // clear push notification policy
   delete useLocalStorage<PushNotificationPolicy>(STORAGE_KEY_NOTIFICATION_POLICY, {}).value[acct]
 
-  const pwaEnabled = useRuntimeConfig().public.pwaEnabled
+  const pwaEnabled = useAppConfig().pwaEnabled
   const pwa = useNuxtApp().$pwa
   const registrationError = pwa?.registrationError === true
   const unregister = pwaEnabled && !registrationError && pwa?.registrationError === true && fromSWPushManager
diff --git a/modules/build-env.ts b/modules/build-env.ts
index 923012d6..bc0a0a09 100644
--- a/modules/build-env.ts
+++ b/modules/build-env.ts
@@ -19,8 +19,12 @@ export default defineNuxtModule({
       env,
     }
 
-    nuxt.options.runtimeConfig.public.env = env
-    nuxt.options.runtimeConfig.public.buildInfo = buildInfo
+    nuxt.options.appConfig = nuxt.options.appConfig || {}
+    nuxt.options.appConfig.env = env
+    nuxt.options.appConfig.buildInfo = buildInfo
+
+    nuxt.options.nitro.virtual = nuxt.options.nitro.virtual || {}
+    nuxt.options.nitro.virtual['#build-info'] = `export const env = ${JSON.stringify(env)}`
 
     nuxt.options.nitro.publicAssets = nuxt.options.nitro.publicAssets || []
     if (env === 'dev')
diff --git a/modules/pwa/index.ts b/modules/pwa/index.ts
index 7b8e6ead..520c4b85 100644
--- a/modules/pwa/index.ts
+++ b/modules/pwa/index.ts
@@ -23,6 +23,9 @@ export default defineNuxtModule<VitePWANuxtOptions>({
     }
     let webmanifests: LocalizedWebManifest | undefined
 
+    nuxt.options.appConfig = nuxt.options.appConfig || {}
+    nuxt.options.appConfig.pwaEnabled = !options.disable
+
     // TODO: combine with configurePWAOptions?
     nuxt.hook('nitro:init', (nitro) => {
       options.outDir = nitro.options.output.publicDir
diff --git a/modules/tauri/index.ts b/modules/tauri/index.ts
index eb00a5b8..5c0fec95 100644
--- a/modules/tauri/index.ts
+++ b/modules/tauri/index.ts
@@ -23,6 +23,7 @@ export default defineNuxtModule({
       'unstorage/drivers/fs': 'unenv/runtime/mock/proxy',
       'unstorage/drivers/cloudflare-kv-http': 'unenv/runtime/mock/proxy',
       'node:events': 'unenv/runtime/node/events/index',
+      '#build-info': resolve('./runtime/build-info'),
     }
 
     nuxt.hook('vite:extend', ({ config }) => {
diff --git a/modules/tauri/runtime/build-info.ts b/modules/tauri/runtime/build-info.ts
new file mode 100644
index 00000000..af0d689e
--- /dev/null
+++ b/modules/tauri/runtime/build-info.ts
@@ -0,0 +1 @@
+export const env = useAppConfig().env
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 795c5473..e0bd7c8d 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -4,7 +4,6 @@ import { isCI, isDevelopment, isWindows } from 'std-env'
 import { isPreview } from './config/env'
 import { i18n } from './config/i18n'
 import { pwa } from './config/pwa'
-import type { BuildInfo } from './types'
 
 const { resolve } = createResolver(import.meta.url)
 
@@ -96,10 +95,8 @@ export default defineNuxtConfig({
     },
     public: {
       privacyPolicyUrl: '',
-      env: '', // set in build-env module
-      buildInfo: {} as BuildInfo, // set in build-env module
-      pwaEnabled: !isDevelopment || process.env.VITE_DEV_PWA === 'true',
-      // We use LibreTranslate(https://github.com/LibreTranslate/LibreTranslate) as our default translation server #76
+      // We use LibreTranslate (https://github.com/LibreTranslate/LibreTranslate) as
+      // our default translation server #76
       translateApi: '',
       // Use the instance where Elk has its Mastodon account as the default
       defaultServer: 'm.webtoo.ls',
diff --git a/pages/notifications.vue b/pages/notifications.vue
index 5a88a849..5bf26ce1 100644
--- a/pages/notifications.vue
+++ b/pages/notifications.vue
@@ -6,7 +6,7 @@ definePageMeta({
 })
 
 const { t } = useI18n()
-const pwaEnabled = useRuntimeConfig().public.pwaEnabled
+const pwaEnabled = useAppConfig().pwaEnabled
 
 const tabs = $computed<CommonRouteTabOption[]>(() => [
   {
diff --git a/pages/settings/notifications/index.vue b/pages/settings/notifications/index.vue
index 5fdfae41..ef95d85a 100644
--- a/pages/settings/notifications/index.vue
+++ b/pages/settings/notifications/index.vue
@@ -4,7 +4,7 @@ definePageMeta({
 })
 
 const { t } = useI18n()
-const pwaEnabled = useRuntimeConfig().public.pwaEnabled
+const pwaEnabled = useAppConfig().pwaEnabled
 
 useHeadFixed({
   title: () => `${t('settings.notifications.label')} | ${t('nav.settings')}`,
diff --git a/pages/settings/notifications/push-notifications.vue b/pages/settings/notifications/push-notifications.vue
index df447711..641cb5a0 100644
--- a/pages/settings/notifications/push-notifications.vue
+++ b/pages/settings/notifications/push-notifications.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 definePageMeta({
   middleware: ['auth', () => {
-    if (!useRuntimeConfig().public.pwaEnabled)
+    if (!useAppConfig().pwaEnabled)
       return navigateTo('/settings/notifications')
   }],
 })
diff --git a/pages/share-target.vue b/pages/share-target.vue
index b944f5c4..13b15425 100644
--- a/pages/share-target.vue
+++ b/pages/share-target.vue
@@ -1,7 +1,7 @@
 <script setup>
 definePageMeta({
   middleware: () => {
-    if (!useRuntimeConfig().public.pwaEnabled)
+    if (!useAppConfig().pwaEnabled)
       return navigateTo('/')
   },
 })
diff --git a/server/shared.ts b/server/shared.ts
index 6ef1e93a..37f4b2bd 100644
--- a/server/shared.ts
+++ b/server/shared.ts
@@ -12,6 +12,9 @@ import type { Storage } from 'unstorage'
 
 import cached from './cache-driver'
 
+// @ts-expect-error virtual import
+import { env } from '#build-info'
+
 import type { AppInfo } from '~/types'
 import { APP_NAME } from '~/constants'
 
@@ -45,7 +48,7 @@ async function fetchAppInfo(origin: string, server: string) {
   const app: AppInfo = await $fetch(`https://${server}/api/v1/apps`, {
     method: 'POST',
     body: {
-      client_name: APP_NAME + (config.public.env !== 'release' ? ` (${config.public.env})` : ''),
+      client_name: APP_NAME + (env !== 'release' ? ` (${env})` : ''),
       website: 'https://elk.zone',
       redirect_uris: getRedirectURI(origin, server),
       scopes: 'read write follow push',