@monkeyplus/flow 5.0.0-rc.26 → 5.0.0-rc.28

package/dist/index.mjs

@@ -29,7 +29,7 @@ import { isExternal as isExternal$1, ExternalsDefaults } from 'externality';
 import { createHash } from 'node:crypto';
 import MagicString from 'magic-string';
 
-const version = "5.0.0-rc.26";
+const version = "5.0.0-rc.28";
 
 let _distDir = dirname(fileURLToPath(import.meta.url));
 if (_distDir.endsWith("chunks"))
@@ -426,7 +426,10 @@ const viteModule = defineFlowModule({
         async getContents() {
           return [
             "import fs from 'fs';",
-            `export default ()=>JSON.parse(fs.readFileSync("${file}", 'utf8'))`
+            `export default ()=>{
+            const manifest =JSON.parse(fs.readFileSync("${file}", 'utf8');
+            return {manifest,base:'${_options.dir}'}
+          })`
           ].join("\n");
         }
       });

package/dist/pages/runtime/pages.mjs

@@ -46,17 +46,19 @@ export default defineFlowPlugin(async (flow) => {
   async function getUrls(withLocale = false) {
     const urls = [];
     for (const page of allPages) {
-      if (!page.path.includes("/**")) {
-        urls.push(withLocale ? { url: page.path, locale: page.locale.code, name: page.name } : page.path);
-      } else {
+      if (page.path.includes("/**") && page.page.dynamic) {
         const dPages = await page.page.dynamic.method({
           locale: page.locale,
-          utils: Object.assign({ getLocale: () => page.locale }, flow.app.utils)
+          utils: Object.assign({ getLocale: () => page.locale }, flow.app.utils),
+          chunks: {}
         });
         dPages.forEach((dPage) => {
           const _path = joinURL(page.path.replace("/**", ""), dPage.url);
           urls.push(withLocale ? { url: _path, locale: page.locale.code, name: joinURL(page.name, dPage.name) } : _path);
         });
+      } else {
+        const url = page.path.replaceAll("*", "");
+        urls.push(withLocale ? { url, locale: page.locale.code, name: page.name } : url);
       }
     }
     return urls.sort();

package/dist/vite-client/runtime/plugin.mjs

@@ -1,4 +1,5 @@
 import logger from "consola";
+import { joinURL } from "ufo";
 import { generateBundle } from "./injectManifest.mjs";
 import { defineFlowPlugin } from "#app";
 import manifest from "#viteManifest";
@@ -6,7 +7,8 @@ export default defineFlowPlugin((flow) => {
   if (typeof manifest === "function") {
     flow.hook("page:chunks", (bundle, chunks) => {
       try {
-        const chunk = generateBundle(flow.$config.app || {}, manifest(), `client/pages/${bundle}.ts`);
+        const data = manifest();
+        const chunk = generateBundle(flow.$config.app || {}, data.manifest, joinURL("/", data.base, `${bundle}.ts`).replace("/", ""));
         if (chunk) {
           chunks.head.push(chunk.head);
           chunks.body.push(chunk.body);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "5.0.0-rc.26",
+  "version": "5.0.0-rc.28",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -25,9 +25,9 @@
     "dist"
   ],
   "dependencies": {
-    "@monkeyplus/flow-cli": "5.0.0-rc.26",
-    "@monkeyplus/flow-kit": "5.0.0-rc.26",
-    "@monkeyplus/flow-schema": "5.0.0-rc.26",
+    "@monkeyplus/flow-cli": "5.0.0-rc.28",
+    "@monkeyplus/flow-kit": "5.0.0-rc.28",
+    "@monkeyplus/flow-schema": "5.0.0-rc.28",
     "@rollup/plugin-replace": "^4.0.0",
     "@vueuse/head": "^0.7.6",
     "c12": "^0.2.7",