@monkeyplus/flow 6.0.84 → 6.0.85

package/modules/content/query.mjs

@@ -1,7 +1,6 @@
 import { extname } from "node:path";
 import { consola } from "consola";
 import { defineEventHandler, getQuery, getRequestURL } from "nitro/h3";
-import { useStorage } from "nitro/storage";
 function normalizeQueryPath(path) {
   if (!path || path === "/") {
     return "/";
@@ -126,57 +125,40 @@ export async function readContentEntries() {
     }
     return entries2;
   };
-  const storage = useStorage("assets:content");
-  const keys = await storage.getKeys();
   const entries = [];
-  if (keys.length === 0) {
-    try {
-      const fs = await import("node:fs/promises");
-      const path = await import("node:path");
-      const contentDir = path.resolve(process.cwd(), "content");
-      async function walkDir(dir, baseDir) {
-        const files = await fs.readdir(dir, { withFileTypes: true });
-        for (const file of files) {
-          const res = path.resolve(dir, file.name);
-          if (file.isDirectory()) {
-            await walkDir(res, baseDir);
-          } else {
-            const extension = path.extname(res).toLowerCase();
-            if ([".md", ".json", ".yml", ".yaml", ".txt"].includes(extension)) {
-              const relativePath = path.relative(baseDir, res);
-              const normalizedKey = relativePath.replace(/\\/g, "/");
-              const raw = await fs.readFile(res, "utf-8");
-              const entry = parseContentFile(normalizedKey, raw);
-              entries.push(entry);
-            }
+  try {
+    const fs = await import("node:fs/promises");
+    const path = await import("node:path");
+    const contentDir = path.resolve(process.cwd(), "content");
+    async function walkDir(dir, baseDir) {
+      const files = await fs.readdir(dir, { withFileTypes: true });
+      for (const file of files) {
+        const res = path.resolve(dir, file.name);
+        if (file.isDirectory()) {
+          await walkDir(res, baseDir);
+        } else {
+          const extension = path.extname(res).toLowerCase();
+          if ([".md", ".json", ".yml", ".yaml", ".txt"].includes(extension)) {
+            const relativePath = path.relative(baseDir, res);
+            const normalizedKey = relativePath.replace(/\\/g, "/");
+            const raw = await fs.readFile(res, "utf-8");
+            const entry = parseContentFile(normalizedKey, raw);
+            entries.push(entry);
           }
         }
       }
-      try {
-        await fs.access(contentDir);
-        await walkDir(contentDir, contentDir);
-      } catch (e) {
-      }
-      const sorted = entries.sort((left, right) => left.path.localeCompare(right.path));
-      return applyCmsPreview(sorted);
-    } catch (e) {
-      consola.error("[Flow Content] fs fallback failed:", e);
     }
-  }
-  for (const key of keys) {
-    const normalizedKey = key.replace(/:/g, "/");
-    const extension = extname(normalizedKey).toLowerCase();
-    if (![".md", ".json", ".yml", ".yaml", ".txt"].includes(extension)) {
-      continue;
-    }
-    const raw = await storage.getItem(key);
-    if (raw !== null && raw !== void 0) {
-      const entry = parseContentFile(normalizedKey, raw);
-      entries.push(entry);
+    try {
+      await fs.access(contentDir);
+      await walkDir(contentDir, contentDir);
+    } catch (e) {
     }
+    const sorted = entries.sort((left, right) => left.path.localeCompare(right.path));
+    return applyCmsPreview(sorted);
+  } catch (e) {
+    consola.error("[Flow Content] fs reading failed:", e);
   }
-  const sortedEntries = entries.sort((left, right) => left.path.localeCompare(right.path));
-  return applyCmsPreview(sortedEntries);
+  return applyCmsPreview(entries);
 }
 function sortTree(nodes) {
   nodes.sort((left, right) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "6.0.84",
+  "version": "6.0.85",
   "description": "@monkeyplus/flow package-first runtime with Vite, Nitro, Vue and a workspace playground.",
   "license": "MIT",
   "publishConfig": {

package/server/plugins/00.lifecycle.mjs

@@ -1,6 +1,9 @@
 import { definePlugin } from "nitro";
 import { consola } from "consola";
 export default definePlugin((nitroApp) => {
+  if (!globalThis.$fetch) {
+    globalThis.$fetch = nitroApp.localFetch;
+  }
   nitroApp.hooks.hook("request", (event) => {
     const pathname = new URL(event.req.url, "http://localhost").pathname;
     if (!pathname.startsWith("/api/")) {

package/src/public/query-content.mjs

@@ -77,11 +77,12 @@ async function fetchContent(route, queryParams) {
   const relativeTarget = withQuery(joinUrl(apiBase, route), query);
   if (typeof window === "undefined") {
     try {
-      if (import.meta.env?.SSR || process.server || !localFetch) {
+      if (!localFetch) {
         let queryModule;
         try {
           queryModule = await import("../../modules/content/query.mjs");
-        } catch {
+        } catch (tsErr) {
+          console.error("[queryContent] Error loading .ts:", tsErr);
           queryModule = await import("../../modules/content/query.js");
         }
         const { findContentEntries, buildContentTree, findContentTree, readContentEntries, processContentQuery } = queryModule;
@@ -97,6 +98,7 @@ async function fetchContent(route, queryParams) {
         return processContentQuery(entries, query, await readContentEntries());
       }
     } catch (e) {
+      console.error("[queryContent] Bypass failed:", e);
     }
   }
   const fetchFn = typeof window === "undefined" ? localFetch || fetch : fetch;