@monkeyplus/flow 5.0.0-beta.12 → 5.0.0-beta.2

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, resolveFilesFlow, nuxtCtx, installModule, loadFlowConfig, templateUtils, normalizeTemplate, compileTemplate, normalizePlugin, isIgnoredFlow } from '@monkeyplus/flow-kit';
+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 { 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.12";
+const version = "5.0.0-beta.2";
 
 let _distDir = dirname(fileURLToPath(import.meta.url));
 if (_distDir.endsWith("chunks"))
@@ -225,7 +225,7 @@ async function resolvePagesRoutes() {
   const nuxt = useNuxt();
   const pagesDirs = [...new Set(nuxt.options._layers.map((layer) => resolve(layer.config.srcDir, layer.config.dir?.pages || "pages")))];
   const allRoutes = (await Promise.all(pagesDirs.map(async (dir) => {
-    const files = await resolveFilesFlow(dir, `**/*{${nuxt.options.extensions.join(",")}}`);
+    const files = await resolveFiles(dir, `**/*{${nuxt.options.extensions.join(",")}}`);
     files.sort();
     return files.map((file) => {
       const segments = relative(dir, file).replace(new RegExp(`${escapeRE(extname(file))}$`), "").split("/").join("_");
@@ -306,17 +306,13 @@ const createClient = async (flow) => {
       manifest: true
     },
     server: {
-      watch: {
-        ignored: ["**/.env/**", "**/.env*"]
-      },
       middlewareMode: "ssr"
     }
   });
   const _doReload = () => {
-    if (vite)
-      vite?.ws?.send({ type: "full-reload" });
+    vite.ws.send({ type: "full-reload" });
   };
-  const doReload = debounce(_doReload, 60);
+  const doReload = debounce(_doReload, 50);
   flow.hook("bundler:change", () => {
     doReload();
   });
@@ -340,34 +336,28 @@ const builClient = async (flow) => {
 
 const viteModule = defineFlowModule({
   meta: {
-    name: "vite-client",
-    configKey: "bundle"
+    name: "viteClient"
   },
   defaults: {
-    route: "/_vite/",
-    dir: "/client/pages"
+    route: "/_vite/"
   },
   async setup(_options, flow) {
     const runtimeDir = resolve(distDir, "vite-client/runtime");
     flow.options.alias["#viteManifest"] = resolve(flow.options.buildDir, "viteManifest.mjs");
-    console.log(_options);
-    let vite;
     if (flow.options.dev) {
-      flow.hook("nitro:init", async (nitro) => {
-        vite = await createClient(flow);
-        nitro.options.devHandlers.push({
-          handler: vite.middlewares,
-          route: _options.route
-        });
+      const _vite = await createClient(flow);
+      addDevServerHandler({
+        handler: _vite.middlewares,
+        route: _options.route
       });
       addTemplate({
         filename: "viteManifest.mjs",
         async getContents() {
           return [
             "export default {",
-            `head:()=>'<script type="module" src="${joinURL("/", _options.route, "/@vite/client")}"><\/script>'`,
+            'head:()=>`<script type="module" src="/_vite/@vite/client"><\/script>`',
             ",",
-            `body: (bundle)=>\`<script type="module" src="${joinURL("/", _options.route, _options.dir)}/\${bundle}.ts"><\/script>\``,
+            'body: (bundle)=>`<script type="module" src="/_vite/client/pages/${bundle}.ts"><\/script>`',
             "}"
           ].join("\n");
         }
@@ -1076,7 +1066,6 @@ const buildServer = async (ctx) => {
         "/__vue-jsx",
         "#app",
         /(nuxt|nuxt3)\/(dist|src|app)/,
-        /@monkeyplus\/flow\/(dist|src|app)/,
         /@nuxt\/nitro\/(dist|src)/
       ]
     },
@@ -1258,7 +1247,6 @@ async function bundleVite(flow) {
     nuxt: flow,
     flow,
     config: vite.mergeConfig({
-      mode: flow.options.dev ? "development" : void 0,
       resolve: {
         alias: {
           ...flow.options.alias,
@@ -1305,8 +1293,6 @@ 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", () => {
@@ -1347,7 +1333,6 @@ function watch(flow) {
     cwd: flow.options.srcDir,
     ignoreInitial: true,
     ignored: [
-      isIgnoredFlow,
       ".flow",
       "node_modules"
     ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "5.0.0-beta.12",
+  "version": "5.0.0-beta.2",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -14,9 +14,10 @@
     "flow": "./bin/flow.mjs"
   },
   "dependencies": {
-    "@monkeyplus/flow-cli": "5.0.0-beta.12",
-    "@monkeyplus/flow-kit": "5.0.0-beta.12",
-    "@monkeyplus/flow-schema": "5.0.0-beta.12",
+    "@monkeyplus/flow-cli": "5.0.0-beta.2",
+    "@monkeyplus/flow-kit": "5.0.0-beta.2",
+    "@monkeyplus/flow-schema": "5.0.0-beta.2",
+    "@nuxt/vite-builder": "3.0.0-rc.1",
     "@rollup/plugin-replace": "^4.0.0",
     "@vueuse/head": "^0.7.6",
     "c12": "^0.2.7",
@@ -55,7 +56,7 @@
     "unplugin": "^0.6.3",
     "untyped": "^0.4.4",
     "vite": "^2.9.9",
-    "vue": "^3.2.33"
+    "vue": "^3"
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.13"

package/src/core/builder.ts

@@ -1,7 +1,6 @@
 import { normalize } from 'pathe';
 import chokidar from 'chokidar';
 import type { Flow } from '@monkeyplus/flow-schema';
-import { isIgnoredFlow } from '@monkeyplus/flow-kit';
 import { debounce } from 'perfect-debounce';
 import { generateApp as _generateApp, createApp } from './app';
 
@@ -37,7 +36,7 @@ function watch(flow: Flow) {
     cwd: flow.options.srcDir,
     ignoreInitial: true,
     ignored: [
-      isIgnoredFlow,
+      // isIgnored,
       '.flow',
       'node_modules',
     ],

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

@@ -17,14 +17,12 @@ 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/builder/index.ts

@@ -22,7 +22,6 @@ export async function bundleVite(flow: Flow) {
     nuxt: flow,
     flow,
     config: vite.mergeConfig({
-      mode: flow.options.dev ? 'development' : undefined,
       resolve: {
         alias: {
           ...flow.options.alias,
@@ -72,9 +71,6 @@ 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

@@ -33,7 +33,6 @@ export const buildServer = async(ctx: ViteBuildContext) => {
         '/__vue-jsx',
         '#app',
         /(nuxt|nuxt3)\/(dist|src|app)/,
-        /@monkeyplus\/flow\/(dist|src|app)/,
         /@nuxt\/nitro\/(dist|src)/,
       ],
     },

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

@@ -7,25 +7,18 @@ 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 = () => {
-    if (vite)
-      vite?.ws?.send({ type: 'full-reload' });
+    vite.ws.send({ type: 'full-reload' });
   };
 
-  const doReload = debounce(_doReload, 60);
+  const doReload = debounce(_doReload, 50);
 
   // Use this to refresh page
   flow.hook('bundler:change', () => {

package/src/pages/utils.ts

@@ -1,5 +1,5 @@
 
-import { resolveFilesFlow, useNuxt } from '@monkeyplus/flow-kit';
+import { resolveFiles, useNuxt } from '@monkeyplus/flow-kit';
 import { extname, relative, resolve } from 'pathe';
 import escapeRE from 'escape-string-regexp';
 import { camelCase } from 'scule';
@@ -17,7 +17,7 @@ export async function resolvePagesRoutes(): Promise<Pages[]> {
 
   const allRoutes: Pages[] = (await Promise.all(
     pagesDirs.map(async(dir) => {
-      const files = await resolveFilesFlow(dir, `**/*{${nuxt.options.extensions.join(',')}}`);
+      const files = await resolveFiles(dir, `**/*{${nuxt.options.extensions.join(',')}}`);
 
       // Sort to make sure parent are listed first
 

package/src/vite-client/module.ts

@@ -4,54 +4,38 @@ import { resolve } from 'pathe';
 // import { genImport } from 'knitwork';
 import fse from 'fs-extra';
 import logger from 'consola';
-import { joinURL } from 'ufo';
 import { builClient, createClient } from '../core/vite/client';
 import { distDir } from '../dirs';
 
 interface OptionsViteClient{
   route: string
-  dir: string
 }
 export default defineFlowModule<OptionsViteClient>({
 
   meta: {
-    name: 'vite-client',
-    configKey: 'bundle',
+    name: 'viteClient',
   },
   defaults: {
     route: '/_vite/',
-    dir: '/client/pages',
   },
   async setup(_options, flow) {
     const runtimeDir = resolve(distDir, 'vite-client/runtime');
     flow.options.alias['#viteManifest'] = resolve(flow.options.buildDir, 'viteManifest.mjs');
-    console.log(_options);
 
-    let vite: any;
     if (flow.options.dev) {
-      flow.hook('nitro:init', async(nitro) => {
-        vite = await createClient(flow);
-        // return vite.middlewares;
-        nitro.options.devHandlers.push({
-          handler: vite.middlewares,
-          route: _options.route,
-        });
+      const _vite = await createClient(flow);
+      addDevServerHandler({
+        handler: _vite.middlewares,
+        route: _options.route,
       });
-      // addDevServerHandler({
-      //   route: _options.route,
-      //   handler: async(req, res) => {
-      //     return await vite.middlewares(req, res);
-      //   },
-      // });
-
       addTemplate({
         filename: 'viteManifest.mjs',
         async getContents() {
           return ['export default {',
-            `head:()=>'<script type="module" src="${joinURL('/', _options.route, '/@vite/client')}"></script>'`,
+            'head:()=>`<script type="module" src="/_vite/@vite/client"></script>`',
             ',',
             // eslint-disable-next-line no-template-curly-in-string
-            `body: (bundle)=>\`<script type="module" src="${joinURL('/', _options.route, _options.dir)}/\${bundle}.ts"></script>\``,
+            'body: (bundle)=>`<script type="module" src="/_vite/client/pages/${bundle}.ts"></script>`',
             '}',
           ].join('\n');
         },