feat(configuration): use runtime configuration (#213)

* fix(configuration): runtime typings * chore(runtime-config): cleanup --------- Co-authored-by: Jonas Thelemann <[email protected]>
dargmuesli · May 12, 2024 · 529769c · 529769c
1 parent 7ec53de
commit 529769c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 32 deletions.
diff --git a/src/module.ts b/src/module.ts
@@ -13,8 +13,7 @@ import {
   updateTemplates,
 } from '@nuxt/kit'
 import type { Nuxt, NuxtApp } from '@nuxt/schema'
-// import { defu } from 'defu'
-// import webpack from 'webpack' // eslint-disable-line import/no-named-as-default
+import { defu } from 'defu'
 
 import { CONFIG_KEY } from './constants'
 import { replaceCodePlugin } from './replace'
@@ -72,12 +71,13 @@ export default defineNuxtModule<ModuleOptions>({
         })
       }
     })
-    // nuxt.hook('modules:done', async () => {
-    //   nuxt.options.runtimeConfig.cookieControl = defu(
-    //     nuxt.options.runtimeConfig.cookieControl,
-    //     moduleOptions,
-    //   )
-    // })
+
+    nuxt.hook('modules:done', async () => {
+      nuxt.options.runtimeConfig.public.cookieControl = defu(
+        nuxt.options.runtimeConfig.public.cookieControl,
+        moduleOptions,
+      )
+    })
   },
 })
 
@@ -136,10 +136,6 @@ const getTypeTemplate = (data: {
   options: ModuleOptions
 }) => `// Generated by ${name}
 
-import type { ModuleOptions } from '#cookie-control/types'
-
-export default ${JSON.stringify(data.options, undefined, 2)} as ModuleOptions
-
 /**
 * Union of the cookie ids specified in the Nuxt configuration.
 */
@@ -174,28 +170,15 @@ const loadLocales = async (moduleOptions: ModuleOptions) => {
       ...moduleOptions.localeTexts[locale],
     }
   }
-
-  // const regex = new RegExp(moduleOptions.locales.join(COOKIE_ID_SEPARATOR))
-  // addWebpackPlugin(
-  //   new webpack.ContextReplacementPlugin(
-  //     /nuxt-cookie-control[/\\]dist[/\\]runtime[/\\]locale$/,
-  //     regex
-  //   )
-  // )
-  // addVitePlugin(vitePlugin, options?)
 }
 
 const pushCss = (moduleOptions: ModuleOptions, nuxt: Nuxt) => {
   if (moduleOptions.isCssEnabled)
     nuxt.options.css.push(resolver.resolve(runtimeDir, 'styles.css'))
 }
 
-// export interface ModuleRuntimeConfig {
-//   [CONFIG_KEY]: ModuleOptions
-// }
-// declare module 'nuxt/schema' {
-//   interface RuntimeConfig extends ModuleRuntimeConfig {}
-// }
-// declare module '@nuxt/schema' {
-//   interface RuntimeConfig extends ModuleRuntimeConfig {}
-// }
+declare module '@nuxt/schema' {
+  interface PublicRuntimeConfig {
+    cookieControl: ModuleOptions
+  }
+}
diff --git a/src/runtime/plugin.ts b/src/runtime/plugin.ts
@@ -1,12 +1,14 @@
 import { ref } from 'vue'
 
-import moduleOptions from '#build/types/cookie-control.d'
 import { COOKIE_ID_SEPARATOR } from '#cookie-control/constants'
 import { getAllCookieIdsString } from '#cookie-control/methods'
 import type { Cookie, State } from '#cookie-control/types'
-import { defineNuxtPlugin, useCookie } from '#imports'
+import { defineNuxtPlugin, useCookie, useRuntimeConfig } from '#imports'
 
 export default defineNuxtPlugin((_nuxtApp) => {
+  const runtimeConfig = useRuntimeConfig()
+  const moduleOptions = runtimeConfig.public.cookieControl
+
   const cookieIsConsentGiven = useCookie(
     moduleOptions.cookieNameIsConsentGiven,
     moduleOptions.cookieOptions,