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

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, nuxtCtx, installModule, loadFlowConfig, templateUtils, normalizeTemplate, compileTemplate, normalizePlugin, resolveFilesFlow, isIgnoredFlow } from '@monkeyplus/flow-kit';
+import { defineFlowModule, addPlugin, defineNuxtModule, logger, addTemplate, addPluginTemplate, addVitePlugin, useNuxt, resolveAlias, resolveFilesFlow, nuxtCtx, installModule, loadFlowConfig, templateUtils, normalizeTemplate, compileTemplate, normalizePlugin, 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.10";
+const version = "5.0.0-beta.12";
 
 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 resolveFiles(dir, `**/*{${nuxt.options.extensions.join(",")}}`);
+    const files = await resolveFilesFlow(dir, `**/*{${nuxt.options.extensions.join(",")}}`);
     files.sort();
     return files.map((file) => {
       const segments = relative(dir, file).replace(new RegExp(`${escapeRE(extname(file))}$`), "").split("/").join("_");
@@ -316,7 +316,7 @@ const createClient = async (flow) => {
     if (vite)
       vite?.ws?.send({ type: "full-reload" });
   };
-  const doReload = debounce(_doReload, 50);
+  const doReload = debounce(_doReload, 60);
   flow.hook("bundler:change", () => {
     doReload();
   });
@@ -340,14 +340,17 @@ const builClient = async (flow) => {
 
 const viteModule = defineFlowModule({
   meta: {
-    name: "viteClient"
+    name: "vite-client",
+    configKey: "bundle"
   },
   defaults: {
-    route: "/_vite/"
+    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;
     if (flow.options.dev) {
       flow.hook("nitro:init", async (nitro) => {
@@ -362,9 +365,9 @@ const viteModule = defineFlowModule({
         async getContents() {
           return [
             "export default {",
-            'head:()=>`<script type="module" src="/_vite/@vite/client"><\/script>`',
+            `head:()=>'<script type="module" src="${joinURL("/", _options.route, "/@vite/client")}"><\/script>'`,
             ",",
-            'body: (bundle)=>`<script type="module" src="/_vite/client/pages/${bundle}.ts"><\/script>`',
+            `body: (bundle)=>\`<script type="module" src="${joinURL("/", _options.route, _options.dir)}/\${bundle}.ts"><\/script>\``,
             "}"
           ].join("\n");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "5.0.0-beta.10",
+  "version": "5.0.0-beta.12",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -14,9 +14,9 @@
     "flow": "./bin/flow.mjs"
   },
   "dependencies": {
-    "@monkeyplus/flow-cli": "5.0.0-beta.10",
-    "@monkeyplus/flow-kit": "5.0.0-beta.10",
-    "@monkeyplus/flow-schema": "5.0.0-beta.10",
+    "@monkeyplus/flow-cli": "5.0.0-beta.12",
+    "@monkeyplus/flow-kit": "5.0.0-beta.12",
+    "@monkeyplus/flow-schema": "5.0.0-beta.12",
     "@rollup/plugin-replace": "^4.0.0",
     "@vueuse/head": "^0.7.6",
     "c12": "^0.2.7",

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

@@ -25,7 +25,7 @@ export const createClient = async(flow: Flow) => {
       vite?.ws?.send({ type: 'full-reload' });
   };
 
-  const doReload = debounce(_doReload, 50);
+  const doReload = debounce(_doReload, 60);
 
   // Use this to refresh page
   flow.hook('bundler:change', () => {

package/src/pages/utils.ts

@@ -1,5 +1,5 @@
 
-import { resolveFiles, useNuxt } from '@monkeyplus/flow-kit';
+import { resolveFilesFlow, 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 resolveFiles(dir, `**/*{${nuxt.options.extensions.join(',')}}`);
+      const files = await resolveFilesFlow(dir, `**/*{${nuxt.options.extensions.join(',')}}`);
 
       // Sort to make sure parent are listed first
 

package/src/vite-client/module.ts

@@ -4,23 +4,28 @@ 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: 'viteClient',
+    name: 'vite-client',
+    configKey: 'bundle',
   },
   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) {
@@ -43,10 +48,10 @@ export default defineFlowModule<OptionsViteClient>({
         filename: 'viteManifest.mjs',
         async getContents() {
           return ['export default {',
-            'head:()=>`<script type="module" src="/_vite/@vite/client"></script>`',
+            `head:()=>'<script type="module" src="${joinURL('/', _options.route, '/@vite/client')}"></script>'`,
             ',',
             // eslint-disable-next-line no-template-curly-in-string
-            'body: (bundle)=>`<script type="module" src="/_vite/client/pages/${bundle}.ts"></script>`',
+            `body: (bundle)=>\`<script type="module" src="${joinURL('/', _options.route, _options.dir)}/\${bundle}.ts"></script>\``,
             '}',
           ].join('\n');
         },