Skip to content

Commit 8dd59f5

Browse files
committed
chore: broken tests
1 parent 97d72a4 commit 8dd59f5

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

src/module.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ import { NuxtScriptsCheckScripts } from './plugins/check-scripts'
3030
import { registerTypeTemplates, templatePlugin, templateTriggerResolver } from './templates'
3131
import { getAllProxyConfigs, getSWInterceptRules } from './proxy-configs'
3232

33+
declare module '@nuxt/schema' {
34+
interface NuxtHooks {
35+
'scripts:registry': (registry: RegistryScripts) => void | Promise<void>
36+
}
37+
}
38+
3339
/**
3440
* Privacy mode for first-party proxy requests.
3541
*
@@ -295,7 +301,7 @@ export default defineNuxtModule<ModuleOptions>({
295301

296302
// Resolve first-party configuration
297303
const staticPresets = ['static', 'github-pages', 'cloudflare-pages-static']
298-
const preset = nuxt.options.nitro?.preset || process.env.NITRO_PRESET || ''
304+
const preset = process.env.NITRO_PRESET || ''
299305
const isStaticPreset = staticPresets.includes(preset)
300306

301307
const firstPartyEnabled = !!config.firstParty

src/runtime/composables/useScript.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ import { logger } from '../logger'
88
// @ts-expect-error virtual template
99
import { resolveTrigger } from '#build/nuxt-scripts-trigger-resolver'
1010

11+
type NuxtScriptsApp = ReturnType<typeof useNuxtApp> & {
12+
$scripts: Record<string, UseScriptContext<any> | undefined>
13+
_scripts: Record<string, NuxtDevToolsScriptInstance>
14+
}
15+
1116
function useNuxtScriptRuntimeConfig() {
1217
return useRuntimeConfig().public['nuxt-scripts'] as {
1318
defaultScriptOptions: NuxtUseScriptOptions
@@ -33,7 +38,7 @@ export function useScript<T extends Record<symbol | string, any> = Record<symbol
3338
script: [{ src, type: 'text/partytown' }],
3439
})
3540
// Register with nuxtApp.$scripts for DevTools visibility
36-
const nuxtApp = useNuxtApp()
41+
const nuxtApp = useNuxtApp() as NuxtScriptsApp
3742
nuxtApp.$scripts = nuxtApp.$scripts! || reactive({})
3843
const status = ref('loaded')
3944
const stub = {
@@ -63,8 +68,8 @@ export function useScript<T extends Record<symbol | string, any> = Record<symbol
6368
}
6469

6570
// browser hint optimizations
66-
const id = String(resolveScriptKey(input) as keyof typeof nuxtApp._scripts)
67-
const nuxtApp = useNuxtApp()
71+
const nuxtApp = useNuxtApp() as NuxtScriptsApp
72+
const id = String(resolveScriptKey(input))
6873
options.head = options.head || injectHead()
6974
if (!options.head) {
7075
throw new Error('useScript() has been called without Nuxt context.')
@@ -139,7 +144,7 @@ export function useScript<T extends Record<symbol | string, any> = Record<symbol
139144

140145
function syncScripts() {
141146
nuxtApp._scripts[instance.id] = payload
142-
nuxtApp.hooks.callHook('scripts:updated', { scripts: nuxtApp._scripts })
147+
nuxtApp.hooks.callHook('scripts:updated' as any, { scripts: nuxtApp._scripts })
143148
}
144149

145150
if (!nuxtApp._scripts[instance.id]) {

0 commit comments

Comments
 (0)