@nuxt/scripts 0.11.13 → 0.12.1

package/dist/runtime/utils.d.ts

@@ -2,7 +2,11 @@ import type { ObjectSchema } from 'valibot';
 import type { UseScriptInput } from '@unhead/vue';
 import type { EmptyOptionsSchema, InferIfSchema, NuxtUseScriptOptions, RegistryScriptInput, UseFunctionType, ScriptRegistry, UseScriptContext } from '#nuxt-scripts/types';
 export type MaybePromise<T> = Promise<T> | T;
-type OptionsFn<O> = (options: InferIfSchema<O>) => ({
+type OptionsFn<O> = (options: InferIfSchema<O>, ctx: {
+    scriptInput?: UseScriptInput & {
+        src?: string;
+    };
+}) => ({
     scriptInput?: UseScriptInput;
     scriptOptions?: NuxtUseScriptOptions;
     schema?: O extends ObjectSchema<any, any> ? O : undefined;
@@ -10,5 +14,4 @@ type OptionsFn<O> = (options: InferIfSchema<O>) => ({
 });
 export declare function scriptRuntimeConfig<T extends keyof ScriptRegistry>(key: T): ScriptRegistry[T];
 export declare function useRegistryScript<T extends Record<string | symbol, any>, O = EmptyOptionsSchema>(registryKey: keyof ScriptRegistry | string, optionsFn: OptionsFn<O>, _userOptions?: RegistryScriptInput<O>): UseScriptContext<UseFunctionType<NuxtUseScriptOptions<T>, T>>;
-export declare function pick(obj: Record<string, any>, keys: string[]): Record<string, any>;
 export {};

package/dist/runtime/utils.js

@@ -2,15 +2,16 @@ import { defu } from "defu";
 import { useRuntimeConfig } from "nuxt/app";
 import { useScript } from "./composables/useScript.js";
 import { parse } from "#nuxt-scripts-validator";
+import { parseURL, withQuery, parseQuery } from "ufo";
 function validateScriptInputSchema(key, schema, options) {
   if (import.meta.dev) {
     try {
       parse(schema, options);
     } catch (_e) {
-      const e = _e;
-      console.error(e.issues.map((i) => `${key}.${i.path?.map((i2) => i2.key).join(",")}: ${i.message}`).join("\n"));
+      return _e;
     }
   }
+  return null;
 }
 export function scriptRuntimeConfig(key) {
   return (useRuntimeConfig().public.scripts || {})[key];
@@ -18,11 +19,47 @@ export function scriptRuntimeConfig(key) {
 export function useRegistryScript(registryKey, optionsFn, _userOptions) {
   const scriptConfig = scriptRuntimeConfig(registryKey);
   const userOptions = Object.assign(_userOptions || {}, typeof scriptConfig === "object" ? scriptConfig : {});
-  const options = optionsFn(userOptions);
-  const scriptInput = defu(userOptions.scriptInput, options.scriptInput, { key: registryKey });
+  const options = optionsFn(userOptions, { scriptInput: userOptions.scriptInput });
+  let finalScriptInput = options.scriptInput;
+  const userSrc = userOptions.scriptInput?.src;
+  const optionsSrc = options.scriptInput?.src;
+  if (userSrc && optionsSrc && typeof optionsSrc === "string" && typeof userSrc === "string") {
+    const defaultUrl = parseURL(optionsSrc);
+    const customUrl = parseURL(userSrc);
+    const defaultQuery = parseQuery(defaultUrl.search || "");
+    const customQuery = parseQuery(customUrl.search || "");
+    const mergedQuery = { ...defaultQuery, ...customQuery };
+    const baseUrl = customUrl.href?.split("?")[0] || userSrc;
+    finalScriptInput = {
+      ...options.scriptInput || {},
+      src: withQuery(baseUrl, mergedQuery)
+    };
+  }
+  const scriptInput = defu(finalScriptInput, userOptions.scriptInput, { key: registryKey });
   const scriptOptions = Object.assign(userOptions?.scriptOptions || {}, options.scriptOptions || {});
   if (import.meta.dev) {
-    scriptOptions.devtools = defu(scriptOptions.devtools, { registryKey });
+    const error = new Error("Stack trace for component location");
+    const stack = error.stack?.split("\n");
+    const callerLine = stack?.find(
+      (line) => line.includes(".vue") && !line.includes("useRegistryScript") && !line.includes("node_modules")
+    );
+    let loadedFrom = "unknown";
+    if (callerLine) {
+      const urlMatch = callerLine.match(/https?:\/\/[^/]+\/_nuxt\/(.+\.vue)(?:\?[^)]*)?:(\d+):(\d+)/) || callerLine.match(/\(https?:\/\/[^/]+\/_nuxt\/(.+\.vue)(?:\?[^)]*)?:(\d+):(\d+)\)/);
+      if (urlMatch) {
+        const [, filePath, line, column] = urlMatch;
+        loadedFrom = `./${filePath}:${line}:${column}`;
+      } else {
+        const vueMatch = callerLine.match(/([^/\s]+\.vue):(\d+):(\d+)/);
+        if (vueMatch) {
+          const [, fileName, line, column] = vueMatch;
+          loadedFrom = `./${fileName}:${line}:${column}`;
+        } else {
+          loadedFrom = callerLine.trim().replace(/^\s*at\s+/, "");
+        }
+      }
+    }
+    scriptOptions.devtools = defu(scriptOptions.devtools, { registryKey, loadedFrom });
     if (options.schema) {
       const registryMeta = {};
       for (const k in options.schema.entries) {
@@ -34,12 +71,14 @@ export function useRegistryScript(registryKey, optionsFn, _userOptions) {
     }
   }
   const init = scriptOptions.beforeInit;
-  scriptOptions.beforeInit = () => {
-    if (import.meta.dev && !scriptOptions.skipValidation && options.schema) {
-      if (!userOptions.scriptInput?.src) {
-        validateScriptInputSchema(registryKey, options.schema, userOptions);
+  if (import.meta.dev) {
+    scriptOptions._validate = () => {
+      if (!userOptions.scriptInput?.src && !scriptOptions.skipValidation && options.schema) {
+        return validateScriptInputSchema(registryKey, options.schema, userOptions);
       }
-    }
+    };
+  }
+  scriptOptions.beforeInit = () => {
     init?.();
     if (import.meta.client) {
       options.clientInit?.();
@@ -47,12 +86,3 @@ export function useRegistryScript(registryKey, optionsFn, _userOptions) {
   };
   return useScript(scriptInput, scriptOptions);
 }
-export function pick(obj, keys) {
-  const res = {};
-  for (const k of keys) {
-    if (k in obj) {
-      res[k] = obj[k];
-    }
-  }
-  return res;
-}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nuxt/scripts",
   "type": "module",
-  "version": "0.11.13",
+  "version": "0.12.1",
   "description": "Load third-party scripts with better performance, privacy and DX in Nuxt Apps.",
   "author": {
     "website": "https://harlanzw.com",
@@ -54,6 +54,8 @@
     ]
   },
   "peerDependencies": {
+    "@googlemaps/markerclusterer": "^2.6.2",
+    "@paypal/paypal-js": "^8.1.2",
     "@stripe/stripe-js": "^7.0.0",
     "@types/google.maps": "^3.58.1",
     "@types/vimeo__player": "^2.18.3",
@@ -64,6 +66,9 @@
     "@stripe/stripe-js": {
       "optional": true
     },
+    "@paypal/paypal-js": {
+      "optional": true
+    },
     "@types/google.maps": {
       "optional": true
     },
@@ -75,47 +80,49 @@
     }
   },
   "dependencies": {
-    "@nuxt/kit": "^4.0.3",
-    "@vueuse/core": "^13.7.0",
+    "@nuxt/kit": "^4.1.2",
+    "@vueuse/core": "^13.9.0",
     "consola": "^3.4.2",
     "defu": "^6.1.4",
     "h3": "^1.15.4",
-    "magic-string": "^0.30.18",
+    "magic-string": "^0.30.19",
     "ofetch": "^1.4.1",
     "ohash": "^2.0.11",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.0",
-    "sirv": "^3.0.1",
+    "sirv": "^3.0.2",
     "std-env": "^3.9.0",
     "ufo": "^1.6.1",
-    "unplugin": "^2.3.8",
-    "unstorage": "^1.16.1",
+    "unplugin": "^2.3.10",
+    "unstorage": "^1.17.1",
     "valibot": "^1.1.0"
   },
   "devDependencies": {
-    "@nuxt/devtools-kit": "^2.6.3",
-    "@nuxt/devtools-ui-kit": "^2.6.3",
+    "@nuxt/devtools-kit": "^2.6.5",
+    "@nuxt/devtools-ui-kit": "^2.6.5",
     "@nuxt/eslint-config": "^1.9.0",
     "@nuxt/module-builder": "^1.0.2",
     "@nuxt/test-utils": "3.19.2",
-    "@types/semver": "^7.7.0",
-    "@typescript-eslint/typescript-estree": "^8.40.0",
+    "@paypal/paypal-js": "^8.4.2",
+    "@types/semver": "^7.7.1",
+    "@typescript-eslint/typescript-estree": "^8.44.1",
+    "@vue/test-utils": "^2.4.6",
     "acorn-loose": "^8.5.2",
     "bumpp": "^10.2.3",
     "changelogen": "^0.6.2",
-    "eslint": "9.33.0",
-    "eslint-plugin-n": "^17.21.3",
+    "eslint": "^9.36.0",
+    "eslint-plugin-n": "^17.23.1",
     "happy-dom": "^18.0.1",
     "knitwork": "^1.2.0",
-    "nuxt": "^4.0.3",
-    "playwright-core": "^1.55.0",
-    "shiki": "3.11.0",
+    "nuxt": "^4.1.2",
+    "playwright-core": "^1.55.1",
+    "shiki": "^3.13.0",
     "typescript": "5.9.2",
     "vitest": "^3.2.4",
-    "vue": "^3.5.19",
+    "vue": "^3.5.22",
     "vue-router": "^4.5.1",
-    "vue-tsc": "^3.0.6",
-    "@nuxt/scripts": "0.11.13"
+    "vue-tsc": "^3.0.8",
+    "@nuxt/scripts": "0.12.1"
   },
   "resolutions": {
     "@nuxt/scripts": "workspace:*"

package/dist/client/_nuxt/1mHV-1pA.js

@@ -1 +0,0 @@
-import{_ as s,c as a,o as i,a as t,t as n,b as u,w as c,d as l,e as d}from"./CQGAJOTU.js";import{u as f}from"./7VVldQq3.js";const p={class:"antialiased bg-white dark:bg-[#020420] dark:text-white font-sans grid min-h-screen overflow-hidden place-content-center text-[#020420] tracking-wide"},m={class:"max-w-520px text-center"},h=["textContent"],g=["textContent"],b=["textContent"],x={class:"flex items-center justify-center w-full"},y={__name:"error-404",props:{appName:{type:String,default:"Nuxt"},statusCode:{type:Number,default:404},statusMessage:{type:String,default:"Page not found"},description:{type:String,default:"Sorry, the page you are looking for could not be found."},backHome:{type:String,default:"Go back home"}},setup(e){const r=e;return f({title:`${r.statusCode} - ${r.statusMessage} | ${r.appName}`,script:[{innerHTML:`!function(){const e=document.createElement("link").relList;if(!(e&&e.supports&&e.supports("modulepreload"))){for(const e of document.querySelectorAll('link[rel="modulepreload"]'))r(e);new MutationObserver(e=>{for(const o of e)if("childList"===o.type)for(const e of o.addedNodes)"LINK"===e.tagName&&"modulepreload"===e.rel&&r(e)}).observe(document,{childList:!0,subtree:!0})}function r(e){if(e.ep)return;e.ep=!0;const r=function(e){const r={};return e.integrity&&(r.integrity=e.integrity),e.referrerPolicy&&(r.referrerPolicy=e.referrerPolicy),"use-credentials"===e.crossOrigin?r.credentials="include":"anonymous"===e.crossOrigin?r.credentials="omit":r.credentials="same-origin",r}(e);fetch(e.href,r)}}();`}],style:[{innerHTML:'*,:after,:before{border-color:var(--un-default-border-color,#e5e7eb);border-style:solid;border-width:0;box-sizing:border-box}:after,:before{--un-content:""}html{line-height:1.5;-webkit-text-size-adjust:100%;font-family:ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal;-moz-tab-size:4;tab-size:4;-webkit-tap-highlight-color:transparent}body{line-height:inherit;margin:0}h1,h2{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}h1,h2,p{margin:0}*,:after,:before{--un-rotate:0;--un-rotate-x:0;--un-rotate-y:0;--un-rotate-z:0;--un-scale-x:1;--un-scale-y:1;--un-scale-z:1;--un-skew-x:0;--un-skew-y:0;--un-translate-x:0;--un-translate-y:0;--un-translate-z:0;--un-pan-x: ;--un-pan-y: ;--un-pinch-zoom: ;--un-scroll-snap-strictness:proximity;--un-ordinal: ;--un-slashed-zero: ;--un-numeric-figure: ;--un-numeric-spacing: ;--un-numeric-fraction: ;--un-border-spacing-x:0;--un-border-spacing-y:0;--un-ring-offset-shadow:0 0 transparent;--un-ring-shadow:0 0 transparent;--un-shadow-inset: ;--un-shadow:0 0 transparent;--un-ring-inset: ;--un-ring-offset-width:0px;--un-ring-offset-color:#fff;--un-ring-width:0px;--un-ring-color:rgba(147,197,253,.5);--un-blur: ;--un-brightness: ;--un-contrast: ;--un-drop-shadow: ;--un-grayscale: ;--un-hue-rotate: ;--un-invert: ;--un-saturate: ;--un-sepia: ;--un-backdrop-blur: ;--un-backdrop-brightness: ;--un-backdrop-contrast: ;--un-backdrop-grayscale: ;--un-backdrop-hue-rotate: ;--un-backdrop-invert: ;--un-backdrop-opacity: ;--un-backdrop-saturate: ;--un-backdrop-sepia: }'}]}),(k,w)=>{const o=d;return i(),a("div",p,[t("div",m,[t("h1",{class:"font-semibold leading-none mb-4 sm:text-[110px] tabular-nums text-[80px]",textContent:n(e.statusCode)},null,8,h),t("h2",{class:"font-semibold mb-2 sm:text-3xl text-2xl",textContent:n(e.statusMessage)},null,8,g),t("p",{class:"mb-4 px-2 text-[#64748B] text-md",textContent:n(e.description)},null,8,b),t("div",x,[u(o,{to:"/",class:"font-medium hover:text-[#00DC82] text-sm underline underline-offset-3"},{default:c(()=>[l(n(e.backHome),1)]),_:1})])])])}}},v=s(y,[["__scopeId","data-v-ce1688cc"]]);export{v as default};

package/dist/client/_nuxt/7VVldQq3.js

@@ -1 +0,0 @@
-import{u as a,f as s,h as u,i as r,g as o}from"./CQGAJOTU.js";function i(e){const n=e||s();return n.ssrContext?.head||n.runWithContext(()=>{if(u()){const t=r(o);if(!t)throw new Error("[nuxt] [unhead] Missing Unhead instance.");return t}})}function c(e,n={}){const t=i(n.nuxt);return a(e,{head:t,...n})}export{c as u};