@monkeyplus/flow 6.0.14 → 6.0.16

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.14",
+  "version": "6.0.16",
   "description": "@monkeyplus/flow package-first runtime with Vite, Nitro, Vue and a workspace playground.",
   "license": "MIT",
   "publishConfig": {

package/src/main.d.ts

@@ -1 +1 @@
-export {};
+import 'virtual:flow/server-styles';

package/src/main.mjs

@@ -1,5 +1,6 @@
-import { hydrateIslands } from "./runtime/islands.mjs";
 import bundles from "virtual:flow/client-pages";
+import { hydrateIslands } from "./runtime/islands.mjs";
+import "virtual:flow/server-styles";
 function readBoot() {
   const element = document.getElementById("flow-boot");
   if (!element?.textContent) {

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";
@@ -17,6 +17,7 @@ import {
   createVirtualLayoutContextsModule,
   createVirtualLayoutsModule,
   createVirtualPagesModule,
+  createVirtualServerStylesModule,
   createVirtualTemplatesModule
 } from "../runtime/virtual-pages.mjs";
 const flowRestartPatterns = [
@@ -55,6 +56,9 @@ function getVirtualModuleIdsForPath(projectPath) {
   if (projectPath === "flow.config.ts" || projectPath.startsWith("pages/")) {
     ids.add("virtual:flow/pages");
   }
+  if (projectPath.startsWith("views/")) {
+    ids.add("virtual:flow/server-styles");
+  }
   if (projectPath.startsWith("views/templates/")) {
     ids.add("virtual:flow/templates");
   }
@@ -141,7 +145,7 @@ function createFlowHotReload(projectRoot, extraWatchPaths = []) {
       });
     }, 0);
   }
-  async function handleServerChange(server, filePath, event) {
+  async function handleServerChange(server, filePath, event, hmrModules) {
     const projectPath = toProjectPath(filePath);
     invalidateFileModules(server, filePath, event);
     invalidateVirtualModules(server, projectPath);
@@ -153,11 +157,21 @@ function createFlowHotReload(projectRoot, extraWatchPaths = []) {
     if (!shouldReload) {
       return false;
     }
-    server.ws.send({ type: "full-reload", path: "*" });
+    if (event === "change" && projectPath.endsWith(".vue") && hmrModules) {
+      const validModules = hmrModules.filter((m) => m && m.id);
+      const isStyleOnly = validModules.length > 0 && validModules.every((m) => m.id.includes("type=style"));
+      if (isStyleOnly) {
+        return false;
+      }
+    }
+    setTimeout(() => {
+      server.ws.send({ type: "full-reload", path: "*" });
+    }, 50);
     return true;
   }
   return {
     name: "flow:hot-reload",
+    enforce: "post",
     configureServer(server) {
       if (extraWatchPaths.length) {
         server.watcher.add(extraWatchPaths);
@@ -170,9 +184,7 @@ function createFlowHotReload(projectRoot, extraWatchPaths = []) {
       });
     },
     async handleHotUpdate(ctx) {
-      if (await handleServerChange(ctx.server, ctx.file, "change")) {
-        return [];
-      }
+      await handleServerChange(ctx.server, ctx.file, "change", ctx.modules);
     }
   };
 }
@@ -184,7 +196,8 @@ function createFlowVirtualServerModules(projectRoot, flowConfig) {
     ["virtual:flow/templates", () => createVirtualTemplatesModule(projectRoot)],
     ["virtual:flow/layouts", () => createVirtualLayoutsModule(projectRoot)],
     ["virtual:flow/layout-contexts", () => createVirtualLayoutContextsModule(projectRoot)],
-    ["virtual:flow/bases", () => createVirtualBaseTemplatesModule(projectRoot)]
+    ["virtual:flow/bases", () => createVirtualBaseTemplatesModule(projectRoot)],
+    ["virtual:flow/server-styles", () => createVirtualServerStylesModule(projectRoot)]
   ]);
   return {
     name: "flow:server-virtuals",
@@ -227,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;
@@ -247,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),
@@ -261,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/virtual-pages.d.ts

@@ -7,3 +7,4 @@ export declare function createVirtualBaseTemplatesModule(projectRoot: string): s
 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;

package/src/runtime/virtual-pages.mjs

@@ -1,3 +1,4 @@
+import { parse } from "vue/compiler-sfc";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { basename, extname, resolve } from "node:path";
 function collectFiles(rootDir, extensions, currentDir = rootDir) {
@@ -170,3 +171,20 @@ export function createVirtualClientPageAssetsModule(projectRoot) {
     ""
   ].join("\n");
 }
+export function createVirtualServerStylesModule(projectRoot) {
+  const viewsDir = resolve(projectRoot, "views");
+  const files = existsSync(viewsDir) ? collectFiles(viewsDir, [".vue"]) : [];
+  const imports = files.flatMap((filePath) => {
+    const code = readFileSync(filePath, "utf8");
+    const { descriptor } = parse(code);
+    return descriptor.styles.map((style, i) => {
+      return `import "${toAbsoluteImport(filePath)}?vue&type=style&index=${i}&lang.${style.lang || "css"}";`;
+    });
+  });
+  return [
+    ...imports,
+    "",
+    "export default {};",
+    ""
+  ].join("\n");
+}