@nuxt/scripts 1.3.5 → 2.0.0-beta.1

package/dist/runtime/utils/abortable-promise.js

@@ -7,9 +7,11 @@ export function createAbortablePromise(setup, options = {}) {
   const { signal, abortMessage } = options;
   return new Promise((outerResolve, outerReject) => {
     let settled = false;
+    let setupComplete = false;
     let cleanup;
     let onAbort;
-    const finish = (settle, value) => {
+    let pendingSettlement;
+    const settleNow = (settle, value) => {
       if (settled)
         return;
       settled = true;
@@ -24,6 +26,15 @@ export function createAbortablePromise(setup, options = {}) {
       }
       settle(value);
     };
+    const finish = (settle, value) => {
+      if (settled || pendingSettlement)
+        return;
+      if (!setupComplete) {
+        pendingSettlement = { settle, value };
+        return;
+      }
+      settleNow(settle, value);
+    };
     const reject = (reason) => finish(outerReject, reason);
     const resolve = (value) => {
       if (typeof value === "object" && value !== null || typeof value === "function") {
@@ -46,18 +57,28 @@ export function createAbortablePromise(setup, options = {}) {
     };
     onAbort = () => reject(createAbortError(abortMessage));
     if (signal?.aborted) {
+      setupComplete = true;
       onAbort();
       return;
     }
     signal?.addEventListener("abort", onAbort, { once: true });
     try {
       cleanup = setup(resolve, reject) || void 0;
-      if (settled) {
-        cleanup?.();
-        cleanup = void 0;
+      setupComplete = true;
+      if (pendingSettlement) {
+        const { settle, value } = pendingSettlement;
+        pendingSettlement = void 0;
+        settleNow(settle, value);
       }
     } catch (error) {
-      reject(error);
+      setupComplete = true;
+      if (pendingSettlement) {
+        const { settle, value } = pendingSettlement;
+        pendingSettlement = void 0;
+        settleNow(settle, value);
+      } else {
+        reject(error);
+      }
     }
   });
 }

package/dist/runtime/utils/nuxt-ready-script-trigger.d.ts

@@ -0,0 +1,3 @@
+import type { UseScriptTrigger } from '@unhead/vue/scripts';
+/** Install an Unhead trigger after Nuxt has completed client startup. */
+export declare function createNuxtReadyScriptTrigger(trigger: UseScriptTrigger): UseScriptTrigger;

package/dist/runtime/utils/nuxt-ready-script-trigger.js

@@ -0,0 +1,16 @@
+import { onNuxtReady } from "nuxt/app";
+export function createNuxtReadyScriptTrigger(trigger) {
+  return (load) => {
+    let disposed = false;
+    let cleanup;
+    onNuxtReady(() => {
+      if (!disposed)
+        cleanup = trigger(load);
+    });
+    return () => {
+      disposed = true;
+      cleanup?.();
+      cleanup = void 0;
+    };
+  };
+}

package/dist/runtime/utils.js

@@ -3,10 +3,9 @@ import { createError, useRuntimeConfig } from "nuxt/app";
 import { parseQuery, parseURL, withQuery } from "ufo";
 import { parse } from "valibot";
 import { useScript } from "./composables/useScript.js";
+import { createNpmScriptApiState } from "./npm-script-api-state.js";
 import { createNpmScriptProxy } from "./npm-script-proxy.js";
-import { createNpmScriptStub } from "./npm-script-stub.js";
 import { attachGcmConsent } from "./registry/_gcm-consent.js";
-import { isUnheadSourceLessScriptLoaderEnabled } from "./unhead-features.js";
 const URL_MATCH_RE = /https?:\/\/[^/]+\/_nuxt\/(.+\.vue)(?:\?[^)]*)?:(\d+):(\d+)/;
 const URL_PAREN_MATCH_RE = /\(https?:\/\/[^/]+\/_nuxt\/(.+\.vue)(?:\?[^)]*)?:(\d+):(\d+)\)/;
 const VUE_MATCH_RE = /([^/\s]+\.vue):(\d+):(\d+)/;
@@ -48,38 +47,28 @@ export function useRegistryScript(registryKey, optionsFn, _userOptions) {
   const userOptions = defu(_userOptions || {}, typeof scriptConfig === "object" ? scriptConfig : {});
   const options = optionsFn(userOptions, { scriptInput: userOptions.scriptInput });
   if (options.scriptMode === "npm") {
-    if (isUnheadSourceLessScriptLoaderEnabled()) {
-      const scriptOptions2 = { ...userOptions.scriptOptions, ...options.scriptOptions };
-      const resolveApi = scriptOptions2.use;
-      const clientUse = resolveClientUse(resolveApi);
-      delete scriptOptions2.use;
-      if (typeof scriptOptions2.trigger === "undefined")
-        scriptOptions2.trigger = "client";
-      let api;
-      const instance2 = useScript({
-        key: String(registryKey),
-        async loader({ signal }) {
-          const initialized = await options.clientInit?.({ signal });
-          if (signal.aborted)
-            throw signal.reason || new Error(`Loading ${String(registryKey)} was aborted`);
-          api = await Promise.resolve(api || resolveApi?.() || initialized || {});
-          return api;
-        }
-      }, scriptOptions2);
-      const sharedInstance = instance2.script || instance2;
-      if (!sharedInstance[NPM_SCRIPT_PROXY_DECORATED]) {
-        api = clientUse?.();
-        sharedInstance.proxy = createNpmScriptProxy(sharedInstance.proxy, () => api);
-        Object.defineProperty(sharedInstance, NPM_SCRIPT_PROXY_DECORATED, { value: true });
+    const scriptOptions2 = { ...userOptions.scriptOptions, ...options.scriptOptions };
+    const resolveApi = scriptOptions2.use;
+    const clientUse = resolveClientUse(resolveApi);
+    delete scriptOptions2.use;
+    if (typeof scriptOptions2.trigger === "undefined")
+      scriptOptions2.trigger = "client";
+    const apiState = createNpmScriptApiState(clientUse);
+    const instance2 = useScript({
+      key: String(registryKey),
+      async loader({ signal }) {
+        const initialized = await options.clientInit?.({ signal });
+        if (signal.aborted)
+          throw signal.reason || new Error(`Loading ${String(registryKey)} was aborted`);
+        return apiState.load(resolveApi, initialized);
       }
-      return instance2;
+    }, scriptOptions2);
+    const sharedInstance = instance2.script || instance2;
+    if (!sharedInstance[NPM_SCRIPT_PROXY_DECORATED]) {
+      sharedInstance.proxy = createNpmScriptProxy(sharedInstance.proxy, apiState.current);
+      Object.defineProperty(sharedInstance, NPM_SCRIPT_PROXY_DECORATED, { value: true });
     }
-    return createNpmScriptStub({
-      key: String(registryKey),
-      use: resolveClientUse(options.scriptOptions?.use),
-      clientInit: options.clientInit,
-      trigger: userOptions.scriptOptions?.trigger
-    });
+    return instance2;
   }
   let finalScriptInput = options.scriptInput;
   const userSrc = userOptions.scriptInput?.src;

package/dist/stats.mjs

@@ -124,6 +124,11 @@ const scriptMeta = {
     trackedData: ["user-identity", "events"],
     testId: "akg5rmxb"
   },
+  deskcrew: {
+    urls: ["https://deskcrew.io/desk.js"],
+    trackedData: ["user-identity", "events", "errors"],
+    testId: "pub_deskcrewdemo"
+  },
   crisp: {
     urls: ["https://client.crisp.chat/l.js"],
     trackedData: ["user-identity", "events"],
@@ -157,6 +162,14 @@ const scriptMeta = {
     // Dynamic URL with API key
     trackedData: []
   },
+  leaflet: {
+    urls: ["https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"],
+    trackedData: []
+  },
+  maplibre: {
+    urls: ["https://unpkg.com/maplibre-gl@5.24.0/dist/maplibre-gl.js"],
+    trackedData: []
+  },
   // CDN
   npm: {
     urls: [],