unhead 1.9.4 → 1.9.6

package/dist/index.cjs

@@ -453,9 +453,9 @@ function useScript(_input, _options) {
   if (!head)
     throw new Error("Missing Unhead context.");
   const id = input.key || shared.hashCode(input.src || (typeof input.innerHTML === "string" ? input.innerHTML : ""));
-  const key = `use-script.${id}`;
   if (head._scripts?.[id])
     return head._scripts[id];
+  options.beforeInit?.();
   const syncStatus = (s) => {
     script.status = s;
     head.hooks.callHook(`script:updated`, hookCtx);
@@ -469,20 +469,21 @@ function useScript(_input, _options) {
     };
   });
   const loadPromise = new Promise((resolve, reject) => {
-    const cleanUp = head.hooks.hook("script:updated", ({ script: script2 }) => {
+    const _ = head.hooks.hook("script:updated", ({ script: script2 }) => {
       if (script2.id === id && (script2.status === "loaded" || script2.status === "error")) {
-        if (script2.status === "loaded")
-          resolve(options.use?.());
-        else if (script2.status === "error")
+        if (script2.status === "loaded") {
+          const api = options.use?.();
+          api && resolve(api);
+        } else if (script2.status === "error") {
           reject(new Error(`Failed to load script: ${input.src}`));
-        cleanUp();
+        }
+        _();
       }
     });
   });
   const script = {
     id,
     status: "awaitingLoad",
-    loaded: false,
     remove() {
       if (script.entry) {
         script.entry.dispose();
@@ -495,8 +496,16 @@ function useScript(_input, _options) {
     load() {
       if (!script.entry) {
         syncStatus("loading");
+        const defaults = {
+          defer: true,
+          fetchpriority: "low"
+        };
+        if (input.src && (input.src.startsWith("http") || input.src.startsWith("//"))) {
+          defaults.crossorigin = "anonymous";
+          defaults.referrerpolicy = "no-referrer";
+        }
         script.entry = head.push({
-          script: [{ defer: true, fetchpriority: "low", ...input, key }]
+          script: [{ ...defaults, ...input, key: `script.${id}` }]
         }, options);
       }
       return loadPromise;
@@ -509,21 +518,6 @@ function useScript(_input, _options) {
     trigger.then(script.load);
   else if (typeof trigger === "function")
     trigger(script.load);
-  const removeHook = head.hooks.hook("dom:renderTag", (ctx) => {
-    if (ctx.tag.key !== key)
-      return;
-    if (ctx.tag.innerHTML) {
-      setTimeout(
-        () => {
-          syncStatus("loaded");
-          typeof input.onload === "function" && input.onload.call(options.eventContext, new Event("load"));
-        },
-        5
-        /* give inline script a chance to run */
-      );
-    }
-    removeHook();
-  });
   const instance = new Proxy({}, {
     get(_, fn) {
       const $script = Object.assign(loadPromise, script);
@@ -532,13 +526,16 @@ function useScript(_input, _options) {
         return stub;
       if (fn === "$script")
         return $script;
-      return (...args) => {
-        const hookCtx2 = { script, fn, args };
-        head.hooks.callHook("script:instance-fn", hookCtx2);
-        if (head.ssr || !options.use)
+      const attempt = (args) => {
+        if (head.ssr)
           return;
-        return script.status === "loaded" ? options.use()[fn]?.(...args) : loadPromise.then((api) => api[fn]?.(...args));
+        const api = options.use?.();
+        const exists = !!(api && fn in api);
+        const hookCtx2 = { script, fn, args, exists };
+        head.hooks.callHook("script:instance-fn", hookCtx2);
+        return exists && api[fn];
       };
+      return attempt() || ((...args) => loadPromise.then(() => attempt(args)(...args)));
     }
   });
   head._scripts = Object.assign(

package/dist/index.d.cts

@@ -47,8 +47,8 @@ declare function useServerSeoMeta(input: UseSeoMetaInput, options?: HeadEntryOpt
  * @experimental
  * @see https://unhead.unjs.io/usage/composables/use-script
  */
-declare function useScript<T>(_input: UseScriptInput, _options?: UseScriptOptions<T>): T & {
-    $script: ScriptInstance<T>;
+declare function useScript<T extends Record<symbol | string, any>>(_input: UseScriptInput, _options?: UseScriptOptions<T>): T & {
+    $script: Promise<T> & ScriptInstance<T>;
 };
 
 export { CapoPlugin, HashHydrationPlugin, type UseHeadInput, createHead, createHeadCore, createServerHead, getActiveHead, unheadComposablesImports, useHead, useHeadSafe, useScript, useSeoMeta, useServerHead, useServerHeadSafe, useServerSeoMeta };

package/dist/index.d.mts

@@ -47,8 +47,8 @@ declare function useServerSeoMeta(input: UseSeoMetaInput, options?: HeadEntryOpt
  * @experimental
  * @see https://unhead.unjs.io/usage/composables/use-script
  */
-declare function useScript<T>(_input: UseScriptInput, _options?: UseScriptOptions<T>): T & {
-    $script: ScriptInstance<T>;
+declare function useScript<T extends Record<symbol | string, any>>(_input: UseScriptInput, _options?: UseScriptOptions<T>): T & {
+    $script: Promise<T> & ScriptInstance<T>;
 };
 
 export { CapoPlugin, HashHydrationPlugin, type UseHeadInput, createHead, createHeadCore, createServerHead, getActiveHead, unheadComposablesImports, useHead, useHeadSafe, useScript, useSeoMeta, useServerHead, useServerHeadSafe, useServerSeoMeta };

package/dist/index.d.ts

@@ -47,8 +47,8 @@ declare function useServerSeoMeta(input: UseSeoMetaInput, options?: HeadEntryOpt
  * @experimental
  * @see https://unhead.unjs.io/usage/composables/use-script
  */
-declare function useScript<T>(_input: UseScriptInput, _options?: UseScriptOptions<T>): T & {
-    $script: ScriptInstance<T>;
+declare function useScript<T extends Record<symbol | string, any>>(_input: UseScriptInput, _options?: UseScriptOptions<T>): T & {
+    $script: Promise<T> & ScriptInstance<T>;
 };
 
 export { CapoPlugin, HashHydrationPlugin, type UseHeadInput, createHead, createHeadCore, createServerHead, getActiveHead, unheadComposablesImports, useHead, useHeadSafe, useScript, useSeoMeta, useServerHead, useServerHeadSafe, useServerSeoMeta };

package/dist/index.mjs

@@ -452,9 +452,9 @@ function useScript(_input, _options) {
   if (!head)
     throw new Error("Missing Unhead context.");
   const id = input.key || hashCode(input.src || (typeof input.innerHTML === "string" ? input.innerHTML : ""));
-  const key = `use-script.${id}`;
   if (head._scripts?.[id])
     return head._scripts[id];
+  options.beforeInit?.();
   const syncStatus = (s) => {
     script.status = s;
     head.hooks.callHook(`script:updated`, hookCtx);
@@ -468,20 +468,21 @@ function useScript(_input, _options) {
     };
   });
   const loadPromise = new Promise((resolve, reject) => {
-    const cleanUp = head.hooks.hook("script:updated", ({ script: script2 }) => {
+    const _ = head.hooks.hook("script:updated", ({ script: script2 }) => {
       if (script2.id === id && (script2.status === "loaded" || script2.status === "error")) {
-        if (script2.status === "loaded")
-          resolve(options.use?.());
-        else if (script2.status === "error")
+        if (script2.status === "loaded") {
+          const api = options.use?.();
+          api && resolve(api);
+        } else if (script2.status === "error") {
           reject(new Error(`Failed to load script: ${input.src}`));
-        cleanUp();
+        }
+        _();
       }
     });
   });
   const script = {
     id,
     status: "awaitingLoad",
-    loaded: false,
     remove() {
       if (script.entry) {
         script.entry.dispose();
@@ -494,8 +495,16 @@ function useScript(_input, _options) {
     load() {
       if (!script.entry) {
         syncStatus("loading");
+        const defaults = {
+          defer: true,
+          fetchpriority: "low"
+        };
+        if (input.src && (input.src.startsWith("http") || input.src.startsWith("//"))) {
+          defaults.crossorigin = "anonymous";
+          defaults.referrerpolicy = "no-referrer";
+        }
         script.entry = head.push({
-          script: [{ defer: true, fetchpriority: "low", ...input, key }]
+          script: [{ ...defaults, ...input, key: `script.${id}` }]
         }, options);
       }
       return loadPromise;
@@ -508,21 +517,6 @@ function useScript(_input, _options) {
     trigger.then(script.load);
   else if (typeof trigger === "function")
     trigger(script.load);
-  const removeHook = head.hooks.hook("dom:renderTag", (ctx) => {
-    if (ctx.tag.key !== key)
-      return;
-    if (ctx.tag.innerHTML) {
-      setTimeout(
-        () => {
-          syncStatus("loaded");
-          typeof input.onload === "function" && input.onload.call(options.eventContext, new Event("load"));
-        },
-        5
-        /* give inline script a chance to run */
-      );
-    }
-    removeHook();
-  });
   const instance = new Proxy({}, {
     get(_, fn) {
       const $script = Object.assign(loadPromise, script);
@@ -531,13 +525,16 @@ function useScript(_input, _options) {
         return stub;
       if (fn === "$script")
         return $script;
-      return (...args) => {
-        const hookCtx2 = { script, fn, args };
-        head.hooks.callHook("script:instance-fn", hookCtx2);
-        if (head.ssr || !options.use)
+      const attempt = (args) => {
+        if (head.ssr)
           return;
-        return script.status === "loaded" ? options.use()[fn]?.(...args) : loadPromise.then((api) => api[fn]?.(...args));
+        const api = options.use?.();
+        const exists = !!(api && fn in api);
+        const hookCtx2 = { script, fn, args, exists };
+        head.hooks.callHook("script:instance-fn", hookCtx2);
+        return exists && api[fn];
       };
+      return attempt() || ((...args) => loadPromise.then(() => attempt(args)(...args)));
     }
   });
   head._scripts = Object.assign(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unhead",
   "type": "module",
-  "version": "1.9.4",
+  "version": "1.9.6",
   "author": {
     "name": "Harlan Wilton",
     "email": "harlan@harlanzw.com",
@@ -34,9 +34,9 @@
   ],
   "dependencies": {
     "hookable": "^5.5.3",
-    "@unhead/dom": "1.9.4",
-    "@unhead/schema": "1.9.4",
-    "@unhead/shared": "1.9.4"
+    "@unhead/dom": "1.9.6",
+    "@unhead/schema": "1.9.6",
+    "@unhead/shared": "1.9.6"
   },
   "scripts": {
     "build": "unbuild .",