@nuxt/scripts 0.9.0 → 0.9.2

package/dist/module.mjs

@@ -2,7 +2,7 @@ import { useNuxt, useLogger, addDevServerHandler, tryUseNuxt, createResolver, ad
 import { resolvePackageJSON, readPackageJSON } from 'pkg-types';
 import { lt } from 'semver';
 import { resolvePath } from 'mlly';
-import { join, relative } from 'pathe';
+import { join, resolve, relative } from 'pathe';
 import { existsSync } from 'node:fs';
 import fsp from 'node:fs/promises';
 import { createUnplugin } from 'unplugin';
@@ -68,14 +68,18 @@ const logger = useLogger("@nuxt/scripts");
 
 const renderedScript = /* @__PURE__ */ new Map();
 const ONE_YEAR_IN_SECONDS = 60 * 60 * 24 * 365;
-const storage = createStorage({
-  driver: fsDriver({
-    base: "node_modules/.cache/nuxt/scripts"
-  })
-});
+const bundleStorage = () => {
+  const nuxt = useNuxt();
+  return createStorage({
+    driver: fsDriver({
+      base: resolve(nuxt.options.rootDir, "node_modules/.cache/nuxt/scripts")
+    })
+  });
+};
 function setupPublicAssetStrategy(options = {}) {
   const assetsBaseURL = options.prefix || "/_scripts";
   const nuxt = useNuxt();
+  const storage = bundleStorage();
   addDevServerHandler({
     route: assetsBaseURL,
     handler: lazyEventHandler(async () => {
@@ -84,7 +88,7 @@ function setupPublicAssetStrategy(options = {}) {
         const scriptDescriptor = renderedScript.get(join(assetsBaseURL, event.path.slice(1)));
         if (!scriptDescriptor || scriptDescriptor instanceof Error)
           throw createError({ statusCode: 404 });
-        const key = `data:scripts:${filename}`;
+        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));
@@ -165,11 +169,12 @@ async function downloadScript(opts, renderedScript) {
   if (src === url || !filename) {
     return;
   }
+  const storage = bundleStorage();
   const scriptContent = renderedScript.get(src);
   let res = scriptContent instanceof Error ? void 0 : scriptContent?.content;
   if (!res) {
-    if (await storage.hasItem(`data:scripts:${filename}`)) {
-      const res2 = await storage.getItemRaw(`data:scripts:${filename}`);
+    if (await storage.hasItem(`bundle:${filename}`)) {
+      const res2 = await storage.getItemRaw(`bundle:${filename}`);
       renderedScript.set(url, {
         content: res2,
         size: res2.length / 1024,
@@ -190,7 +195,9 @@ async function downloadScript(opts, renderedScript) {
       size = contentLength ? Number(contentLength) / 1024 : 0;
       return r.arrayBuffer();
     }).then((r) => Buffer.from(r));
-    storage.setItemRaw(`data:scripts:${filename}`, res);
+    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})`)}`);
     renderedScript.set(url, {
       content: res,
       size,
@@ -212,16 +219,16 @@ function NuxtScriptBundleTransformer(options = {
       logger.debug("[bundle-script-transformer] No scripts to bundle...");
       return;
     }
-    logger.info("[bundle-script-transformer] Bundling scripts...");
+    logger.debug("[bundle-script-transformer] Bundling scripts...");
     if (!nuxt.options.dev) {
       await fsp.rm(cacheDir, { recursive: true, force: true });
-      await fsp.mkdir(cacheDir, { recursive: true });
     }
+    await fsp.mkdir(cacheDir, { recursive: true });
     await Promise.all(scripts.map(async ([url, content]) => {
       if (content instanceof Error || !content.filename)
         return;
       await fsp.writeFile(join(nuxt.options.buildDir, "cache", "scripts", content.filename), content.content);
-      logger.info(colors.gray(`  \u251C\u2500 ${url} \u2192 ${joinURL(content.src)} (${content.size.toFixed(2)} kB ${content.encoding})`));
+      logger.debug(colors.gray(`  \u251C\u2500 ${url} \u2192 ${joinURL(content.src)} (${content.size.toFixed(2)} kB ${content.encoding})`));
     }));
   });
   return createUnplugin(() => {
@@ -558,8 +565,8 @@ const module = defineNuxtModule({
       const { version: unheadVersion } = await readPackageJSON(join(unheadPath, "package.json"));
       if (!unheadVersion || lt(unheadVersion, "1.10.0")) {
         logger.error(`Nuxt Scripts requires Unhead >= 1.10.0, you are using v${unheadVersion}. Please run \`nuxi upgrade --clean\` to upgrade...`);
-      } else if (lt(unheadVersion, "1.10.4")) {
-        logger.warn(`Nuxt Scripts recommends Unhead >= 1.10.4, you are using v${unheadVersion}. Please run \`nuxi upgrade --clean\` to upgrade...`);
+      } else if (lt(unheadVersion, "1.11.5")) {
+        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"}`);

package/dist/runtime/components/ScriptVimeoPlayer.vue

@@ -119,8 +119,10 @@ const rootEl = ref()
 const trigger = useScriptTriggerElement({ trigger: props.trigger, el: rootEl })
 let clickTriggered = false
 if (props.trigger === 'mousedown' && trigger instanceof Promise) {
-  trigger.then(() => {
-    clickTriggered = true
+  trigger.then((val) => {
+    if (val) {
+      clickTriggered = true
+    }
   })
 }
 const ready = ref(false)

package/dist/runtime/components/ScriptYouTubePlayer.vue

@@ -44,17 +44,20 @@ const rootEl = ref()
 const youtubeEl = ref()
 const ready = ref(false)
 const trigger = useScriptTriggerElement({ trigger: props.trigger, el: rootEl })
-const { onLoaded, status } = useScriptYouTubePlayer({
+const script = useScriptYouTubePlayer({
   scriptOptions: {
     trigger,
   },
 })
+const { onLoaded, status } = script
 
 const player: Ref<YT.Player | undefined> = ref()
 let clickTriggered = false
 if (props.trigger === 'mousedown' && trigger instanceof Promise) {
-  trigger.then(() => {
-    clickTriggered = true
+  trigger.then((triggered) => {
+    if (triggered) {
+      clickTriggered = true
+    }
   })
 }
 onMounted(() => {

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

@@ -14,6 +14,6 @@ export interface ElementScriptTriggerOptions {
 /**
  * Create a trigger for an element to load a script based on specific element events.
  */
-export declare function useScriptTriggerElement(options: ElementScriptTriggerOptions): Promise<void> & {
+export declare function useScriptTriggerElement(options: ElementScriptTriggerOptions): Promise<boolean> & {
     ssrAttrs?: Record<string, string>;
 } | 'onNuxtReady';

package/dist/runtime/composables/useScriptTriggerElement.js

@@ -6,13 +6,13 @@ import { tryOnScopeDispose, tryOnMounted } from "@vueuse/shared";
 import { watch } from "vue";
 function useElementVisibilityPromise(element) {
   let observer;
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     observer = useIntersectionObserver(
       element,
       (intersectionObserverEntries) => {
         for (const entry of intersectionObserverEntries) {
           if (entry.isIntersecting)
-            resolve();
+            resolve(true);
         }
       },
       {
@@ -20,8 +20,7 @@ function useElementVisibilityPromise(element) {
         threshold: 0
       }
     );
-    tryOnScopeDispose(reject);
-  }).catch(() => {
+    tryOnScopeDispose(() => resolve(false));
   }).finally(() => {
     observer.stop();
   });
@@ -33,9 +32,10 @@ export function useScriptTriggerElement(options) {
     return "onNuxtReady";
   }
   if (triggers.some((t) => ["visibility", "visible"].includes(t))) {
-    if (import.meta.server || !el)
+    if (import.meta.server || !el) {
       return new Promise(() => {
       });
+    }
     return useElementVisibilityPromise(el);
   }
   const ssrAttrs = {};
@@ -44,14 +44,14 @@ export function useScriptTriggerElement(options) {
       ssrAttrs[`on${trigger2}`] = `this.dataset.script_${trigger2} = true`;
     });
   }
-  const p = new Promise((resolve, reject) => {
+  const p = new Promise((resolve) => {
     const target = typeof el !== "undefined" ? el : document.body;
     const _ = useEventListener(
       target,
       triggers,
       () => {
         _();
-        resolve();
+        resolve(true);
       },
       { once: true, passive: true }
     );
@@ -61,7 +61,7 @@ export function useScriptTriggerElement(options) {
           triggers.forEach((trigger2) => {
             if ($el.dataset[`script_${trigger2}`]) {
               _();
-              resolve();
+              resolve(true);
             }
           });
         }
@@ -69,8 +69,7 @@ export function useScriptTriggerElement(options) {
         immediate: true
       });
     });
-    tryOnScopeDispose(reject);
-  }).catch(() => {
+    tryOnScopeDispose(() => resolve(false));
   });
   return Object.assign(p, { ssrAttrs });
 }

package/dist/runtime/types.d.ts

@@ -1,5 +1,5 @@
-import type { UseScriptOptions, DataKeys, SchemaAugmentations, ScriptBase } from '@unhead/schema';
-import type { UseScriptInput, VueScriptInstance } from '@unhead/vue';
+import type { DataKeys, SchemaAugmentations, ScriptBase } from '@unhead/schema';
+import type { UseScriptInput, VueScriptInstance, UseScriptOptions } from '@unhead/vue';
 import type { ComputedRef, Ref } from 'vue';
 import type { InferInput, ObjectSchema } from 'valibot';
 import type { Import } from 'unimport';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nuxt/scripts",
   "type": "module",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "packageManager": "pnpm@9.10.0",
   "description": "Load third-party scripts with better performance, privacy and DX in Nuxt Apps.",
   "author": {
@@ -67,12 +67,12 @@
   "dependencies": {
     "@nuxt/devtools-kit": "^1.4.2",
     "@nuxt/devtools-ui-kit": "^1.4.2",
-    "@nuxt/kit": "^3.13.1",
+    "@nuxt/kit": "^3.13.2",
     "@types/google.maps": "^3.58.0",
     "@types/stripe-v3": "^3.1.33",
     "@types/vimeo__player": "^2.18.3",
     "@types/youtube": "^0.1.0",
-    "@unhead/vue": "1.11.1",
+    "@unhead/vue": "1.11.6",
     "@vueuse/core": "^11.0.3",
     "consola": "^3.2.3",
     "defu": "^6.1.4",
@@ -80,11 +80,11 @@
     "magic-string": "^0.30.11",
     "mlly": "^1.7.1",
     "ofetch": "^1.3.4",
-    "ohash": "^1.1.3",
+    "ohash": "^1.1.4",
     "pathe": "^1.1.2",
     "pkg-types": "^1.2.0",
     "semver": "^7.6.3",
-    "shiki": "1.16.2",
+    "shiki": "1.17.6",
     "sirv": "^2.0.4",
     "std-env": "^3.7.0",
     "third-party-capital": "2.3.0",
@@ -98,17 +98,17 @@
     "@nuxt/devtools-ui-kit": "^1.4.2",
     "@nuxt/eslint-config": "^0.5.7",
     "@nuxt/module-builder": "^0.8.4",
-    "@nuxt/test-utils": "3.14.1",
+    "@nuxt/test-utils": "3.14.2",
     "@types/semver": "^7.5.8",
     "@typescript-eslint/typescript-estree": "^8.5.0",
-    "@unhead/schema": "1.11.1",
+    "@unhead/schema": "1.11.6",
     "acorn-loose": "^8.4.0",
     "bumpp": "^9.5.2",
     "changelogen": "^0.5.5",
     "eslint": "9.10.0",
     "eslint-plugin-n": "^17.10.2",
     "knitwork": "^1.1.0",
-    "nuxt": "^3.13.1",
+    "nuxt": "^3.13.2",
     "nuxt-scripts-devtools": "workspace:*",
     "playwright-core": "^1.47.1",
     "typescript": "^5.6.2",
@@ -119,15 +119,14 @@
   "resolutions": {
     "@nuxt/schema": "3.13.0",
     "@nuxt/scripts": "workspace:*",
-    "@unhead/dom": "1.11.1",
-    "@unhead/schema": "1.11.1",
-    "@unhead/shared": "1.11.1",
-    "@unhead/ssr": "1.11.1",
-    "@unhead/vue": "1.11.1",
-    "nuxt": "^3.13.1",
+    "@unhead/dom": "1.11.6",
+    "@unhead/schema": "1.11.6",
+    "@unhead/shared": "1.11.6",
+    "@unhead/ssr": "1.11.6",
+    "@unhead/vue": "1.11.6",
+    "nuxt": "^3.13.2",
     "nuxt-scripts-devtools": "workspace:*",
-    "shiki": "1.10.3",
-    "unhead": "1.11.1",
+    "unhead": "1.11.6",
     "vue": "^3.5.5",
     "vue-router": "^4.4.5"
   }