chore: fix broken types

nuxt · Jul 5, 2024 · 722577b · 722577b
1 parent 7423527
commit 722577b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,4 +47,4 @@ jobs:
       - run: pnpm lint
       - run: pnpm test
       - run: pnpm build
-      - run: pnpm test:types
+      - run: pnpm typecheck
diff --git a/src/module.ts b/src/module.ts
@@ -164,7 +164,7 @@ export default defineNuxtModule<ModuleOptions>({
         let types = `
 declare module '#app' {
   interface NuxtApp {
-    $scripts: Record<${[...Object.keys(config.globals || {}), ...Object.keys(config.registry || {})].map(k => `'${k}'`).join(' | ')}, Pick<(import('#nuxt-scripts').NuxtAppScript), '$script'> & Record<string, any>>
+    $scripts: Record<${[...Object.keys(config.globals || {}), ...Object.keys(config.registry || {})].map(k => `'${k}'`).concat(['string']).join(' | ')}, Pick<(import('#nuxt-scripts').NuxtAppScript), '$script'> & Record<string, any>>
     _scripts: Record<string, (import('#nuxt-scripts').NuxtAppScript)>
   }
   interface RuntimeNuxtHooks {

diff --git a/src/runtime/composables/useScript.ts b/src/runtime/composables/useScript.ts
@@ -22,8 +22,8 @@ export function useScript<T extends Record<string | symbol, any>>(input: UseScri
   const id = (input.key || input.src || hashCode((typeof input.innerHTML === 'string' ? input.innerHTML : ''))) as keyof typeof nuxtApp._scripts
   nuxtApp.$scripts = nuxtApp.$scripts! || reactive({})
   // return early
-  if (nuxtApp.$scripts[id]) {
-    return nuxtApp.$scripts[id]
+  if ((nuxtApp.$scripts as Record<string, any>)[id]) {
+    return (nuxtApp.$scripts as Record<string, any>)[id]
   }
   if (import.meta.client) {
     // only validate if we're initializing the script
@@ -36,6 +36,7 @@ export function useScript<T extends Record<string | symbol, any>>(input: UseScri
     }
   }
   const instance = _useScript<T>(input, options as any as UseScriptOptions<T>)
+  // @ts-expect-error untyped
   nuxtApp.$scripts[id] = instance
   // used for devtools integration
   if (import.meta.dev && import.meta.client) {