@monkeyplus/flow 5.0.0-beta.3 → 5.0.0-beta.5

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

@@ -10,12 +10,12 @@ export default eventHandler(async (event) => {
   const chunks = { head: [], body: [] };
   const generate = {};
   const { page, locale, params, view } = flow.router.byUrl.lookup(url) || {};
+  if (!page)
+    return;
   await flow.callHook("page:scripts", scripts);
   if (view.bundle)
     await flow.callHook("page:chunks", view.bundle, chunks);
   const templateContext = {};
-  if (!page)
-    return;
   const dynamyc = params?._;
   const contextPage = {};
   const utils = Object.assign({ getLocale: () => locale }, flow.app.utils);

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { createHooks } from 'hookable';
 import { dirname, resolve, normalize, join, isAbsolute, relative, extname } from 'pathe';
-import { defineFlowModule, addPlugin, defineNuxtModule, logger, addTemplate, addPluginTemplate, addVitePlugin, useNuxt, resolveAlias, resolveFiles, addDevServerHandler, nuxtCtx, installModule, loadFlowConfig, templateUtils, normalizeTemplate, compileTemplate, normalizePlugin, resolveFilesFlow, isIgnoredFlow } from '@monkeyplus/flow-kit';
+import { defineFlowModule, addPlugin, defineNuxtModule, logger, addTemplate, addPluginTemplate, addVitePlugin, useNuxt, resolveAlias, resolveFiles, nuxtCtx, installModule, loadFlowConfig, templateUtils, normalizeTemplate, compileTemplate, normalizePlugin, resolveFilesFlow, isIgnoredFlow } from '@monkeyplus/flow-kit';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { defineUnimportPreset, createUnimport, toImports, scanDirExports } from 'unimport';
 import { createUnplugin } from 'unplugin';
@@ -27,7 +27,7 @@ import { isExternal as isExternal$1, ExternalsDefaults } from 'externality';
 import { createHash } from 'node:crypto';
 import MagicString from 'magic-string';
 
-const version = "5.0.0-beta.3";
+const version = "5.0.0-beta.5";
 
 let _distDir = dirname(fileURLToPath(import.meta.url));
 if (_distDir.endsWith("chunks"))
@@ -317,7 +317,10 @@ const createClient = async (flow) => {
     doReload();
   });
   flow.hook("close", async () => {
-    await vite.close();
+    try {
+      await vite.close();
+    } catch (error) {
+    }
   });
   return vite;
 };
@@ -345,10 +348,12 @@ const viteModule = defineFlowModule({
     const runtimeDir = resolve(distDir, "vite-client/runtime");
     flow.options.alias["#viteManifest"] = resolve(flow.options.buildDir, "viteManifest.mjs");
     if (flow.options.dev) {
-      const _vite = await createClient(flow);
-      addDevServerHandler({
-        handler: _vite.middlewares,
-        route: _options.route
+      flow.hook("nitro:init", async (nitro) => {
+        const _vite = await createClient(flow);
+        nitro.options.devHandlers.push({
+          handler: _vite.middlewares,
+          route: _options.route
+        });
       });
       addTemplate({
         filename: "viteManifest.mjs",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "5.0.0-beta.3",
+  "version": "5.0.0-beta.5",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -14,9 +14,9 @@
     "flow": "./bin/flow.mjs"
   },
   "dependencies": {
-    "@monkeyplus/flow-cli": "5.0.0-beta.3",
-    "@monkeyplus/flow-kit": "5.0.0-beta.3",
-    "@monkeyplus/flow-schema": "5.0.0-beta.3",
+    "@monkeyplus/flow-cli": "5.0.0-beta.5",
+    "@monkeyplus/flow-kit": "5.0.0-beta.5",
+    "@monkeyplus/flow-schema": "5.0.0-beta.5",
     "@nuxt/vite-builder": "3.0.0-rc.1",
     "@rollup/plugin-replace": "^4.0.0",
     "@vueuse/head": "^0.7.6",

package/src/core/runtime/nitro/renderer.ts

@@ -17,12 +17,14 @@ export default eventHandler(async(event) => {
 
   // console.log(flow);
   const { page, locale, params, view } = flow.router.byUrl.lookup(url!) || {};
+  // Truncate page
+  if (!page) return;
+
   await flow.callHook('page:scripts', scripts);
   if (view.bundle)
     await flow.callHook('page:chunks', view.bundle, chunks);
 
   const templateContext = {} as any;
-  if (!page) return;
 
   const dynamyc = params?._;
   const contextPage = {} as any;

package/src/core/vite/client/index.ts

@@ -26,7 +26,11 @@ export const createClient = async(flow: Flow) => {
   });
 
   flow.hook('close', async() => {
-    await vite.close();
+    try {
+      await vite.close();
+    }
+    catch (error) {
+    }
   });
 
   return vite;

package/src/vite-client/module.ts

@@ -23,11 +23,14 @@ export default defineFlowModule<OptionsViteClient>({
     flow.options.alias['#viteManifest'] = resolve(flow.options.buildDir, 'viteManifest.mjs');
 
     if (flow.options.dev) {
-      const _vite = await createClient(flow);
-      addDevServerHandler({
-        handler: _vite.middlewares,
-        route: _options.route,
+      flow.hook('nitro:init', async(nitro) => {
+        const _vite = await createClient(flow);
+        nitro.options.devHandlers.push({
+          handler: _vite.middlewares,
+          route: _options.route,
+        });
       });
+
       addTemplate({
         filename: 'viteManifest.mjs',
         async getContents() {