@monkeyplus/flow 6.0.85 → 6.0.87

package/modules/content/module.mjs

@@ -34,13 +34,13 @@ export default defineFlowModule({
     if (!context.nitro.plugins.includes(fetchPluginPath)) {
       context.nitro.plugins.push(fetchPluginPath);
     }
-    context.nitro.serverAssets = [
-      ...context.nitro.serverAssets || [],
-      {
-        baseName: "content",
-        dir: contentDir
+    context.nitro.storage = {
+      ...context.nitro.storage || {},
+      content: {
+        driver: "fs",
+        base: contentDir
       }
-    ];
+    };
     context.nitro.runtimeConfig.flow = {
       ...typeof context.nitro.runtimeConfig.flow === "object" && context.nitro.runtimeConfig.flow ? context.nitro.runtimeConfig.flow : {},
       content: {

package/modules/content/query.mjs

@@ -1,6 +1,7 @@
 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 "/";
@@ -125,40 +126,57 @@ export async function readContentEntries() {
     }
     return entries2;
   };
+  const storage = useStorage("content");
+  const keys = await storage.getKeys();
   const entries = [];
-  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);
+  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 {
-      await fs.access(contentDir);
-      await walkDir(contentDir, contentDir);
+      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);
     }
-    const sorted = entries.sort((left, right) => left.path.localeCompare(right.path));
-    return applyCmsPreview(sorted);
-  } catch (e) {
-    consola.error("[Flow Content] fs reading failed:", e);
   }
-  return applyCmsPreview(entries);
+  const sortedEntries = entries.sort((left, right) => left.path.localeCompare(right.path));
+  return applyCmsPreview(sortedEntries);
 }
 function sortTree(nodes) {
   nodes.sort((left, right) => {

package/package.json

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

package/server/plugins/00.lifecycle.mjs

@@ -1,9 +1,6 @@
 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/nitro.mjs

@@ -36,11 +36,6 @@ export function createFlowNitroConfig(options = {}) {
       (nitro) => {
         nitro.hooks.hook("compiled", async (nitro2) => {
           const preset = nitro2?.options?.preset || flowConfig.nitro?.preset || process.env.FLOW_BUILD_PRESET;
-          const nitroViteServicesSrc = resolve(nitro2.options.rootDir, "node_modules/.nitro/vite/services");
-          const nitroViteServicesDest = resolve(nitro2.options.output.serverDir, ".nitro/vite/services");
-          if (existsSync(nitroViteServicesSrc)) {
-            await fsp.cp(nitroViteServicesSrc, nitroViteServicesDest, { recursive: true });
-          }
           if (preset === "netlify" || process.env.NETLIFY) {
             const customPath = flowConfig.netlify?.path;
             if (customPath) {