@monkeyplus/flow 5.0.0-beta.9 → 5.0.0-rc.1

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.9";
+const version = "5.0.0-rc.1";
 
 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("_");
@@ -299,29 +299,35 @@ const pagesModule = defineNuxtModule({
 });
 
 const createClient = async (flow) => {
-  const vite = await createServer({
-    root: resolve(flow.options.rootDir),
-    base: "/_vite/",
-    build: {
-      manifest: true
-    },
-    server: {
-      watch: {
-        ignored: ["**/.env/**", "**/.env*"]
+  let vite;
+  if (globalThis.viteClient) {
+    vite = globalThis.viteClient;
+  } else {
+    vite = await createServer({
+      root: resolve(flow.options.rootDir),
+      base: "/_vite/",
+      build: {
+        manifest: true
       },
-      middlewareMode: "ssr"
-    }
-  });
+      server: {
+        watch: {
+          ignored: ["**/.env/**", "**/.env*"]
+        },
+        middlewareMode: "ssr"
+      }
+    });
+    globalThis.viteClient = vite;
+  }
   const _doReload = () => {
     if (vite)
       vite?.ws?.send({ type: "full-reload" });
   };
-  const doReload = debounce(_doReload, 50);
+  const doReload = debounce(_doReload, 60);
   flow.hook("bundler:change", () => {
     doReload();
   });
   flow.hook("close", async () => {
-    await vite.close();
+    vite.restart();
   });
   return vite;
 };
@@ -340,10 +346,12 @@ 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");
@@ -362,9 +370,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");
         }
@@ -1095,10 +1103,7 @@ const buildServer = async (ctx) => {
     },
     server: {
       preTransformRequests: false,
-      cors: true,
-      watch: {
-        ignored: ["**/.env*"]
-      }
+      cors: true
     },
     plugins: [
       cacheDirPlugin(ctx.flow.options.rootDir, "server")
@@ -1347,6 +1352,7 @@ function watch(flow) {
     cwd: flow.options.srcDir,
     ignoreInitial: true,
     ignored: [
+      isIgnoredFlow,
       ".flow",
       "node_modules"
     ]

package/dist/pages/runtime/helpers/index.mjs

@@ -16,7 +16,7 @@ const buildPages = (page) => (location, language) => {
     return {
       name,
       url: path,
-      context: { page: localePage, locale: _locale, path, view: page.view, name }
+      context: { page: localePage, locale: _locale, path, view: page.view, name: page.name }
     };
   });
 };

package/dist/pages/runtime/index.d.ts

@@ -0,0 +1,3 @@
+import type { DynamicPage, SimplePage } from '@monkeyplus/flow-schema';
+export declare function definePage(page: SimplePage): SimplePage;
+export declare function defineDinamycPage(page: DynamicPage): DynamicPage;

package/dist/pages/runtime/index.mjs

@@ -0,0 +1,6 @@
+export function definePage(page) {
+  return page;
+}
+export function defineDinamycPage(page) {
+  return page;
+}

package/dist/pages/runtime/plugin.mjs

@@ -24,18 +24,19 @@ export default defineFlowPlugin(async (flow) => {
     const { path } = flow.router.byName.lookup(name) || {};
     return path || "/404";
   }
-  async function getUrls() {
+  async function getUrls(withLocale = false) {
     const urls = [];
     for (const page of allPages) {
       if (!page.path.includes("/**")) {
-        urls.push(page.path);
+        urls.push(withLocale ? { url: page.path, locale: page.locale.code, name: page.name } : page.path);
       } else {
         const dPages = await page.page.dynamic.method({
           locale: page.locale,
           utils: Object.assign({ getLocale: () => page.locale }, flow.app.utils)
         });
         dPages.forEach((dPage) => {
-          urls.push(joinURL(page.path.replace("/**", ""), dPage.url));
+          const _path = joinURL(page.path.replace("/**", ""), dPage.url);
+          urls.push(withLocale ? { url: _path, locale: page.locale.code, name: joinURL(page.name, dPage.name) } : _path);
         });
       }
     }
@@ -43,6 +44,7 @@ export default defineFlowPlugin(async (flow) => {
   }
   flow.setUtil("getUrl", getUrl);
   flow.setUtil("getUrls", getUrls);
+  flow.setUtil("getPages", () => allPages);
   return {
     provide: {
       pages: { allPages }

package/package.json

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

package/src/core/builder.ts

@@ -1,6 +1,7 @@
 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';
 
@@ -36,7 +37,7 @@ function watch(flow: Flow) {
     cwd: flow.options.srcDir,
     ignoreInitial: true,
     ignored: [
-      // isIgnored,
+      isIgnoredFlow,
       '.flow',
       'node_modules',
     ],

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

@@ -57,9 +57,6 @@ 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

@@ -1,31 +1,38 @@
 import { resolve } from 'pathe';
 import type { Flow } from '@monkeyplus/flow-schema';
+import type { ViteDevServer } from 'vite';
 import { build, createServer } from 'vite';
 import { debounce } from 'perfect-debounce';
 
 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*'],
+  let vite: ViteDevServer;
+  if (globalThis.viteClient) {
+    vite = globalThis.viteClient as ViteDevServer;
+  }
+  else {
+    vite = await createServer({
+      root: resolve(flow.options.rootDir),
+      base: '/_vite/',
+      build: {
+        manifest: true,
       },
-      middlewareMode: 'ssr',
+      server: {
+        watch: {
+          ignored: ['**/.env/**', '**/.env*'],
+        },
+        middlewareMode: 'ssr',
       //
-    },
-  });
+      },
+    });
+    globalThis.viteClient = vite;
+  }
+
   const _doReload = () => {
     if (vite)
       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', () => {
@@ -33,7 +40,8 @@ export const createClient = async(flow: Flow) => {
   });
 
   flow.hook('close', async() => {
-    await vite.close();
+    vite.restart();
+    // await vite.close();
   });
 
   return vite;

package/src/pages/runtime/helpers/index.ts

@@ -19,7 +19,7 @@ const buildPages = (page: PageDefinition): GetPages => (location: string, langua
     return {
       name,
       url: path,
-      context: { page: localePage, locale: _locale, path, view: page.view, name },
+      context: { page: localePage, locale: _locale, path, view: page.view, name: page.name },
       // locale: _locale,
     };
   });

package/src/pages/runtime/index.ts

@@ -0,0 +1,9 @@
+import type { DynamicPage, SimplePage } from '@monkeyplus/flow-schema';
+
+export function definePage(page: SimplePage) {
+  return page;
+}
+
+export function defineDinamycPage(page: DynamicPage) {
+  return page;
+}

package/src/pages/runtime/plugin.ts

@@ -32,17 +32,22 @@ export default defineFlowPlugin(async(flow) => {
     return path || '/404';
   }
 
-  async function getUrls() {
-    const urls: string[] = [];
+  async function getUrls(withLocale = false) {
+    const urls: (string|{ url: string; locale: string; name: string })[] = [];
     for (const page of allPages) {
-      if (!page.path.includes('/**')) { urls.push(page.path); }
+      if (!page.path.includes('/**')) {
+        urls.push(withLocale
+          ? { url: page.path, locale: page.locale.code, name: page.name }
+          : page.path);
+      }
       else {
         const dPages = await page.page.dynamic.method({
           locale: page.locale,
           utils: Object.assign({ getLocale: () => page.locale }, flow.app.utils),
         });
         dPages.forEach((dPage) => {
-          urls.push(joinURL(page.path.replace('/**', ''), dPage.url));
+          const _path = joinURL(page.path.replace('/**', ''), dPage.url);
+          urls.push(withLocale ? { url: _path, locale: page.locale.code, name: joinURL(page.name, dPage.name) } : _path);
         });
       }
     }
@@ -50,6 +55,8 @@ export default defineFlowPlugin(async(flow) => {
   }
   flow.setUtil('getUrl', getUrl);
   flow.setUtil('getUrls', getUrls);
+  flow.setUtil('getPages', () => allPages);
+
   return {
     provide: {
       pages: { allPages },

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

@@ -1,27 +1,30 @@
-import { addDevServerHandler, addPlugin, addTemplate, defineFlowModule } from '@monkeyplus/flow-kit';
+import { addPlugin, addTemplate, defineFlowModule } from '@monkeyplus/flow-kit';
 import type { FlowModule } from '@monkeyplus/flow-schema';
 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');
-
     let vite: any;
     if (flow.options.dev) {
       flow.hook('nitro:init', async(nitro) => {
@@ -43,10 +46,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');
         },