@monkeyplus/flow 6.0.3 → 6.0.5

package/package.json

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

package/server/lib/render.mjs

@@ -1,7 +1,6 @@
 import UApp from "@nuxt/ui/components/App.vue";
-import { createHead } from "@unhead/vue/server";
+import { createHead, transformHtmlTemplate } from "@unhead/vue/server";
 import { renderToString } from "@vue/server-renderer";
-import { transformHtmlTemplate } from "unhead/server";
 import bases from "virtual:flow/bases";
 import layouts from "virtual:flow/layouts";
 import templates from "virtual:flow/templates";

package/server/renderer.mjs

@@ -1,4 +1,14 @@
+import { resolve } from "node:path";
+import { pathToFileURL } from "node:url";
 let prerenderFetchHandlerPromise;
+function resolvePrerenderServiceUrls() {
+  const cwd = process.cwd();
+  return [
+    pathToFileURL(resolve(cwd, "node_modules/.nitro/vite/services/ssr/index.js")).href,
+    pathToFileURL(resolve(cwd, ".nitro/vite/services/ssr/index.js")).href,
+    new URL("../../vite/services/ssr/index.js", import.meta.url).href
+  ];
+}
 function resolveRequest(input) {
   if (input instanceof Request) {
     return input;
@@ -7,18 +17,21 @@ function resolveRequest(input) {
 }
 async function resolvePrerenderFetchHandler() {
   prerenderFetchHandlerPromise ||= (async () => {
-    try {
-      const ssrServiceUrl = new URL("../../vite/services/ssr/index.js", import.meta.url);
-      const ssrService = await import(
-        /* @vite-ignore */
-        ssrServiceUrl.href
-      );
-      const defaultService = ssrService.default;
-      const fetchHandler = defaultService?.fetch;
-      return typeof fetchHandler === "function" ? fetchHandler.bind(defaultService) : void 0;
-    } catch {
-      return void 0;
+    for (const ssrServiceUrl of resolvePrerenderServiceUrls()) {
+      try {
+        const ssrService = await import(
+          /* @vite-ignore */
+          ssrServiceUrl
+        );
+        const defaultService = ssrService.default;
+        const fetchHandler = defaultService?.fetch;
+        if (typeof fetchHandler === "function") {
+          return fetchHandler.bind(defaultService);
+        }
+      } catch {
+      }
     }
+    return void 0;
   })();
   return await prerenderFetchHandlerPromise;
 }