@monkeyplus/flow 5.0.0-beta.7 → 5.0.0-beta.9

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.7";
+const version = "5.0.0-beta.9";
 
 let _distDir = dirname(fileURLToPath(import.meta.url));
 if (_distDir.endsWith("chunks"))
@@ -306,24 +306,22 @@ const createClient = async (flow) => {
       manifest: true
     },
     server: {
+      watch: {
+        ignored: ["**/.env/**", "**/.env*"]
+      },
       middlewareMode: "ssr"
     }
   });
   const _doReload = () => {
-    try {
-      vite.ws.send({ type: "full-reload" });
-    } catch (error) {
-    }
+    if (vite)
+      vite?.ws?.send({ type: "full-reload" });
   };
-  const doReload = debounce(_doReload);
+  const doReload = debounce(_doReload, 50);
   flow.hook("bundler:change", () => {
     doReload();
   });
   flow.hook("close", async () => {
-    try {
-      await vite?.close();
-    } catch (error) {
-    }
+    await vite.close();
   });
   return vite;
 };
@@ -350,11 +348,14 @@ const viteModule = defineFlowModule({
   async setup(_options, flow) {
     const runtimeDir = resolve(distDir, "vite-client/runtime");
     flow.options.alias["#viteManifest"] = resolve(flow.options.buildDir, "viteManifest.mjs");
+    let vite;
     if (flow.options.dev) {
-      const vite = await createClient(flow);
-      addDevServerHandler({
-        route: _options.route,
-        handler: vite.middlewares
+      flow.hook("nitro:init", async (nitro) => {
+        vite = await createClient(flow);
+        nitro.options.devHandlers.push({
+          handler: vite.middlewares,
+          route: _options.route
+        });
       });
       addTemplate({
         filename: "viteManifest.mjs",
@@ -1094,7 +1095,10 @@ const buildServer = async (ctx) => {
     },
     server: {
       preTransformRequests: false,
-      cors: true
+      cors: true,
+      watch: {
+        ignored: ["**/.env*"]
+      }
     },
     plugins: [
       cacheDirPlugin(ctx.flow.options.rootDir, "server")
@@ -1254,6 +1258,7 @@ async function bundleVite(flow) {
     nuxt: flow,
     flow,
     config: vite.mergeConfig({
+      mode: flow.options.dev ? "development" : void 0,
       resolve: {
         alias: {
           ...flow.options.alias,
@@ -1300,6 +1305,8 @@ async function bundleVite(flow) {
       }
     }, flow.options.vite)
   };
+  if (flow.options.dev)
+    ctx.config.mode = process.env.NODE_ENV || "development";
   await flow.callHook("vite:extend", ctx);
   flow.hook("vite:serverCreated", (server) => {
     ctx.nuxt.hook("app:templatesGenerated", () => {

package/package.json

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

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

@@ -22,6 +22,7 @@ export async function bundleVite(flow: Flow) {
     nuxt: flow,
     flow,
     config: vite.mergeConfig({
+      mode: flow.options.dev ? 'development' : undefined,
       resolve: {
         alias: {
           ...flow.options.alias,
@@ -71,6 +72,9 @@ export async function bundleVite(flow: Flow) {
       },
     }, flow.options.vite),
   };
+  if (flow.options.dev)
+    ctx.config.mode = process.env.NODE_ENV || 'development';
+
   await flow.callHook('vite:extend', ctx);
 
   flow.hook('vite:serverCreated', (server: vite.ViteDevServer) => {

package/src/core/vite/builder/server.ts

@@ -57,6 +57,9 @@ export const buildServer = async(ctx: ViteBuildContext) => {
       // https://github.com/vitest-dev/vitest/issues/229#issuecomment-1002685027
       preTransformRequests: false,
       cors: true,
+      watch: {
+        ignored: ['**/.env*'],
+      },
     },
     plugins: [
       cacheDirPlugin(ctx.flow.options.rootDir, 'server'),

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

@@ -7,23 +7,25 @@ export const createClient = async(flow: Flow) => {
   const vite = await createServer({
     root: resolve(flow.options.rootDir),
     base: '/_vite/',
+
     build: {
+
       manifest: true,
     },
     server: {
+      watch: {
+        ignored: ['**/.env/**', '**/.env*'],
+      },
       middlewareMode: 'ssr',
+      //
     },
   });
   const _doReload = () => {
-    try {
-      vite.ws.send({ type: 'full-reload' });
-    }
-    catch (error) {
-      //
-    }
+    if (vite)
+      vite?.ws?.send({ type: 'full-reload' });
   };
 
-  const doReload = debounce(_doReload);
+  const doReload = debounce(_doReload, 50);
 
   // Use this to refresh page
   flow.hook('bundler:change', () => {
@@ -31,12 +33,7 @@ export const createClient = async(flow: Flow) => {
   });
 
   flow.hook('close', async() => {
-    try {
-      await vite?.close();
-    }
-    catch (error) {
-      //
-    }
+    await vite.close();
   });
 
   return vite;

package/src/vite-client/module.ts

@@ -22,13 +22,22 @@ export default defineFlowModule<OptionsViteClient>({
     const runtimeDir = resolve(distDir, 'vite-client/runtime');
     flow.options.alias['#viteManifest'] = resolve(flow.options.buildDir, 'viteManifest.mjs');
 
+    let vite: any;
     if (flow.options.dev) {
-      const vite = await createClient(flow);
-
-      addDevServerHandler({
-        route: _options.route,
-        handler: vite.middlewares,
+      flow.hook('nitro:init', async(nitro) => {
+        vite = await createClient(flow);
+        // return vite.middlewares;
+        nitro.options.devHandlers.push({
+          handler: vite.middlewares,
+          route: _options.route,
+        });
       });
+      // addDevServerHandler({
+      //   route: _options.route,
+      //   handler: async(req, res) => {
+      //     return await vite.middlewares(req, res);
+      //   },
+      // });
 
       addTemplate({
         filename: 'viteManifest.mjs',