Skip to content

Commit 722577b

Browse files
committed
chore: fix broken types
1 parent 7423527 commit 722577b

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ jobs:
4747
- run: pnpm lint
4848
- run: pnpm test
4949
- run: pnpm build
50-
- run: pnpm test:types
50+
- run: pnpm typecheck

src/module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ export default defineNuxtModule<ModuleOptions>({
164164
let types = `
165165
declare module '#app' {
166166
interface NuxtApp {
167-
$scripts: Record<${[...Object.keys(config.globals || {}), ...Object.keys(config.registry || {})].map(k => `'${k}'`).join(' | ')}, Pick<(import('#nuxt-scripts').NuxtAppScript), '$script'> & Record<string, any>>
167+
$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>>
168168
_scripts: Record<string, (import('#nuxt-scripts').NuxtAppScript)>
169169
}
170170
interface RuntimeNuxtHooks {

src/runtime/composables/useScript.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ export function useScript<T extends Record<string | symbol, any>>(input: UseScri
2222
const id = (input.key || input.src || hashCode((typeof input.innerHTML === 'string' ? input.innerHTML : ''))) as keyof typeof nuxtApp._scripts
2323
nuxtApp.$scripts = nuxtApp.$scripts! || reactive({})
2424
// return early
25-
if (nuxtApp.$scripts[id]) {
26-
return nuxtApp.$scripts[id]
25+
if ((nuxtApp.$scripts as Record<string, any>)[id]) {
26+
return (nuxtApp.$scripts as Record<string, any>)[id]
2727
}
2828
if (import.meta.client) {
2929
// only validate if we're initializing the script
@@ -36,6 +36,7 @@ export function useScript<T extends Record<string | symbol, any>>(input: UseScri
3636
}
3737
}
3838
const instance = _useScript<T>(input, options as any as UseScriptOptions<T>)
39+
// @ts-expect-error untyped
3940
nuxtApp.$scripts[id] = instance
4041
// used for devtools integration
4142
if (import.meta.dev && import.meta.client) {

0 commit comments

Comments
 (0)