Merge branches 'main' and 'main' of github.com:nuxt/scripts

Author: harlan-zw

docs/content/scripts/tracking/google-tag-manager.md

@@ -174,4 +174,4 @@ function sendConversion() {
 
 `useScriptGoogleTagManager` initialize Google Tag Manager by itself. This means it pushes the `js`, `config` and the `gtm.start` events for you.
 
-If you need to configure GTM before it starts. For example, (setting the consent mode)[https://developers.google.com/tag-platform/security/guides/consent?hl=fr&consentmode=basic]. You can use the `onBeforeGtmStart` hook which is run right before we push the `gtm.start` event into the dataLayer.
+If you need to configure GTM before it starts. For example, [setting the consent mode](https://developers.google.com/tag-platform/security/guides/consent?consentmode=basic). You can use the `onBeforeGtmStart` hook which is run right before we push the `gtm.start` event into the dataLayer.

src/runtime/components/ScriptGoogleMaps.vue

@@ -121,6 +121,7 @@ const { load, status, onLoaded } = useScriptGoogleMaps({
   scriptOptions: {
     trigger,
   },
+  ...props.mapOptions
 })
 
 const options = computed(() => {

src/runtime/registry/google-maps.ts

@@ -20,7 +20,7 @@ export const GoogleMapsOptions = object({
   libraries: optional(array(string())),
   language: optional(string()),
   region: optional(string()),
-  v: optional(union([literal('weekly'), literal('beta'), literal('alpha')])),
+  v: optional(union([literal('weekly'), literal('quarterly'), literal('beta'), literal('alpha'), string()])),
 })
 
 export type GoogleMapsInput = RegistryScriptInput<typeof GoogleMapsOptions>
@@ -46,6 +46,7 @@ export function useScriptGoogleMaps<T extends GoogleMapsApi>(_options?: GoogleMa
     const libraries = options?.libraries || ['places']
     const language = options?.language ? { language: options.language } : undefined
     const region = options?.region ? { region: options.region } : undefined
+    const version = options?.v ? { v: options.v } : undefined
     return {
       scriptInput: {
         src: withQuery(`https://maps.googleapis.com/maps/api/js`, {
@@ -55,6 +56,7 @@ export function useScriptGoogleMaps<T extends GoogleMapsApi>(_options?: GoogleMa
           callback: 'google.maps.__ib__',
           ...language,
           ...region,
+          ...version
         }),
       },
       clientInit: import.meta.server

src/runtime/types.ts

@@ -1,10 +1,8 @@
 import type {
-  ActiveHeadEntry,
-  AsAsyncFunctionValues,
   DataKeys,
   SchemaAugmentations,
-  ScriptBase,
-} from '@unhead/schema'
+  ScriptWithoutEvents,
+} from 'unhead/types'
 import type { UseScriptInput, VueScriptInstance, UseScriptOptions } from '@unhead/vue'
 import type { ComputedRef, Ref } from 'vue'
 import type { InferInput, ObjectSchema } from 'valibot'
@@ -35,17 +33,7 @@ import { object } from '#nuxt-scripts-validator'
 
 export type WarmupStrategy = false | 'preload' | 'preconnect' | 'dns-prefetch'
 
-export type UseScriptContext<T extends Record<symbol | string, any>> =
-  (Promise<T> & VueScriptInstance<T>)
-  & AsAsyncFunctionValues<T>
-  & {
-  /**
-   * @deprecated Use top-level functions instead.
-   */
-    $script: Promise<T> & VueScriptInstance<T>
-    warmup: (rel: WarmupStrategy) => void
-    _warmupEl?: void | ActiveHeadEntry<any>
-  }
+export type UseScriptContext<T extends Record<symbol | string, any>> = VueScriptInstance<T>
 
 export type NuxtUseScriptOptions<T extends Record<symbol | string, any> = {}> = Omit<UseScriptOptions<T>, 'trigger'> & {
   /**
@@ -176,7 +164,7 @@ const _emptyOptions = object({})
 
 export type EmptyOptionsSchema = typeof _emptyOptions
 
-type ScriptInput = ScriptBase & DataKeys & SchemaAugmentations['script']
+type ScriptInput = ScriptWithoutEvents & DataKeys & SchemaAugmentations['script']
 
 export type InferIfSchema<T> = T extends ObjectSchema<any, any> ? InferInput<T> : T
 export type RegistryScriptInput<