@monkeyplus/flow 5.0.0-rc.108 → 5.0.0-rc.109

package/dist/core/runtime/nitro/flow.mjs

@@ -1,8 +1,8 @@
 import "node-fetch-native/polyfill";
 import { eventHandler } from "h3";
 import { defineCachedFunction, useRuntimeConfig } from "#internal/nitro";
-const getServerApp = cachedImport(() => import("#server"));
-export const getFlowRenderer = cachedResult(async () => {
+const getServerApp = () => import("#server").then((r) => r?.default?.default || r?.default || r);
+export const getFlowRenderer = lazyCachedFunction(async () => {
   const createFlowApp = await getServerApp();
   if (!createFlowApp)
     throw new Error("Server bundle is not available");
@@ -14,13 +14,7 @@ export default eventHandler(async (event) => {
   event.context.render = flow.render;
   event.context.defineCachedFunction = defineCachedFunction;
 });
-function _interopDefault(e) {
-  return e && typeof e === "object" && "default" in e ? e.default : e;
-}
-function cachedImport(importer) {
-  return cachedResult(() => importer().then(_interopDefault).then(_interopDefault));
-}
-function cachedResult(fn) {
+function lazyCachedFunction(fn) {
   let res = null;
   return () => {
     if (res === null)

package/dist/core/runtime/nitro/renderer.mjs

@@ -1,5 +1,6 @@
 import { eventHandler, getQuery } from "h3";
 import { joinURL } from "ufo";
+import { getFlowRenderer } from "./flow.mjs";
 const normalizeCall = async (seo, ctx) => {
   if (typeof seo === "function")
     return await seo(ctx);
@@ -19,7 +20,7 @@ function replacePath(_path, url) {
 }
 export default eventHandler(async (event) => {
   const url = event.req.url?.split("?")[0];
-  const flow = event.context.flow;
+  const flow = await getFlowRenderer();
   if (url.includes("_urls")) {
     const urls = await flow.app.utils.getUrls();
     return urls;

package/dist/index.mjs

@@ -2,10 +2,9 @@ import { createHooks } from 'hookable';
 import { dirname, resolve, normalize, join, isAbsolute, relative, extname } from 'pathe';
 import { defineFlowModule, addPlugin, defineNuxtModule, logger, addTemplate, addPluginTemplate, addVitePlugin, addWebpackPlugin, updateTemplates, useNuxt, resolveAlias, resolveFilesFlow, nuxtCtx, installModule, loadFlowConfig, normalizeTemplate, compileTemplate, normalizePlugin, findPath, templateUtils, isIgnoredFlow } from '@monkeyplus/flow-kit';
 import escapeRE from 'escape-string-regexp';
-import { fileURLToPath } from 'url';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 import { defineUnimportPreset, createUnimport, toImports, scanDirExports } from 'unimport';
 import defu from 'defu';
-import { pathToFileURL } from 'node:url';
 import { createUnplugin } from 'unplugin';
 import { parseURL, parseQuery, joinURL } from 'ufo';
 import fs from 'fs';
@@ -25,10 +24,10 @@ import replace from '@rollup/plugin-replace';
 import { resolveTSConfig } from 'pkg-types';
 import fse from 'fs-extra';
 
-const version = "5.0.0-rc.108";
+const version = "5.0.0-rc.109";
 
 let _distDir = dirname(fileURLToPath(import.meta.url));
-if (_distDir.endsWith("chunks"))
+if (_distDir.match(/(chunks|shared)$/))
   _distDir = dirname(_distDir);
 const distDir = _distDir;
 const pkgDir = resolve(distDir, "..");
@@ -402,13 +401,14 @@ const ImportProtectionPlugin = createUnplugin((options) => {
 async function initNitro(flow) {
   const _nitroConfig = flow.options.nitro || {};
   globalThis.generate = {};
+  const scanDirs = flow.options._layers.map((layer) => (layer.config.serverDir || layer.config.srcDir) && resolve(layer.cwd, layer.config.serverDir || resolve(layer.config.srcDir, "server"))).filter(Boolean);
   const nitroConfig = defu(_nitroConfig, {
     rootDir: flow.options.rootDir,
     workspaceDir: flow.options.workspaceDir,
     srcDir: flow.options.serverDir,
     dev: flow.options.dev,
     buildDir: flow.options.buildDir,
-    scanDirs: flow.options._layers.map((layer) => (layer.config.serverDir || layer.config.srcDir) && resolve(layer.cwd, layer.config.serverDir || resolve(layer.config.srcDir, "server"))).filter(Boolean),
+    scanDirs,
     renderer: resolve(distDir, "core/runtime/nitro/renderer"),
     nodeModulesDirs: flow.options.modulesDir,
     handlers: [
@@ -456,9 +456,13 @@ async function initNitro(flow) {
       inline: [
         ...flow.options.dev ? [] : ["eta", "@monkeyplus/", "@vue/", "@nuxt/", flow.options.buildDir],
         "@monkeyplus/flow/dist",
-        "C:/Users/gnu/Documents/GitHub/flow/packages/flow/dist/app"
+        "C:/Users/gnu/Documents/GitHub/flow/packages/flow/dist/app",
+        distDir
       ]
     },
+    replace: {
+      "process.dev": flow.options.dev
+    },
     alias: {
       "estree-walker": "unenv/runtime/mock/proxy",
       "@babel/parser": "unenv/runtime/mock/proxy",
@@ -467,8 +471,10 @@ async function initNitro(flow) {
       ...flow.options.alias
     },
     rollupConfig: {
-      plugins: [],
-      external: [""]
+      plugins: []
+    },
+    devServer: {
+      watch: [resolve(flow.options.buildDir, "dist/server/server.mjs")]
     }
   });
   nitroConfig.rollupConfig.plugins.push(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "5.0.0-rc.108",
+  "version": "5.0.0-rc.109",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -25,9 +25,9 @@
     "dist"
   ],
   "dependencies": {
-    "@monkeyplus/flow-cli": "5.0.0-rc.108",
-    "@monkeyplus/flow-kit": "5.0.0-rc.108",
-    "@monkeyplus/flow-schema": "5.0.0-rc.108",
+    "@monkeyplus/flow-cli": "5.0.0-rc.109",
+    "@monkeyplus/flow-kit": "5.0.0-rc.109",
+    "@monkeyplus/flow-schema": "5.0.0-rc.109",
     "@rollup/plugin-replace": "^4.0.0",
     "@vueuse/head": "^1.0.16",
     "c12": "^1.0.1",