@monkeyplus/flow 5.0.0-rc.107 → 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.107";
+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(
@@ -540,7 +546,6 @@ const addModuleTranspiles = (opts = {}) => {
   const flow = useNuxt();
   const modules = [
     ...opts.additionalModules || [],
-    ...flow.options.buildModules,
     ...flow.options.modules,
     ...flow.options._modules
   ].map((m) => typeof m === "string" ? m : Array.isArray(m) ? m[0] : m.src).filter((m) => typeof m === "string").map((m) => m.split("node_modules/").pop());
@@ -557,7 +562,7 @@ const addModuleTranspiles = (opts = {}) => {
 function createFlow(options) {
   const hooks = createHooks();
   const flow = {
-    _version: "3.0.0-rc.106",
+    _version: "3.0.0",
     version,
     options,
     hooks,
@@ -576,24 +581,9 @@ async function initFlow(flow) {
   flow.hook("close", () => nuxtCtx.unset());
   await flow.callHook("modules:before");
   const modulesToInstall = [
-    ...flow.options.buildModules,
     ...flow.options.modules,
     ...flow.options._modules
   ];
-  flow.hooks.deprecateHooks({
-    "autoImports:sources": {
-      to: "imports:sources",
-      message: "`autoImports:sources` hook is deprecated. Use `addImportsSources()` from `@nuxt/kit` or `imports:dirs` with `nuxt>=3.0.0-rc.10`."
-    },
-    "autoImports:dirs": {
-      to: "imports:dirs",
-      message: "`autoImports:dirs` hook is deprecated. Use `addImportsDir()` from `@nuxt/kit` or `imports:dirs` with `nuxt>=3.0.0-rc.9`."
-    },
-    "autoImports:extend": {
-      to: "imports:extend",
-      message: "`autoImports:extend` hook is deprecated. Use `addImports()` from `@nuxt/kit` or `imports:extend` with `nuxt>=3.0.0-rc.9`."
-    }
-  });
   for (const m of modulesToInstall) {
     if (Array.isArray(m))
       await installModule(m[0], m[1]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "5.0.0-rc.107",
+  "version": "5.0.0-rc.109",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -25,12 +25,12 @@
     "dist"
   ],
   "dependencies": {
-    "@monkeyplus/flow-cli": "5.0.0-rc.107",
-    "@monkeyplus/flow-kit": "5.0.0-rc.107",
-    "@monkeyplus/flow-schema": "5.0.0-rc.107",
+    "@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": "^0.7.6",
-    "c12": "^0.2.13",
+    "@vueuse/head": "^1.0.16",
+    "c12": "^1.0.1",
     "chokidar": "^3.5.3",
     "consola": "^2.15.3",
     "defu": "^6.1.0",
@@ -38,38 +38,38 @@
     "escape-string-regexp": "^5.0.0",
     "esno": "^0.16.3",
     "eta": "^1.12.3",
-    "externality": "^0.2.2",
+    "externality": "^1.0.0",
     "fs-extra": "^10.1.0",
     "globby": "^13.1.2",
-    "h3": "^0.8.6",
-    "hookable": "^5.4.1",
+    "h3": "^1.0.1",
+    "hookable": "^5.4.2",
     "jiti": "^1.16.0",
-    "ohash": "^0.1.5",
-    "knitwork": "^0.1.3",
-    "listhen": "^0.3.5",
+    "ohash": "^1.0.0",
+    "knitwork": "^1.0.0",
+    "listhen": "^1.0.0",
     "magic-string": "^0.26.7",
-    "mlly": "^0.5.16",
+    "mlly": "^1.0.0",
     "mri": "^1.2.0",
-    "nitropack": "^0.6.1",
-    "pathe": "^0.3.9",
+    "nitropack": "^1.0.0",
+    "pathe": "^1.0.0",
     "perfect-debounce": "^0.1.3",
-    "radix3": "^0.2.1",
-    "unenv": "^0.6.2",
+    "radix3": "^1.0.0",
+    "unenv": "^1.0.0",
     "ohmyfetch": "^0.4.21",
-    "node-fetch-native": "^0.1.8",
+    "node-fetch-native": "^1.0.1",
     "rollup": "^2.79.1",
     "rollup-plugin-visualizer": "^5.8.3",
-    "scule": "^0.3.2",
-    "ufo": "^0.8.6",
-    "unctx": "^2.0.2",
-    "unimport": "^0.7.0",
-    "unplugin": "^0.10.2",
-    "untyped": "^0.5.0",
-    "pkg-types": "^0.3.6",
+    "scule": "^1.0.0",
+    "ufo": "^1.0.0",
+    "unctx": "^2.1.0",
+    "unimport": "^1.0.1",
+    "unplugin": "^1.0.0",
+    "untyped": "^1.0.0",
+    "pkg-types": "^1.0.1",
     "vite": "~3.2.2",
     "vite-node": "^0.24.5",
     "vite-plugin-checker": "^0.5.1",
-    "vue-bundle-renderer": "^0.5.0",
+    "vue-bundle-renderer": "^1.0.0",
     "vue": "^3.2.41"
   },
   "devDependencies": {