@monkeyplus/flow 6.0.61 → 6.0.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "6.0.61",
+  "version": "6.0.62",
   "description": "@monkeyplus/flow package-first runtime with Vite, Nitro, Vue and a workspace playground.",
   "license": "MIT",
   "publishConfig": {

package/server/lib/pages.d.ts

@@ -1,4 +1,4 @@
-import type { DynamicRouteEntry, FlowLocale, GetUrlOptions, HeadDefinition, PageDefinition, PageLocaleDefinition, PageUrlInfo, BreadcrumbItem } from '../../src/runtime/pages';
+import type { BreadcrumbItem, DynamicRouteEntry, FlowLocale, GetUrlOptions, HeadDefinition, PageDefinition, PageLocaleDefinition, PageUrlInfo } from '../../src/runtime/pages';
 export interface ResolvedPage {
     definition: PageDefinition;
     locale: FlowLocale;

package/server/lib/pages.mjs

@@ -1,4 +1,5 @@
 import { createRequire } from "node:module";
+import flowVirtualConfig from "virtual:flow/config";
 import layoutContexts from "virtual:flow/layout-contexts";
 import pageDefinitions from "virtual:flow/pages";
 import { getFlowImageRuntimeUtils } from "../../modules/images/runtime/server.mjs";
@@ -39,9 +40,21 @@ function getFlowRuntimeConfig() {
   try {
     runtimeConfigRequire ??= createRequire(import.meta.url);
     const runtime = runtimeConfigRequire("nitro/runtime-config");
-    return typeof runtime.useRuntimeConfig === "function" ? runtime.useRuntimeConfig() : {};
-  } catch {
-    return {};
+    let config = {};
+    if (typeof runtime.useRuntimeConfig === "function") {
+      config = runtime.useRuntimeConfig() || {};
+    }
+    return {
+      ...config,
+      flow: {
+        ...flowVirtualConfig,
+        ...config.public?.flow || {},
+        ...config.flow || {}
+      }
+    };
+  } catch (e) {
+    console.error("--- getFlowRuntimeConfig crashed:", e);
+    return { flow: flowVirtualConfig };
   }
 }
 function scorePattern(pattern) {
@@ -106,6 +119,7 @@ function createContext(definition, locale, localePage, pathname, params, dynamic
     locale,
     path: pathname,
     fullPath,
+    siteUrl,
     name: definition.name,
     page: localePage,
     params,
@@ -378,9 +392,11 @@ export async function resolveBreadcrumbs(pageName, pathname, localeCode, params,
   }
   visited.add(pageName);
   const definition = pageDefinitions.find((candidate) => candidate.name === pageName);
-  if (!definition) return [];
+  if (!definition)
+    return [];
   const localePage = definition.locales[localeCode];
-  if (!localePage || !localePage.breadcrumb) return [];
+  if (!localePage || !localePage.breadcrumb)
+    return [];
   const locale = createLocale(localeCode);
   const ctx = createContext(definition, locale, localePage, pathname, params, dynamic, request);
   const pageContext = localePage.context ? await localePage.context(ctx) : {};
@@ -392,7 +408,8 @@ export async function resolveBreadcrumbs(pageName, pathname, localeCode, params,
     seo: pageHead.seo || pageHead
   };
   const result = await localePage.breadcrumb(breadcrumbCtx);
-  if (!result) return [];
+  if (!result)
+    return [];
   let currentItems = [];
   if (result.items) {
     currentItems = result.items;

package/server/test-nitro.d.ts

@@ -0,0 +1 @@
+export {};

package/server/test-nitro.mjs

@@ -0,0 +1,14 @@
+import { createRequire } from 'node:module';
+const req = createRequire(import.meta.url);
+try {
+  const nitro = req('#internal/nitro');
+  console.log('nitro', nitro);
+} catch (e) {
+  console.log('error #internal/nitro', e.message);
+}
+try {
+  const nitro2 = req('nitro/runtime-config');
+  console.log('nitro2', nitro2);
+} catch (e) {
+  console.log('error nitro/runtime-config', e.message);
+}

package/src/public/nitro.mjs

@@ -5,6 +5,7 @@ import { loadFlowModules } from "../runtime/modules.mjs";
 import { createFlowBuildHooks } from "../runtime/ssg.mjs";
 import {
   createVirtualBaseTemplatesModule,
+  createVirtualConfigModule,
   createVirtualIslandsModule,
   createVirtualLayoutContextsModule,
   createVirtualLayoutsModule,
@@ -54,6 +55,7 @@ export function createFlowNitroConfig(options = {}) {
       "virtual:flow/layouts": createVirtualLayoutsModule(projectRoot),
       "virtual:flow/layout-contexts": createVirtualLayoutContextsModule(projectRoot),
       "virtual:flow/bases": createVirtualBaseTemplatesModule(projectRoot),
+      "virtual:flow/config": createVirtualConfigModule(flowConfig),
       ...flowModules.nitro.virtual
     },
     hooks: createFlowBuildHooks({
@@ -88,6 +90,12 @@ export function createFlowNitroConfig(options = {}) {
         name: "Flow Next",
         version: "0.1.0"
       },
+      public: {
+        flow: {
+          siteUrl: flowConfig.siteUrl,
+          locale: flowConfig.locale
+        }
+      },
       flow: {
         build: flowConfig.build,
         dir: flowConfig.dir,

package/src/public/vite.mjs

@@ -12,6 +12,7 @@ import { loadFlowModules } from "../runtime/modules.mjs";
 import { getPrerenderRoutes } from "../runtime/page-discovery.mjs";
 import {
   createVirtualBaseTemplatesModule,
+  createVirtualConfigModule,
   createVirtualClientPageAssetsModule,
   createVirtualClientPagesModule,
   createVirtualIslandsModule,
@@ -212,7 +213,8 @@ function createFlowVirtualServerModules(projectRoot, flowConfig) {
     ["virtual:flow/layouts", () => createVirtualLayoutsModule(projectRoot)],
     ["virtual:flow/layout-contexts", () => createVirtualLayoutContextsModule(projectRoot)],
     ["virtual:flow/bases", () => createVirtualBaseTemplatesModule(projectRoot)],
-    ["virtual:flow/server-styles", () => createVirtualServerStylesModule(projectRoot)]
+    ["virtual:flow/server-styles", () => createVirtualServerStylesModule(projectRoot)],
+    ["virtual:flow/config", () => createVirtualConfigModule(flowConfig)]
   ]);
   return {
     name: "flow:server-virtuals",

package/src/runtime/pages.d.ts

@@ -101,6 +101,7 @@ export interface PageContextInput {
     path: string;
     fullPath?: string;
     name: string;
+    siteUrl: string;
     view: PageViewDefinition;
     page: PageLocaleDefinition;
     params: Record<string, string>;

package/src/runtime/virtual-pages.d.ts

@@ -8,3 +8,4 @@ export declare function createVirtualIslandsModule(projectRoot: string): string;
 export declare function createVirtualClientPagesModule(projectRoot: string): string;
 export declare function createVirtualClientPageAssetsModule(projectRoot: string): string;
 export declare function createVirtualServerStylesModule(projectRoot: string): string;
+export declare function createVirtualConfigModule(flowConfig: import('./config').FlowConfig): string;

package/src/runtime/virtual-pages.mjs

@@ -188,3 +188,10 @@ export function createVirtualServerStylesModule(projectRoot) {
     ""
   ].join("\n");
 }
+export function createVirtualConfigModule(flowConfig) {
+  return [
+    `export const siteUrl = ${JSON.stringify(flowConfig.siteUrl)};`,
+    `export const locale = ${JSON.stringify(flowConfig.locale)};`,
+    `export default { siteUrl, locale };`
+  ].join("\n");
+}