nuxt-content-assets 1.3.0 → 1.3.2

package/dist/module.json

@@ -4,5 +4,5 @@
   "compatibility": {
     "nuxt": "^3.0.0"
   },
-  "version": "1.3.0"
+  "version": "1.3.2"
 }

package/dist/module.mjs

@@ -1,6 +1,5 @@
-import * as Fs from 'fs';
-import * as Path from 'path';
-import Path__default from 'path';
+import Fs from 'fs';
+import Path from 'crosspath';
 import { useNuxt, createResolver, defineNuxtModule, addPlugin } from '@nuxt/kit';
 import { visit, SKIP, CONTINUE } from 'unist-util-visit';
 import { listen } from 'listhen';
@@ -41,9 +40,8 @@ const extensions = {
   media: matchTokens("mp3 m4a wav mp4 mov webm ogg avi flv avchd")
 };
 function makeIgnores(extensions2) {
-  const matched = matchTokens(extensions2);
-  const ignored = matched.join("|");
-  return `[^:]+\\.(?!(${ignored})$)`;
+  const included = matchTokens(extensions2).join("|");
+  return `^(?:(?!(${included})).)+$`;
 }
 
 function removeQuery(path) {
@@ -53,7 +51,7 @@ function isExcluded(path) {
   return path.split("/").some((segment) => segment.startsWith(".") || segment.startsWith("_"));
 }
 function isImage(path) {
-  const ext = Path__default.extname(path).substring(1);
+  const ext = Path.extname(path).substring(1);
   return extensions.image.includes(ext);
 }
 function isArticle(path) {
@@ -389,7 +387,7 @@ function makeSourceManager(key, source, publicPath, callback) {
 function makeAssetsManager(publicPath) {
   const indexKey = "assets.json";
   const storage = makeSourceStorage(Path.join(publicPath, ".."));
-  storage.watch(async (event, key) => {
+  void storage.watch(async (event, key) => {
     if (event === "update" && key === indexKey) {
       await load();
     }
@@ -400,7 +398,7 @@ function makeAssetsManager(publicPath) {
     Object.assign(assets, data || {});
   }
   const save = debounce(function() {
-    storage.setItem(indexKey, assets);
+    void storage.setItem(indexKey, assets);
   }, 50);
   function resolveAsset(content, relAsset, registerContent = false) {
     const srcDir = Path.dirname(content._file);

package/dist/runtime/assets/public.mjs

@@ -1,4 +1,4 @@
-import * as Path from "path";
+import Path from "crosspath";
 import getImageSize from "image-size";
 import debounce from "debounce";
 import { hash } from "ohash";
@@ -7,7 +7,7 @@ import { isImage, warn, log } from "../utils/index.mjs";
 export function makeAssetsManager(publicPath) {
   const indexKey = "assets.json";
   const storage = makeSourceStorage(Path.join(publicPath, ".."));
-  storage.watch(async (event, key) => {
+  void storage.watch(async (event, key) => {
     if (event === "update" && key === indexKey) {
       await load();
     }
@@ -18,7 +18,7 @@ export function makeAssetsManager(publicPath) {
     Object.assign(assets, data || {});
   }
   const save = debounce(function() {
-    storage.setItem(indexKey, assets);
+    void storage.setItem(indexKey, assets);
   }, 50);
   function resolveAsset(content, relAsset, registerContent = false) {
     const srcDir = Path.dirname(content._file);

package/dist/runtime/assets/source.mjs

@@ -1,4 +1,4 @@
-import * as Path from "path";
+import Path from "crosspath";
 import githubDriver from "unstorage/drivers/github";
 import fsDriver from "unstorage/drivers/fs";
 import { createStorage } from "unstorage";

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

@@ -7,5 +7,8 @@ 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
  */
 export declare function makeIgnores(extensions: string | string[]): string;

package/dist/runtime/utils/config.mjs

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

package/dist/runtime/utils/fs.mjs

@@ -1,5 +1,5 @@
-import * as Path from "path";
-import * as Fs from "fs";
+import Path from "crosspath";
+import Fs from "fs";
 export function readFile(path, asJson = false) {
   const text = Fs.readFileSync(path, { encoding: "utf8" });
   return asJson ? JSON.parse(text) : text;

package/dist/runtime/utils/path.mjs

@@ -1,4 +1,4 @@
-import Path from "path";
+import Path from "crosspath";
 import { extensions } from "./config.mjs";
 export function parseQuery(path) {
   const matches = path.match(/\?.+$/);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-content-assets",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Enable locally-located assets in Nuxt Content",
   "repository": "davestewart/nuxt-content-assets",
   "license": "MIT",
@@ -32,6 +32,7 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.3.2",
+    "crosspath": "^2.0.0",
     "debounce": "^1.2.1",
     "image-size": "^1.0.2",
     "listhen": "^1.0.4",
@@ -41,7 +42,7 @@
     "ws": "^8.13.0"
   },
   "peerDependencies": {
-    "@nuxt/content": ">=2.6 || <3.0.0"
+    "@nuxt/content": "^2.0.0"
   },
   "devDependencies": {
     "@nuxt/eslint-config": "^0.1.1",