nuxt-content-assets 1.7.0 → 1.8.1

package/README.md

@@ -215,7 +215,7 @@ See playground component [here](playground/components/content/ContentImage.vue).
 
 ### Nuxt Image
 
-[Nuxt Image](https://image.nuxtjs.org/) is supported by adding Nuxt Content Asset's cache folder as a Nuxt Layer:
+To support [Nuxt Image](https://image.nuxtjs.org/), add Nuxt Content Asset's cache folder as a Nuxt Layer:
 
 ```ts
 // nuxt.config.ts
@@ -291,7 +291,7 @@ img {
 ### Content extensions
 
 > [!NOTE]
-> Generally, you shouldn't need to touch this setting
+> Generally, you shouldn't need to touch this setting, however, if you're looking to support custom content types [by way of transformers](https://v2.content.nuxt.com/recipes/transformers) then you'll need to add those extensions here.
 
 This setting tells Nuxt Content to ignore anything that is **not** one of the supported content types:
 
@@ -317,7 +317,7 @@ If you want to see what the module does as it runs, set `debug` to true:
 
 ## How it works
 
-When Nuxt builds, the module scans all content sources for assets, copies them to a temporary layer folder (`nuxt_modules/nuxt-content-assets/cache`), and indexes path and image metadata.
+When Nuxt builds, the module scans all content sources for assets, copies them to a temporary layer folder (`node_modules/nuxt-content-assets/cache`), and indexes path and image metadata.
 
 After Nuxt Content has run, the parsed content (`.nuxt/content-cache`) is traversed, and both element attributes and frontmatter properties are checked to see if they resolve to the previously-indexed asset paths.
 

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.0.0"
   },
-  "version": "1.7.0",
+  "version": "1.8.1",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -152,7 +152,9 @@ const module$1 = defineNuxtModule({
         nuxt.options.content.ignores ||= [];
       }
       const ignores = makeIgnores(contentExtensions);
-      nuxt.options.content?.ignores.push(ignores);
+      if (ignores.length) {
+        nuxt.options.content?.ignores.push(ignores);
+      }
     }
     const imageSizes = matchTokens(options.imageSize);
     const sources = Array.from(nuxt.options._layers).map((layer) => layer.config?.content?.sources).reduce((output, sources2) => {
@@ -221,7 +223,7 @@ const module$1 = defineNuxtModule({
     nuxt.hook("close", async () => {
       await assets.dispose();
       for (const key in managers) {
-        await managers[key].dispose();
+        await managers[key]?.dispose();
       }
     });
     const pluginPath = resolve("./runtime/content/plugin");

package/dist/runtime/assets/public.d.ts

@@ -1,4 +1,4 @@
-import type { ParsedContent, AssetConfig } from '../../types.js';
+import type { AssetConfig, ParsedContent } from '../../types.js';
 /**
  * Manages the public assets
  */

package/dist/runtime/assets/public.js

@@ -4,7 +4,7 @@ import getImageSize from "image-size";
 import debounce from "debounce";
 import { hash } from "ohash";
 import { makeSourceStorage } from "./source.js";
-import { isImage, warn, log, removeEntry, removeQuery } from "../utils/index.js";
+import { isImage, log, removeEntry, removeOrdering, removeQuery, warn } from "../utils/index.js";
 export function makeAssetsManager(publicPath, shouldWatch = true) {
   const assetsKey = "assets.json";
   const assetsPath = Path.join(publicPath, "..");
@@ -27,7 +27,7 @@ export function makeAssetsManager(publicPath, shouldWatch = true) {
   function resolveAsset(content, relAsset, registerContent = false) {
     const srcDir = Path.dirname(content._file);
     const relAssetNoQuery = removeQuery(relAsset);
-    const srcAsset = Path.join(srcDir, relAssetNoQuery);
+    const srcAsset = removeOrdering(Path.join(srcDir, relAssetNoQuery));
     const asset = assets[srcAsset];
     if (asset && registerContent) {
       const { _id } = content;

package/dist/runtime/assets/source.d.ts

@@ -1,5 +1,5 @@
 import { type MountOptions } from '@nuxt/content';
-import { type WatchEvent, type Storage } from 'unstorage';
+import { type Storage, type WatchEvent } from 'unstorage';
 /**
  * Make a Storage instance that monitors assets from a single source
  */

package/dist/runtime/assets/source.js

@@ -2,7 +2,18 @@ import Path from "crosspath";
 import githubDriver from "unstorage/drivers/github";
 import fsDriver from "unstorage/drivers/fs";
 import { createStorage } from "unstorage";
-import { warn, isAsset, toPath, removeFile, copyFile, writeBlob, writeFile, deKey, isExcluded } from "../utils/index.js";
+import {
+  copyFile,
+  deKey,
+  isAsset,
+  isExcluded,
+  removeFile,
+  removeOrdering,
+  toPath,
+  warn,
+  writeBlob,
+  writeFile
+} from "../utils/index.js";
 function isAssetId(id) {
   const path = toPath(id);
   return !isExcluded(path) && isAsset(path);
@@ -46,7 +57,7 @@ export function makeSourceManager(key, source, publicPath, callback) {
     return Path.join(source.base, getRelSrc(key2));
   }
   function getRelTrg(key2) {
-    return Path.join(source.prefix || "", toPath(deKey(key2)));
+    return Path.join(source.prefix || "", removeOrdering(toPath(deKey(key2))));
   }
   function getAbsTrg(key2) {
     return Path.join(publicPath, getRelTrg(key2));

package/dist/runtime/utils/config.d.ts

@@ -9,7 +9,6 @@ export declare const extensions: {
 /**
  * Create a Nuxt Content ignore string
  *
- * @see https://stackoverflow.com/questions/10052032/regex-pattern-that-does-not-match-certain-extensions
- * @see https://regex101.com/r/gC3HXz/1
+ * @see https://regex101.com/r/gC3HXz/2
  */
 export declare function makeIgnores(extensions: string | string[]): string;

package/dist/runtime/utils/config.js

@@ -8,6 +8,10 @@ export const extensions = {
   media: matchTokens("mp3 m4a wav mp4 mov webm ogg avi flv avchd")
 };
 export function makeIgnores(extensions2) {
-  const included = matchTokens(extensions2).join("|");
-  return `^(?:(?!(${included})).)+$`;
+  const tokens = matchTokens(extensions2);
+  if (tokens.length === 0) {
+    return "";
+  }
+  const disallowTail = tokens.join("$|") + "$";
+  return `\\.(?!${disallowTail})[^.]+$`;
 }

package/dist/runtime/utils/path.d.ts

@@ -6,6 +6,10 @@ export declare function parseQuery(path: string): string;
  * Removes the query string from a path
  */
 export declare function removeQuery(path: string): string;
+/**
+ * Remove ordering from a path
+ */
+export declare function removeOrdering(path: string): string;
 /**
  * Gets the extension of a path
  * @param path

package/dist/runtime/utils/path.js

@@ -7,6 +7,9 @@ export function parseQuery(path) {
 export function removeQuery(path) {
   return path.replace(/\?.*$/, "");
 }
+export function removeOrdering(path) {
+  return path.split("/").map((segment) => segment.replace(/^\d+\./, "")).join("/");
+}
 export function getExt(path) {
   return Path.extname(removeQuery(path)).substring(1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-content-assets",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "description": "Enable locally-located assets in Nuxt Content",
   "repository": {
     "type": "git",