@nuxt/scripts 0.9.5 → 0.10.0

package/dist/module.d.ts

@@ -1,4 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
+import { FetchOptions } from 'ofetch';
 import { NuxtConfigScriptRegistry, NuxtUseScriptOptionsSerializable, NuxtUseScriptInput, RegistryScripts } from '../dist/runtime/types.js';
 
 interface ModuleOptions {
@@ -33,6 +34,10 @@ interface ModuleOptions {
          * @default false
          */
         fallbackOnSrcOnBundleFail?: boolean;
+        /**
+         * Configure the fetch options used for downloading scripts.
+         */
+        fetchOptions?: FetchOptions;
     };
     /**
      * Whether the module is enabled.

package/dist/module.json

@@ -5,7 +5,7 @@
     "nuxt": ">=3",
     "bridge": false
   },
-  "version": "0.9.5",
+  "version": "0.10.0",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/module.mjs

@@ -1,7 +1,6 @@
-import { useNuxt, useLogger, addDevServerHandler, tryUseNuxt, createResolver, addTemplate, logger as logger$1, defineNuxtModule, addImportsDir, addComponentsDir, addImports, addPluginTemplate, addBuildPlugin, hasNuxtModule } from '@nuxt/kit';
+import { useNuxt, useLogger, addDevServerHandler, tryUseNuxt, createResolver, addTemplate, logger as logger$1, defineNuxtModule, resolvePath, addImportsDir, addComponentsDir, addImports, addPluginTemplate, addBuildPlugin, hasNuxtModule } from '@nuxt/kit';
 import { resolvePackageJSON, readPackageJSON } from 'pkg-types';
 import { lt } from 'semver';
-import { resolvePath } from 'mlly';
 import { join, resolve, relative } from 'pathe';
 import { existsSync } from 'node:fs';
 import fsp from 'node:fs/promises';
@@ -11,15 +10,14 @@ import { asyncWalk, walk } from 'estree-walker';
 import { joinURL, parseURL, parseQuery, hasProtocol } from 'ufo';
 import { hash } from 'ohash';
 import { colors } from 'consola/utils';
+import { fetch, $fetch } from 'ofetch';
 import { lazyEventHandler, eventHandler, createError } from 'h3';
-import { fetch as fetch$1 } from 'ofetch';
 import { defu } from 'defu';
 import { createStorage } from 'unstorage';
 import fsDriver from 'unstorage/drivers/fs-lite';
 import { pathToFileURL } from 'node:url';
 import { isCI, provider } from 'std-env';
 import { registry } from './registry.mjs';
-import 'third-party-capital';
 
 const DEVTOOLS_UI_ROUTE = "/__nuxt-scripts";
 const DEVTOOLS_UI_LOCAL_PORT = 3300;
@@ -91,7 +89,7 @@ function setupPublicAssetStrategy(options = {}) {
         const key = `bundle:${filename}`;
         let res = await storage.getItemRaw(key);
         if (!res) {
-          res = await fetch$1(scriptDescriptor.src).then((r) => r.arrayBuffer()).then((r) => Buffer.from(r));
+          res = await fetch(scriptDescriptor.src).then((r) => r.arrayBuffer()).then((r) => Buffer.from(r));
           await storage.setItemRaw(key, res);
         }
         return res;
@@ -164,7 +162,7 @@ function normalizeScriptData(src, assetsBaseURL = "/_scripts") {
   }
   return { url: src };
 }
-async function downloadScript(opts, renderedScript) {
+async function downloadScript(opts, renderedScript, fetchOptions) {
   const { src, url, filename } = opts;
   if (src === url || !filename) {
     return;
@@ -186,15 +184,15 @@ async function downloadScript(opts, renderedScript) {
     }
     let encoding;
     let size = 0;
-    res = await fetch(src).then((r) => {
+    res = await $fetch.raw(src, { ...fetchOptions, responseType: "arrayBuffer" }).then(async (r) => {
       if (!r.ok) {
         throw new Error(`Failed to fetch ${src}`);
       }
       encoding = r.headers.get("content-encoding");
       const contentLength = r.headers.get("content-length");
       size = contentLength ? Number(contentLength) / 1024 : 0;
-      return r.arrayBuffer();
-    }).then((r) => Buffer.from(r));
+      return Buffer.from(r._data || await r.arrayBuffer());
+    });
     await storage.setItemRaw(`bundle:${filename}`, res);
     size = size || res.length / 1024;
     logger.info(`Downloading script ${colors.gray(`${src} \u2192 ${filename} (${size.toFixed(2)} kB ${encoding})`)}`);
@@ -325,7 +323,7 @@ function NuxtScriptBundleTransformer(options = {
                     const { url: _url, filename } = normalizeScriptData(src, options.assetsBaseURL);
                     let url = _url;
                     try {
-                      await downloadScript({ src, url, filename }, renderedScript);
+                      await downloadScript({ src, url, filename }, renderedScript, options.fetchOptions);
                     } catch (e) {
                       if (options.fallbackOnSrcOnBundleFail) {
                         logger.warn(`[Nuxt Scripts: Bundle Transformer] Failed to bundle ${src}. Fallback to remote loading.`);
@@ -336,9 +334,9 @@ function NuxtScriptBundleTransformer(options = {
                     }
                     if (src === url) {
                       if (src && src.startsWith("/"))
-                        console.warn(`[Nuxt Scripts: Bundle Transformer] Relative scripts are already bundled. Skipping bundling for \`${src}\`.`);
+                        logger.warn(`[Nuxt Scripts: Bundle Transformer] Relative scripts are already bundled. Skipping bundling for \`${src}\`.`);
                       else
-                        console.warn(`[Nuxt Scripts: Bundle Transformer] Failed to bundle ${src}.`);
+                        logger.warn(`[Nuxt Scripts: Bundle Transformer] Failed to bundle ${src}.`);
                     }
                     if (scriptSrcNode) {
                       s.overwrite(scriptSrcNode.start, scriptSrcNode.end, `'${url}'`);
@@ -546,6 +544,16 @@ const module = defineNuxtModule({
     defaultScriptOptions: {
       trigger: "onNuxtReady"
     },
+    assets: {
+      fetchOptions: {
+        retry: 3,
+        // Specifies the number of retry attempts for failed fetches.
+        retryDelay: 2e3,
+        // Specifies the delay (in milliseconds) between retry attempts.
+        timeout: 15e3
+        // Configures the maximum time (in milliseconds) allowed for each fetch attempt.
+      }
+    },
     enabled: true,
     debug: false
   },
@@ -553,8 +561,7 @@ const module = defineNuxtModule({
     const { resolve } = createResolver(import.meta.url);
     const { version, name } = await readPackageJSON(resolve("../package.json"));
     nuxt.options.alias["#nuxt-scripts-validator"] = resolve(`./runtime/validation/${nuxt.options.dev || nuxt.options._prepare ? "valibot" : "mock"}`);
-    nuxt.options.alias["#nuxt-scripts"] = resolve("./runtime/types");
-    nuxt.options.alias["#nuxt-scripts-utils"] = resolve("./runtime/utils");
+    nuxt.options.alias["#nuxt-scripts"] = resolve("./runtime");
     logger.level = config.debug || nuxt.options.debug ? 4 : 3;
     if (!config.enabled) {
       logger.debug("The module is disabled, skipping setup.");
@@ -569,9 +576,6 @@ const module = defineNuxtModule({
         logger.warn(`Nuxt Scripts recommends Unhead >= 1.11.5, you are using v${unheadVersion}. Please run \`nuxi upgrade --clean\` to upgrade...`);
       }
     }
-    nuxt.options.alias["#nuxt-scripts-validator"] = resolve(`./runtime/validation/${nuxt.options.dev || nuxt.options._prepare ? "valibot" : "mock"}`);
-    nuxt.options.alias["#nuxt-scripts"] = resolve("./runtime/types");
-    nuxt.options.alias["#nuxt-scripts-utils"] = resolve("./runtime/utils");
     nuxt.options.runtimeConfig["nuxt-scripts"] = { version };
     nuxt.options.runtimeConfig.public["nuxt-scripts"] = {
       // expose for devtools
@@ -603,17 +607,17 @@ const module = defineNuxtModule({
         let types = `
 declare module '#app' {
   interface NuxtApp {
-    $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)>
+    $scripts: Record<${[...Object.keys(config.globals || {}), ...Object.keys(config.registry || {})].map((k) => `'${k}'`).concat(["string"]).join(" | ")}, (import('#nuxt-scripts/types').UseScriptContext<any>)>
+    _scripts: Record<string, (import('#nuxt-scripts/types').UseScriptContext<any>)>
   }
   interface RuntimeNuxtHooks {
-    'scripts:updated': (ctx: { scripts: Record<string, (import('#nuxt-scripts').NuxtAppScript)> }) => void | Promise<void>
+    'scripts:updated': (ctx: { scripts: Record<string, (import('#nuxt-scripts/types').UseScriptContext<any>)> }) => void | Promise<void>
   }
 }
 `;
         if (newScripts.length) {
           types = `${types}
-declare module '#nuxt-scripts' {
+declare module '#nuxt-scripts/types' {
     type NuxtUseScriptOptions = Omit<import('${typesPath}').NuxtUseScriptOptions, 'use' | 'beforeInit'>
     interface ScriptRegistry {
 ${newScripts.map((i) => {
@@ -649,6 +653,7 @@ ${newScripts.map((i) => {
         },
         assetsBaseURL: config.assets?.prefix,
         fallbackOnSrcOnBundleFail: config.assets?.fallbackOnSrcOnBundleFail,
+        fetchOptions: config.assets?.fetchOptions,
         renderedScript
       }));
       nuxt.hooks.hook("build:done", async () => {

package/dist/registry.mjs

@@ -1,5 +1,4 @@
 import { joinURL, withQuery, withBase } from 'ufo';
-import { GoogleTagManager, GoogleAnalytics } from 'third-party-capital';
 
 const registry = (resolve) => {
   resolve = resolve || ((s) => s);
@@ -84,6 +83,16 @@ const registry = (resolve) => {
         from: resolve("./runtime/registry/x-pixel")
       }
     },
+    {
+      label: "Snapchat Pixel",
+      src: "https://sc-static.net/scevent.min.js",
+      category: "tracking",
+      logo: '<svg width="50" height="50" viewBox="147.353 39.286 514.631 514.631" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  xml:space="preserve"><path style="fill:#FFFC00;" d="M147.553,423.021v0.023c0.308,11.424,0.403,22.914,2.33,34.268 c2.042,12.012,4.961,23.725,10.53,34.627c7.529,14.756,17.869,27.217,30.921,37.396c9.371,7.309,19.608,13.111,30.94,16.771 c16.524,5.33,33.571,7.373,50.867,7.473c10.791,0.068,21.575,0.338,32.37,0.293c78.395-0.33,156.792,0.566,235.189-0.484 c10.403-0.141,20.636-1.41,30.846-3.277c19.569-3.582,36.864-11.932,51.661-25.133c17.245-15.381,28.88-34.205,34.132-56.924 c3.437-14.85,4.297-29.916,4.444-45.035v-3.016c0-1.17-0.445-256.892-0.486-260.272c-0.115-9.285-0.799-18.5-2.54-27.636 c-2.117-11.133-5.108-21.981-10.439-32.053c-5.629-10.641-12.68-20.209-21.401-28.57c-13.359-12.81-28.775-21.869-46.722-26.661 c-16.21-4.327-32.747-5.285-49.405-5.27c-0.027-0.004-0.09-0.173-0.094-0.255H278.56c-0.005,0.086-0.008,0.172-0.014,0.255 c-9.454,0.173-18.922,0.102-28.328,1.268c-10.304,1.281-20.509,3.21-30.262,6.812c-15.362,5.682-28.709,14.532-40.11,26.347 c-12.917,13.386-22.022,28.867-26.853,46.894c-4.31,16.084-5.248,32.488-5.271,49.008"/><path style="fill:#FFFFFF;" d="M407.001,473.488c-1.068,0-2.087-0.039-2.862-0.076c-0.615,0.053-1.25,0.076-1.886,0.076 c-22.437,0-37.439-10.607-50.678-19.973c-9.489-6.703-18.438-13.031-28.922-14.775c-5.149-0.854-10.271-1.287-15.22-1.287 c-8.917,0-15.964,1.383-21.109,2.389c-3.166,0.617-5.896,1.148-8.006,1.148c-2.21,0-4.895-0.49-6.014-4.311 c-0.887-3.014-1.523-5.934-2.137-8.746c-1.536-7.027-2.65-11.316-5.281-11.723c-28.141-4.342-44.768-10.738-48.08-18.484 c-0.347-0.814-0.541-1.633-0.584-2.443c-0.129-2.309,1.501-4.334,3.777-4.711c22.348-3.68,42.219-15.492,59.064-35.119 c13.049-15.195,19.457-29.713,20.145-31.316c0.03-0.072,0.065-0.148,0.101-0.217c3.247-6.588,3.893-12.281,1.926-16.916 c-3.626-8.551-15.635-12.361-23.58-14.882c-1.976-0.625-3.845-1.217-5.334-1.808c-7.043-2.782-18.626-8.66-17.083-16.773 c1.124-5.916,8.949-10.036,15.273-10.036c1.756,0,3.312,0.308,4.622,0.923c7.146,3.348,13.575,5.045,19.104,5.045 c6.876,0,10.197-2.618,11-3.362c-0.198-3.668-0.44-7.546-0.674-11.214c0-0.004-0.005-0.048-0.005-0.048 c-1.614-25.675-3.627-57.627,4.546-75.95c24.462-54.847,76.339-59.112,91.651-59.112c0.408,0,6.674-0.062,6.674-0.062 c0.283-0.005,0.59-0.009,0.908-0.009c15.354,0,67.339,4.27,91.816,59.15c8.173,18.335,6.158,50.314,4.539,76.016l-0.076,1.23 c-0.222,3.49-0.427,6.793-0.6,9.995c0.756,0.696,3.795,3.096,9.978,3.339c5.271-0.202,11.328-1.891,17.998-5.014 c2.062-0.968,4.345-1.169,5.895-1.169c2.343,0,4.727,0.456,6.714,1.285l0.106,0.041c5.66,2.009,9.367,6.024,9.447,10.242 c0.071,3.932-2.851,9.809-17.223,15.485c-1.472,0.583-3.35,1.179-5.334,1.808c-7.952,2.524-19.951,6.332-23.577,14.878 c-1.97,4.635-1.322,10.326,1.926,16.912c0.036,0.072,0.067,0.145,0.102,0.221c1,2.344,25.205,57.535,79.209,66.432 c2.275,0.379,3.908,2.406,3.778,4.711c-0.048,0.828-0.248,1.656-0.598,2.465c-3.289,7.703-19.915,14.09-48.064,18.438 c-2.642,0.408-3.755,4.678-5.277,11.668c-0.63,2.887-1.271,5.717-2.146,8.691c-0.819,2.797-2.641,4.164-5.567,4.164h-0.441 c-1.905,0-4.604-0.346-8.008-1.012c-5.95-1.158-12.623-2.236-21.109-2.236c-4.948,0-10.069,0.434-15.224,1.287 c-10.473,1.744-19.421,8.062-28.893,14.758C444.443,462.88,429.436,473.488,407.001,473.488"/><path style="fill:#020202;" d="M408.336,124.235c14.455,0,64.231,3.883,87.688,56.472c7.724,17.317,5.744,48.686,4.156,73.885 c-0.248,3.999-0.494,7.875-0.694,11.576l-0.084,1.591l1.062,1.185c0.429,0.476,4.444,4.672,13.374,5.017l0.144,0.008l0.15-0.003 c5.904-0.225,12.554-2.059,19.776-5.442c1.064-0.498,2.48-0.741,3.978-0.741c1.707,0,3.521,0.321,5.017,0.951l0.226,0.09 c3.787,1.327,6.464,3.829,6.505,6.093c0.022,1.28-0.935,5.891-14.359,11.194c-1.312,0.518-3.039,1.069-5.041,1.7 c-8.736,2.774-21.934,6.96-26.376,17.427c-2.501,5.896-1.816,12.854,2.034,20.678c1.584,3.697,26.52,59.865,82.631,69.111 c-0.011,0.266-0.079,0.557-0.229,0.9c-0.951,2.24-6.996,9.979-44.612,15.783c-5.886,0.902-7.328,7.5-9,15.17 c-0.604,2.746-1.218,5.518-2.062,8.381c-0.258,0.865-0.306,0.914-1.233,0.914c-0.128,0-0.278,0-0.442,0 c-1.668,0-4.2-0.346-7.135-0.922c-5.345-1.041-12.647-2.318-21.982-2.318c-5.21,0-10.577,0.453-15.962,1.352 c-11.511,1.914-20.872,8.535-30.786,15.543c-13.314,9.408-27.075,19.143-48.071,19.143c-0.917,0-1.812-0.031-2.709-0.076 l-0.236-0.01l-0.237,0.018c-0.515,0.045-1.034,0.068-1.564,0.068c-20.993,0-34.76-9.732-48.068-19.143 c-9.916-7.008-19.282-13.629-30.791-15.543c-5.38-0.896-10.752-1.352-15.959-1.352c-9.333,0-16.644,1.428-21.978,2.471 c-2.935,0.574-5.476,1.066-7.139,1.066c-1.362,0-1.388-0.08-1.676-1.064c-0.844-2.865-1.461-5.703-2.062-8.445 c-1.676-7.678-3.119-14.312-9.002-15.215c-37.613-5.809-43.659-13.561-44.613-15.795c-0.149-0.352-0.216-0.652-0.231-0.918 c56.11-9.238,81.041-65.408,82.63-69.119c3.857-7.818,4.541-14.775,2.032-20.678c-4.442-10.461-17.638-14.653-26.368-17.422 c-2.007-0.635-3.735-1.187-5.048-1.705c-11.336-4.479-14.823-8.991-14.305-11.725c0.601-3.153,6.067-6.359,10.837-6.359 c1.072,0,2.012,0.173,2.707,0.498c7.747,3.631,14.819,5.472,21.022,5.472c9.751,0,14.091-4.537,14.557-5.055l1.057-1.182 l-0.085-1.583c-0.197-3.699-0.44-7.574-0.696-11.565c-1.583-25.205-3.563-56.553,4.158-73.871 c23.37-52.396,72.903-56.435,87.525-56.435c0.36,0,6.717-0.065,6.717-0.065C407.744,124.239,408.033,124.235,408.336,124.235 M408.336,115.197h-0.017c-0.333,0-0.646,0-0.944,0.004c-2.376,0.024-6.282,0.062-6.633,0.066c-8.566,0-25.705,1.21-44.115,9.336 c-10.526,4.643-19.994,10.921-28.14,18.66c-9.712,9.221-17.624,20.59-23.512,33.796c-8.623,19.336-6.576,51.905-4.932,78.078 l0.006,0.041c0.176,2.803,0.361,5.73,0.53,8.582c-1.265,0.581-3.316,1.194-6.339,1.194c-4.864,0-10.648-1.555-17.187-4.619 c-1.924-0.896-4.12-1.349-6.543-1.349c-3.893,0-7.997,1.146-11.557,3.239c-4.479,2.63-7.373,6.347-8.159,10.468 c-0.518,2.726-0.493,8.114,5.492,13.578c3.292,3.008,8.128,5.782,14.37,8.249c1.638,0.645,3.582,1.261,5.641,1.914 c7.145,2.271,17.959,5.702,20.779,12.339c1.429,3.365,0.814,7.793-1.823,13.145c-0.069,0.146-0.138,0.289-0.201,0.439 c-0.659,1.539-6.807,15.465-19.418,30.152c-7.166,8.352-15.059,15.332-23.447,20.752c-10.238,6.617-21.316,10.943-32.923,12.855 c-4.558,0.748-7.813,4.809-7.559,9.424c0.078,1.33,0.39,2.656,0.931,3.939c0.004,0.008,0.009,0.016,0.013,0.023 c1.843,4.311,6.116,7.973,13.063,11.203c8.489,3.943,21.185,7.26,37.732,9.855c0.836,1.59,1.704,5.586,2.305,8.322 c0.629,2.908,1.285,5.898,2.22,9.074c1.009,3.441,3.626,7.553,10.349,7.553c2.548,0,5.478-0.574,8.871-1.232 c4.969-0.975,11.764-2.305,20.245-2.305c4.702,0,9.575,0.414,14.48,1.229c9.455,1.574,17.606,7.332,27.037,14 c13.804,9.758,29.429,20.803,53.302,20.803c0.651,0,1.304-0.021,1.949-0.066c0.789,0.037,1.767,0.066,2.799,0.066 c23.88,0,39.501-11.049,53.29-20.799l0.022-0.02c9.433-6.66,17.575-12.41,27.027-13.984c4.903-0.814,9.775-1.229,14.479-1.229 c8.102,0,14.517,1.033,20.245,2.15c3.738,0.736,6.643,1.09,8.872,1.09l0.218,0.004h0.226c4.917,0,8.53-2.699,9.909-7.422 c0.916-3.109,1.57-6.029,2.215-8.986c0.562-2.564,1.46-6.674,2.296-8.281c16.558-2.6,29.249-5.91,37.739-9.852 c6.931-3.215,11.199-6.873,13.053-11.166c0.556-1.287,0.881-2.621,0.954-3.979c0.261-4.607-2.999-8.676-7.56-9.424 c-51.585-8.502-74.824-61.506-75.785-63.758c-0.062-0.148-0.132-0.295-0.205-0.438c-2.637-5.354-3.246-9.777-1.816-13.148 c2.814-6.631,13.621-10.062,20.771-12.332c2.07-0.652,4.021-1.272,5.646-1.914c7.039-2.78,12.07-5.796,15.389-9.221 c3.964-4.083,4.736-7.995,4.688-10.555c-0.121-6.194-4.856-11.698-12.388-14.393c-2.544-1.052-5.445-1.607-8.399-1.607 c-2.011,0-4.989,0.276-7.808,1.592c-6.035,2.824-11.441,4.368-16.082,4.588c-2.468-0.125-4.199-0.66-5.32-1.171 c0.141-2.416,0.297-4.898,0.458-7.486l0.067-1.108c1.653-26.19,3.707-58.784-4.92-78.134c-5.913-13.253-13.853-24.651-23.604-33.892 c-8.178-7.744-17.678-14.021-28.242-18.661C434.052,116.402,416.914,115.197,408.336,115.197"/><rect x="147.553" y="39.443" style="fill:none;" width="514.231" height="514.23"/></svg>',
+      import: {
+        name: "useScriptSnapchatPixel",
+        from: resolve("./runtime/registry/snapchat-pixel")
+      }
+    },
     // ads
     {
       label: "Google Adsense",
@@ -230,11 +239,7 @@ const registry = (resolve) => {
       },
       logo: `<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="#8AB4F8" d="m150.262 245.516l-44.437-43.331l95.433-97.454l46.007 45.091z"/><path fill="#4285F4" d="M150.45 53.938L106.176 8.731L9.36 104.629c-12.48 12.48-12.48 32.713 0 45.207l95.36 95.986l45.09-42.182l-72.654-76.407z"/><path fill="#8AB4F8" d="m246.625 105.37l-96-96c-12.494-12.494-32.756-12.494-45.25 0c-12.495 12.495-12.495 32.757 0 45.252l96 96c12.494 12.494 32.756 12.494 45.25 0c12.495-12.495 12.495-32.757 0-45.251"/><circle cx="127.265" cy="224.731" r="31.273" fill="#246FDB"/></svg>`,
       scriptBundling(options) {
-        const data = GoogleTagManager(options);
-        const mainScript = data.scripts?.find(({ key }) => key === "gtag");
-        if (mainScript && "url" in mainScript && mainScript.url)
-          return mainScript.url;
-        return false;
+        return withQuery("https://www.googletagmanager.com/gtag/js", { id: options?.id, l: options?.l });
       }
     },
     {
@@ -246,11 +251,16 @@ const registry = (resolve) => {
       },
       logo: `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" width="192px" height="192px" viewBox="0 0 192 192" enable-background="new 0 0 192 192" xml:space="preserve"><rect x="0" y="0" fill="none" width="192" height="192"/><g><g><path fill="#F9AB00" d="M130,29v132c0,14.77,10.19,23,21,23c10,0,21-7,21-23V30c0-13.54-10-22-21-22S130,17.33,130,29z"/></g><g><path fill="#E37400" d="M75,96v65c0,14.77,10.19,23,21,23c10,0,21-7,21-23V97c0-13.54-10-22-21-22S75,84.33,75,96z"/></g><g><circle fill="#E37400" cx="41" cy="163" r="21"/></g></g></svg>`,
       scriptBundling(options) {
-        const data = GoogleAnalytics(options);
-        const mainScript = data.scripts?.find(({ key }) => key === "gtag");
-        if (mainScript && "url" in mainScript && mainScript.url)
-          return mainScript.url;
-        return false;
+        return withQuery("https://www.googletagmanager.com/gtag/js", { id: options?.id, l: options?.l });
+      }
+    },
+    {
+      label: "Umami Analytics",
+      category: "analytics",
+      logo: `<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 24 24"><path fill="currentColor" d="M2.203 8.611H.857a.845.845 0 0 0-.841.841v.858a13 13 0 0 0-.016.6c0 6.627 5.373 12 12 12c6.527 0 11.837-5.212 11.996-11.701c0-.025.004-.05.004-.075V9.452a.845.845 0 0 0-.841-.841h-1.346c-1.159-4.329-5.112-7.521-9.805-7.521S3.363 4.282 2.203 8.611m18.444 0H3.37c1.127-3.702 4.57-6.399 8.638-6.399c4.069 0 7.512 2.697 8.639 6.399"/></svg>`,
+      import: {
+        name: "useScriptUmamiAnalytics",
+        from: resolve("./runtime/registry/umami-analytics")
       }
     }
   ];

package/dist/runtime/components/ScriptAriaLoadingIndicator.vue

@@ -0,0 +1,7 @@
+<template>
+  <div class="sr-only" aria-label="Loading..." role="status" />
+</template>
+
+<style scoped>
+.sr-only{height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px;clip:rect(0,0,0,0);border:0}
+</style>

package/dist/runtime/components/ScriptCarbonAds.vue

@@ -1,12 +1,13 @@
 <script setup lang="ts">
 import { withQuery } from 'ufo'
+import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
 import { useScriptTriggerElement } from '../composables/useScriptTriggerElement'
-import { computed, onBeforeUnmount, onMounted, ref } from '#imports'
-import type { ElementScriptTrigger } from '#nuxt-scripts'
+import type { ElementScriptTrigger } from '#nuxt-scripts/types'
 
 const props = defineProps<{
   serve: string
   placement: string
+  format: string
   /**
    * Defines the trigger event to load the script.
    */
@@ -29,19 +30,23 @@ function loadCarbon() {
   }
   status.value = 'loading'
   const script = document.createElement('script')
-  script.setAttribute('type', 'text/javascript')
   script.setAttribute('src', withQuery('https://cdn.carbonads.com/carbon.js', {
     serve: props.serve,
     placement: props.placement,
+    format: props.format,
   }))
   script.setAttribute('id', attrId)
   script.onerror = (err) => {
-    status.value = 'error'
-    emit('error', err)
+    if (status.value !== 'error') {
+      status.value = 'error'
+      emit('error', err)
+    }
   }
   script.onload = () => {
-    status.value = 'loaded'
-    emit('ready', script)
+    if (status.value !== 'loaded') {
+      status.value = 'loaded'
+      emit('ready', script)
+    }
   }
   carbonadsEl.value.appendChild(script)
 }

package/dist/runtime/components/ScriptCrisp.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
+import { ref, onMounted, onBeforeUnmount, watch, computed } from 'vue'
 import { useScriptTriggerElement } from '../composables/useScriptTriggerElement'
 import { useScriptCrisp } from '../registry/crisp'
-import { ref, onMounted, onBeforeUnmount, watch, computed } from '#imports'
-import type { ElementScriptTrigger } from '#nuxt-scripts'
+import type { ElementScriptTrigger } from '#nuxt-scripts/types'
 
 const props = withDefaults(defineProps<{
   /**

package/dist/runtime/components/ScriptGoogleAdsense.vue

@@ -1,13 +1,16 @@
 <script setup lang="ts">
+import { computed, onMounted, ref, watch } from 'vue'
+import { callOnce } from 'nuxt/app'
 import { useScriptTriggerElement } from '../composables/useScriptTriggerElement'
 import { useScriptGoogleAdsense } from '../registry/google-adsense'
-import { callOnce, computed, onMounted, ref, watch } from '#imports'
-import type { ElementScriptTrigger } from '#nuxt-scripts'
+import { scriptRuntimeConfig } from '../utils'
+import type { ElementScriptTrigger } from '#nuxt-scripts/types'
 
 const props = withDefaults(defineProps<{
   dataAdClient: string
   dataAdSlot: string
-  dataAdFormat?: 'auto'
+  dataAdFormat?: 'auto' | 'rectangle' | 'vertical' | 'horizontal' | 'fluid' | 'autorelaxed'
+  dataAdLayout?: 'in-article' | 'in-feed' | 'fixed'
   dataFullWidthResponsive?: boolean
   /**
    * Defines the trigger event to load the script.
@@ -15,6 +18,7 @@ const props = withDefaults(defineProps<{
   trigger?: ElementScriptTrigger
 }>(), {
   dataFullWidthResponsive: true,
+  dataAdFormat: undefined, // Preserve previous behavior
 })
 
 const emits = defineEmits<{
@@ -26,8 +30,13 @@ const emits = defineEmits<{
 const rootEl = ref(null)
 const trigger = useScriptTriggerElement({ trigger: props.trigger, el: rootEl })
 
+const scriptConfig = scriptRuntimeConfig('googleAdsense')
+const addClient = computed(() => {
+  return props.dataAdClient || scriptConfig?.client
+})
+
 const instance = useScriptGoogleAdsense({
-  client: props.dataAdClient,
+  client: addClient.value,
   scriptOptions: {
     trigger,
   },
@@ -69,9 +78,10 @@ const rootAttrs = computed(() => {
     ref="rootEl"
     class="adsbygoogle"
     style="display: block;"
-    :data-ad-client="dataAdClient"
+    :data-ad-client="addClient"
     :data-ad-slot="dataAdSlot"
     :data-ad-format="dataAdFormat"
+    :data-ad-layout="dataAdLayout"
     :data-full-width-responsive="dataFullWidthResponsive"
     v-bind="rootAttrs"
   >

package/dist/runtime/components/ScriptGoogleMaps.vue

@@ -6,11 +6,12 @@ import { withQuery } from 'ufo'
 import type { QueryObject } from 'ufo'
 import { defu } from 'defu'
 import { hash } from 'ohash'
+import { useHead } from '@unhead/vue'
 import type { ElementScriptTrigger } from '../types'
 import { scriptRuntimeConfig } from '../utils'
 import { useScriptTriggerElement } from '../composables/useScriptTriggerElement'
 import { useScriptGoogleMaps } from '../registry/google-maps'
-import { resolveComponent, useHead } from '#imports'
+import ScriptAriaLoadingIndicator from './ScriptAriaLoadingIndicator.vue'
 
 interface PlaceholderOptions {
   width?: string | number
@@ -440,8 +441,6 @@ const rootAttrs = computed(() => {
   }) as HTMLAttributes
 })
 
-const ScriptLoadingIndicator = resolveComponent('ScriptLoadingIndicator')
-
 onBeforeUnmount(async () => {
   await Promise.all([...mapMarkers.value.entries()].map(([,marker]) => resetMapMarkerMap(marker)))
   mapMarkers.value.clear()
@@ -458,7 +457,7 @@ onBeforeUnmount(async () => {
       <img v-bind="placeholderAttrs">
     </slot>
     <slot v-if="status !== 'awaitingLoad' && !ready" name="loading">
-      <ScriptLoadingIndicator color="black" />
+      <ScriptAriaLoadingIndicator />
     </slot>
     <slot v-if="status === 'awaitingLoad'" name="awaitingLoad" />
     <slot v-else-if="status === 'error'" name="error" />

package/dist/runtime/components/ScriptIntercom.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
+import { ref, onMounted, watch, onBeforeUnmount, computed } from 'vue'
 import { useScriptIntercom } from '../registry/intercom'
 import { useScriptTriggerElement } from '../composables/useScriptTriggerElement'
-import { ref, onMounted, watch, onBeforeUnmount, computed } from '#imports'
-import type { ElementScriptTrigger } from '#nuxt-scripts'
+import type { ElementScriptTrigger } from '#nuxt-scripts/types'
 
 const props = withDefaults(defineProps<{
   appId: string

package/dist/runtime/components/ScriptLemonSqueezy.vue

@@ -1,9 +1,9 @@
 <script lang="ts" setup>
+import { computed, onMounted, ref } from 'vue'
 import type { ElementScriptTrigger } from '../types'
 import { useScriptTriggerElement } from '../composables/useScriptTriggerElement'
 import { useScriptLemonSqueezy } from '../registry/lemon-squeezy'
 import type { LemonSqueezyEventPayload } from '../registry/lemon-squeezy'
-import { computed, onMounted, ref } from '#imports'
 
 const props = withDefaults(defineProps<{
   trigger?: ElementScriptTrigger

package/dist/runtime/components/ScriptLoadingIndicator.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed } from '#imports'
+import { computed } from 'vue'
 
 const props = withDefaults(defineProps<{
   color?: string

package/dist/runtime/components/ScriptStripePricingTable.vue

@@ -1,9 +1,8 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, computed, onBeforeUnmount, onMounted, watch } from 'vue'
 import type { ElementScriptTrigger } from '../types'
 import { useScriptTriggerElement } from '../composables/useScriptTriggerElement'
 import { useScript } from '../composables/useScript'
-import { computed, onBeforeUnmount, onMounted, watch } from '#imports'
 
 const props = withDefaults(defineProps<{
   trigger?: ElementScriptTrigger

package/dist/runtime/components/ScriptVimeoPlayer.vue

@@ -3,10 +3,12 @@
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import type { HTMLAttributes, ImgHTMLAttributes } from 'vue'
 import { defu } from 'defu'
+import { useAsyncData } from 'nuxt/app'
+import { useHead } from '@unhead/vue'
 import type { ElementScriptTrigger } from '../types'
 import { useScriptTriggerElement } from '../composables/useScriptTriggerElement'
 import { useScriptVimeoPlayer } from '../registry/vimeo-player'
-import { useAsyncData, useHead } from '#imports'
+import ScriptAriaLoadingIndicator from './ScriptAriaLoadingIndicator.vue'
 
 interface VimeoOptions {
   // copied from @types/vimeo__player
@@ -237,7 +239,7 @@ const rootAttrs = computed(() => {
     'role': 'application',
     'style': {
       maxWidth: '100%',
-      width: `${width.value}px`,
+      width: `auto`,
       height: 'auto',
       aspectRatio: `16/9`,
       position: 'relative',
@@ -273,7 +275,7 @@ onBeforeUnmount(() => player?.unload())
       <img v-if="placeholder" v-bind="placeholderAttrs">
     </slot>
     <slot v-if="status === 'loading'" name="loading">
-      <ScriptLoadingIndicator color="white" />
+      <ScriptAriaLoadingIndicator color="white" />
     </slot>
     <slot v-if="status === 'awaitingLoad'" name="awaitingLoad" />
     <slot v-else-if="status === 'error'" name="error" />

package/dist/runtime/components/ScriptYouTubePlayer.vue

@@ -3,10 +3,25 @@
 import { computed, onMounted, ref, watch } from 'vue'
 import type { HTMLAttributes, ImgHTMLAttributes, Ref } from 'vue'
 import { defu } from 'defu'
+import { useHead } from '@unhead/vue'
 import type { ElementScriptTrigger } from '../types'
 import { useScriptTriggerElement } from '../composables/useScriptTriggerElement'
 import { useScriptYouTubePlayer } from '../registry/youtube-player'
-import { useHead } from '#imports'
+import ScriptAriaLoadingIndicator from './ScriptAriaLoadingIndicator.vue'
+
+export type YoutubeThumbnailSize =
+// 120x90
+  '1' | '2' | '3' | 'default' |
+  // 320x180
+  'mq1' | 'mq2' | 'mq3' | 'mqdefault' |
+  // 480x360
+  '0' | 'hq1' | 'hq2' | 'hq3' | 'hqdefault' |
+  // 640x480
+  'sd1' | 'sd2' | 'sd3' | 'sddefault' |
+  // 1280x720
+  'hq720' |
+  // 1920x1080
+  'maxresdefault'
 
 const props = withDefaults(defineProps<{
   placeholderAttrs?: ImgHTMLAttributes
@@ -17,12 +32,24 @@ const props = withDefaults(defineProps<{
   playerVars?: YT.PlayerVars
   width?: number
   height?: number
+  /**
+   * Whether to use youtube-nocookie.com for embedding.
+   *
+   * @default false
+   */
+  cookies?: boolean
+  playerOptions?: YT.PlayerOptions
+  thumbnailSize?: YoutubeThumbnailSize
+  webp?: boolean
 }>(), {
+  cookies: false,
   trigger: 'mousedown',
+  thumbnailSize: 'hq720',
+  webp: true,
   // @ts-expect-error untyped
   playerVars: { autoplay: 0, playsinline: 1 },
   width: 640,
-  height: 480,
+  height: 360,
 })
 
 const emits = defineEmits<{
@@ -70,7 +97,9 @@ onMounted(() => {
         resolve()
     })
     player.value = new YT.Player(youtubeEl.value, {
+      host: !props.cookies ? 'https://www.youtube-nocookie.com' : 'https://www.youtube.com',
       ...props,
+      ...props.playerOptions,
       events: Object.fromEntries(events.map(event => [event, (e: any) => {
         const emitEventName = event.replace(/([A-Z])/g, '-$1').replace('on-', '').toLowerCase()
         // @ts-expect-error untyped
@@ -115,15 +144,15 @@ const rootAttrs = computed(() => {
       position: 'relative',
       backgroundColor: 'black',
       maxWidth: '100%',
-      width: `${props.width}px`,
-      height: 'auto',
       aspectRatio: `${props.width}/${props.height}`,
     },
     ...(trigger instanceof Promise ? trigger.ssrAttrs || {} : {}),
   }) as HTMLAttributes
 })
 
-const placeholder = computed(() => `https://i.ytimg.com/vi_webp/${props.videoId}/sddefault.webp`)
+const fallbackPlaceHolder = computed(() => `https://i.ytimg.com/vi/${props.videoId}/hqdefault.jpg`)
+const placeholder = computed(() => `https://i.ytimg.com/${props.webp ? 'vi_webp' : 'vi'}/${props.videoId}/${props.thumbnailSize}.${props.webp ? 'webp' : 'jpg'}`)
+const isFallbackPlaceHolder = ref(false)
 
 if (import.meta.server) {
   // dns-prefetch https://i.vimeocdn.com
@@ -149,7 +178,7 @@ if (import.meta.server) {
 
 const placeholderAttrs = computed(() => {
   return defu(props.placeholderAttrs, {
-    src: placeholder.value,
+    src: isFallbackPlaceHolder.value ? fallbackPlaceHolder.value : placeholder.value,
     alt: '',
     loading: props.aboveTheFold ? 'eager' : 'lazy',
     style: {
@@ -157,6 +186,12 @@ const placeholderAttrs = computed(() => {
       objectFit: 'contain',
       height: '100%',
     },
+    onLoad(payload) {
+      const img = payload.target as HTMLImageElement
+      if (img.naturalWidth === 120 && img.naturalHeight === 90) {
+        isFallbackPlaceHolder.value = true
+      }
+    },
   } satisfies ImgHTMLAttributes)
 })
 </script>
@@ -168,7 +203,7 @@ const placeholderAttrs = computed(() => {
       <img v-bind="placeholderAttrs">
     </slot>
     <slot v-if="status === 'loading'" name="loading">
-      <ScriptLoadingIndicator />
+      <ScriptAriaLoadingIndicator />
     </slot>
     <slot v-if="status === 'awaitingLoad'" name="awaitingLoad" />
     <slot v-else-if="status === 'error'" name="error" />

package/dist/runtime/composables/useScript.d.ts

@@ -1,4 +1,4 @@
 import type { UseScriptInput } from '@unhead/vue';
 import type { UseFunctionType } from '@unhead/schema';
-import type { NuxtUseScriptOptions, UseScriptContext } from '#nuxt-scripts';
+import type { NuxtUseScriptOptions, UseScriptContext } from '#nuxt-scripts/types';
 export declare function useScript<T extends Record<symbol | string, any> = Record<symbol | string, any>, U = Record<symbol | string, any>>(input: UseScriptInput, options?: NuxtUseScriptOptions<T, U>): UseScriptContext<UseFunctionType<NuxtUseScriptOptions<T, U>, T>>;

package/dist/runtime/composables/useScript.js

@@ -1,9 +1,10 @@
 import { resolveScriptKey } from "unhead";
 import { defu } from "defu";
-import { useScript as _useScript } from "@unhead/vue";
+import { useScript as _useScript, injectHead } from "@unhead/vue";
 import { parseURL } from "ufo";
+import { onNuxtReady, useHead, useNuxtApp, useRuntimeConfig } from "nuxt/app";
+import { reactive } from "vue";
 import { pick } from "../utils.js";
-import { injectHead, onNuxtReady, useHead, useNuxtApp, useRuntimeConfig, reactive } from "#imports";
 function useNuxtScriptRuntimeConfig() {
   return useRuntimeConfig().public["nuxt-scripts"];
 }

package/dist/runtime/composables/useScriptEventPage.d.ts

@@ -1,4 +1,4 @@
-import type { TrackedPage } from '#nuxt-scripts';
+import type { TrackedPage } from '#nuxt-scripts/types';
 export declare function useScriptEventPage(onChange?: (payload: TrackedPage) => void): import("vue").Ref<{
     title?: string | undefined;
     path: string;

package/dist/runtime/composables/useScriptEventPage.js

@@ -1,4 +1,6 @@
-import { injectHead, ref, useNuxtApp, useRoute } from "#imports";
+import { injectHead } from "@unhead/vue";
+import { useNuxtApp, useRoute } from "nuxt/app";
+import { ref } from "vue";
 export function useScriptEventPage(onChange) {
   const nuxt = useNuxtApp();
   const route = useRoute();

package/dist/runtime/composables/useScriptTriggerConsent.js

@@ -1,4 +1,5 @@
-import { isRef, onNuxtReady, ref, requestIdleCallback, toValue, tryUseNuxtApp, watch } from "#imports";
+import { isRef, ref, toValue, watch } from "vue";
+import { tryUseNuxtApp, onNuxtReady, requestIdleCallback } from "nuxt/app";
 export function useScriptTriggerConsent(options) {
   if (import.meta.server)
     return new Promise(() => {