@monkeyplus/flow 6.0.15 → 6.0.17

package/modules/netlify-cms/runtime/cms.d.ts

@@ -1,3 +1,3 @@
-export { defineCmsCollection } from '../server/lib/composables';
-export { widgets } from '../server/lib/cms/widgets';
 export { collections } from '../server/lib/cms/helpers';
+export { widgets } from '../server/lib/cms/widgets';
+export { defineCmsCollection } from '../server/lib/composables';

package/modules/netlify-cms/runtime/cms.mjs

@@ -1,3 +1,3 @@
-export { defineCmsCollection } from "../server/lib/composables.mjs";
-export { widgets } from "../server/lib/cms/widgets.mjs";
 export { collections } from "../server/lib/cms/helpers.mjs";
+export { widgets } from "../server/lib/cms/widgets.mjs";
+export { defineCmsCollection } from "../server/lib/composables.mjs";

package/modules/netlify-cms/server/api/config.mjs

@@ -1,12 +1,12 @@
+import fs from "node:fs";
+import { resolve } from "node:path";
+import process from "node:process";
 import defu from "defu";
+import { createJiti } from "jiti";
 import yml from "js-yaml";
 import { defineEventHandler, setResponseHeader } from "nitro/h3";
 import { collections, defineCms } from "../lib/cms/helpers.mjs";
 import { widgets } from "../lib/cms/widgets.mjs";
-import fs from "node:fs";
-import { resolve } from "node:path";
-import { createJiti } from "jiti";
-import process from "node:process";
 import { defineCmsCollection } from "../lib/composables.mjs";
 export default defineEventHandler(async (event) => {
   if (!globalThis.defineCmsCollection) {

package/package.json

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

package/src/public/nitro.mjs

@@ -67,6 +67,7 @@ export function createFlowNitroConfig(options = {}) {
     storage: flowModules.nitro.storage,
     routeRules: {
       "/api/**": { cors: true },
+      ...flowNitroConfig.routeRules,
       ...flowModules.nitro.routeRules
     },
     imports: flowModules.nitro.imports,

package/src/public/vite.mjs

@@ -1,4 +1,4 @@
-import { existsSync } from "node:fs";
+import { existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { relative, resolve } from "node:path";
 import ui from "@nuxt/ui/vite";
 import Vue from "@vitejs/plugin-vue";
@@ -240,11 +240,27 @@ function createFlowVirtualClientPages(projectRoot) {
     }
   };
 }
+function FlowComponentsResolver() {
+  return {
+    type: "component",
+    resolve: (name) => {
+      if (["FlowIsland", "MkImage", "MkLink", "MkPicture"].includes(name)) {
+        return {
+          name,
+          from: "@monkeyplus/flow/components"
+        };
+      }
+    }
+  };
+}
 export function createFlowViteConfig(options = {}) {
   const projectRoot = resolve(options.projectRoot || process.cwd());
   const flowConfig = resolveFlowConfig(options.userFlowConfig || {});
   const flowModules = loadFlowModules(projectRoot, flowConfig);
-  const flowNitroConfig = { ...flowConfig.nitro || {} };
+  const flowNitroConfig = {
+    typescript: { generateTsConfig: true },
+    ...flowConfig.nitro || {}
+  };
   const flowNitroHooks = flowNitroConfig.hooks || {};
   const flowPackagePattern = /^@monkeyplus\/flow(?:\/.*)?$/;
   const userPrerenderRoutesHook = typeof flowNitroHooks["prerender:routes"] === "function" ? flowNitroHooks["prerender:routes"] : void 0;
@@ -260,6 +276,29 @@ export function createFlowViteConfig(options = {}) {
     moduleWatch.additionalPaths,
     componentDirs
   );
+  const flowTypesDir = resolve(projectRoot, ".flow/types");
+  if (!existsSync(flowTypesDir)) {
+    mkdirSync(flowTypesDir, { recursive: true });
+  }
+  writeFileSync(resolve(flowTypesDir, "flow.d.ts"), [
+    '/// <reference path="./auto-imports.d.ts" />',
+    '/// <reference path="./components.d.ts" />',
+    '/// <reference path="../../.nitro/types/nitro-imports.d.ts" />'
+  ].join("\n"));
+  const mappedNitroImports = {};
+  if (flowModules.nitro.imports?.imports && Array.isArray(flowModules.nitro.imports.imports)) {
+    for (const item of flowModules.nitro.imports.imports) {
+      if (!item.from || !item.name) continue;
+      if (!mappedNitroImports[item.from]) {
+        mappedNitroImports[item.from] = [];
+      }
+      if (item.as) {
+        mappedNitroImports[item.from].push([item.name, item.as]);
+      } else {
+        mappedNitroImports[item.from].push(item.name);
+      }
+    }
+  }
   return defineConfig({
     plugins: [
       createFlowVirtualServerModules(projectRoot, flowConfig),
@@ -274,14 +313,25 @@ export function createFlowViteConfig(options = {}) {
       ui({
         router: false,
         components: {
+          dts: resolve(projectRoot, ".flow/types/components.d.ts"),
           ...options.userFlowConfig?.components,
           resolvers: [
+            FlowComponentsResolver(),
             IconsResolver(),
             ...options.userFlowConfig?.components?.resolvers || []
           ]
-          // dirs: [],
         },
-        autoImport: options.userFlowConfig?.autoImport
+        autoImport: {
+          dts: resolve(projectRoot, ".flow/types/auto-imports.d.ts"),
+          imports: [
+            {
+              "@monkeyplus/flow": ["definePage", "defineLayoutContext", "queryContent"],
+              ...mappedNitroImports
+            },
+            ...options.userFlowConfig?.autoImport?.imports || []
+          ],
+          ...options.userFlowConfig?.autoImport
+        }
       }),
       nitro({
         ...flowNitroConfig,

package/src/runtime/components/FlowIsland.mjs

@@ -23,13 +23,13 @@ export default defineComponent({
       default: "div"
     }
   },
-  setup(props) {
+  setup(props, { slots }) {
     const attrs = useAttrs();
     return () => h(props.tag, mergeProps(attrs, {
       "data-flow-island": props.name.toLowerCase(),
       "data-flow-props": serializeIslandProps(props.props)
     }), [
-      h(props.component, props.props)
+      h(props.component, props.props, slots)
     ]);
   }
 });

package/src/runtime/vue.mjs

@@ -1,7 +1,9 @@
 import ui from "@nuxt/ui/vue-plugin";
+import { createPinia } from "pinia";
 import MkImage from "./components/MkImage.mjs";
 import MkLink from "./components/MkLink.mjs";
 import MkPicture from "./components/MkPicture.mjs";
+let sharedPinia = null;
 export function installFlowVuePlugins(app, { ui: enableUi } = { ui: true }) {
   if (enableUi) {
     app.use(ui);
@@ -9,5 +11,13 @@ export function installFlowVuePlugins(app, { ui: enableUi } = { ui: true }) {
   app.component("MkImage", MkImage);
   app.component("MkLink", MkLink);
   app.component("MkPicture", MkPicture);
+  if (typeof window !== "undefined") {
+    if (!sharedPinia) {
+      sharedPinia = createPinia();
+    }
+    app.use(sharedPinia);
+  } else {
+    app.use(createPinia());
+  }
   return app;
 }