@monkeyplus/flow 6.0.90 → 6.0.93

package/modules/content/module.mjs

@@ -38,7 +38,7 @@ export default defineFlowModule({
       ...context.nitro.storage || {},
       content: {
         driver: "fs",
-        base: contentDir
+        base: `./${options.dir}`
       }
     };
     context.nitro.runtimeConfig.flow = {

package/modules/content/query.d.ts

@@ -24,5 +24,4 @@ export declare function readContentEntries(): Promise<ContentEntry[]>;
 export declare function buildContentTree(entries: ContentEntry[]): ContentTreeNode[];
 export declare function findContentTree(tree: ContentTreeNode[], path?: string): ContentTreeNode[];
 export declare function processContentQuery(entries: ContentEntry[], query: Record<string, any>, allEntries: ContentEntry[]): ContentEntry[];
-declare const _default: any;
-export default _default;
+export default function (event: any): Promise<ContentTreeNode[] | ContentEntry[]>;

package/modules/content/query.mjs

@@ -1,7 +1,5 @@
 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 +124,62 @@ export async function readContentEntries() {
     }
     return entries2;
   };
-  const storage = useStorage("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 { useStorage } = await import("nitro/storage");
+    const storage = useStorage("content");
+    const keys = await storage.getKeys();
+    if (keys.length > 0) {
+      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 fallback failed:", e);
+      const sortedEntries = entries.sort((left, right) => left.path.localeCompare(right.path));
+      return applyCmsPreview(sortedEntries);
     }
+  } catch (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;
+  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);
+          }
+        }
+      }
     }
-    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 fallback 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) => {
@@ -371,7 +374,8 @@ export function processContentQuery(entries, query, allEntries) {
   }
   return entries;
 }
-export default defineEventHandler(async (event) => {
+export default async function(event) {
+  const { getQuery, getRequestURL } = await import("nitro/h3");
   const query = getQuery(event);
   const requestUrl = getRequestURL(event);
   const isTreeRequest = requestUrl.pathname.endsWith("/tree") || query.tree === true || query.tree === "true" || query.tree === "1";
@@ -385,4 +389,4 @@ export default defineEventHandler(async (event) => {
     entries = findContentEntries(entries, query.path);
   }
   return processContentQuery(entries, query, allEntries);
-});
+}

package/package.json

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

package/server/plugins/00.lifecycle.d.ts

@@ -1,2 +1,3 @@
 declare const _default: any;
 export default _default;
+import 'nitro/storage';

package/server/plugins/00.lifecycle.mjs

@@ -8,3 +8,4 @@ export default definePlugin((nitroApp) => {
     }
   });
 });
+import "nitro/storage";

package/src/public/nitro.mjs

@@ -48,6 +48,22 @@ export function createFlowNitroConfig(options = {}) {
               }
             }
           }
+          const serverDir = nitro2.options.output.serverDir;
+          if (serverDir && existsSync(serverDir)) {
+            const sourceNitro = resolve(projectRoot, "node_modules/.nitro");
+            const destNitro = resolve(serverDir, ".nitro");
+            if (existsSync(sourceNitro) && !destNitro.startsWith(sourceNitro)) {
+              await fsp.cp(sourceNitro, destNitro, { recursive: true });
+            }
+            const dirsToCopy = ["content", ...flowConfig.serverCopy || []];
+            for (const dirName of dirsToCopy) {
+              const sourceDir = resolve(projectRoot, dirName);
+              const destDir = resolve(serverDir, dirName);
+              if (existsSync(sourceDir)) {
+                await fsp.cp(sourceDir, destDir, { recursive: true });
+              }
+            }
+          }
         });
       }
     ],

package/src/runtime/config.d.ts

@@ -51,6 +51,7 @@ export interface FlowConfig {
     locale: FlowLocaleConfig;
     images?: Partial<FlowImagesModuleOptions>;
     server?: FlowServerConfig;
+    serverCopy?: string[];
     siteUrl?: string;
     nitro?: Record<string, unknown>;
     netlify?: {
@@ -67,6 +68,7 @@ export type UserFlowConfig = Partial<FlowConfig> & Record<string, unknown> & {
     images?: Partial<FlowImagesModuleOptions>;
     cms?: Partial<NetlifyCmsModuleOptions>;
     server?: FlowServerConfig;
+    serverCopy?: string[];
     siteUrl?: string;
     components?: Partial<ComponentOptions>;
     autoImport?: Partial<AutoimportOptions>;

package/src/runtime/config.mjs

@@ -25,6 +25,7 @@ export function resolveFlowConfig(userFlowConfig = {}) {
       prefixStrategy: userFlowConfig.locale?.prefixStrategy || "auto",
       prefixFormat: userFlowConfig.locale?.prefixFormat || "compact"
     },
-    server: userFlowConfig.server
+    server: userFlowConfig.server,
+    serverCopy: userFlowConfig.serverCopy || []
   };
 }