refactor: env config (#769)

modules/build-info.ts

@@ -1,20 +1,23 @@
 import { addVitePlugin, defineNuxtModule } from '@nuxt/kit'
-import Git from 'simple-git'
-import { version } from '../package.json'
+import { getEnv, version } from '../config/env'
 import type { BuildInfo } from '~/types'
 
 export default defineNuxtModule({
   meta: {
     name: 'elk:build-info',
   },
-  async setup() {
-    const git = Git()
+  async setup(_options, nuxt) {
+    const { env, commit, branch } = await getEnv()
+    nuxt.options.runtimeConfig.public.env = env
+
     const buildInfo: BuildInfo = {
       version,
       time: +Date.now(),
-      commit: await git.revparse(['HEAD']),
-      branch: await git.revparse(['--abbrev-ref', 'HEAD']),
+      commit,
+      branch,
+      env,
     }
+
     addVitePlugin({
       name: 'elk:build-info',
       resolveId(id) {
@@ -23,7 +26,7 @@ export default defineNuxtModule({
       },
       load(id) {
         if (id === 'virtual:build-info')
-          return `export default ${JSON.stringify(buildInfo, null, 2)}`
+          return `export const buildInfo = ${JSON.stringify(buildInfo, null, 2)}`
       },
     })
   },

modules/pwa/index.ts

@@ -1,5 +1,5 @@
 import { defineNuxtModule } from '@nuxt/kit'
-import type { VitePluginPWAAPI } from 'vite-plugin-pwa'
+import type { VitePWAOptions, VitePluginPWAAPI } from 'vite-plugin-pwa'
 import { VitePWA } from 'vite-plugin-pwa'
 import type { Plugin } from 'vite'
 import type { VitePWANuxtOptions } from './types'
@@ -32,14 +32,17 @@ export default defineNuxtModule<VitePWANuxtOptions>({
       if (plugin)
         throw new Error('Remove vite-plugin-pwa plugin from Vite Plugins entry in Nuxt config file!')
     })
-    nuxt.hook('vite:extendConfig', (viteInlineConfig, { isClient }) => {
+    nuxt.hook('vite:extendConfig', async (viteInlineConfig, { isClient }) => {
       viteInlineConfig.plugins = viteInlineConfig.plugins || []
       const plugin = viteInlineConfig.plugins.find(p => p && typeof p === 'object' && 'name' in p && p.name === 'vite-plugin-pwa')
       if (plugin)
         throw new Error('Remove vite-plugin-pwa plugin from Vite Plugins entry in Nuxt config file!')
-
-      configurePWAOptions(options, nuxt)
-      const plugins = VitePWA(options)
+      const resolvedOptions: Partial<VitePWAOptions> = {
+        ...options,
+        manifest: options.manifest ? await options.manifest() : undefined,
+      }
+      configurePWAOptions(resolvedOptions, nuxt)
+      const plugins = VitePWA(resolvedOptions)
       viteInlineConfig.plugins.push(plugins)
       if (isClient)
         vitePwaClientPlugin = plugins.find(p => p.name === 'vite-plugin-pwa') as Plugin

modules/pwa/types.ts

@@ -1,6 +1,9 @@
-import type { VitePWAOptions } from 'vite-plugin-pwa'
+import type { ManifestOptions, VitePWAOptions } from 'vite-plugin-pwa'
+import type { Overwrite } from '../../types/utils'
 
-export interface VitePWANuxtOptions extends Partial<VitePWAOptions> {}
+export type VitePWANuxtOptions = Overwrite<Partial<VitePWAOptions>, {
+  manifest?: () => Promise<Partial<ManifestOptions>>
+}>
 
 declare module '@nuxt/schema' {
   interface NuxtConfig {