@monkeyplus/flow 6.0.36 → 6.0.38

package/cms/server/utils/auth.mjs

@@ -1,16 +1,87 @@
+import process from "node:process";
 import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
+import { admin, username } from "better-auth/plugins";
+import nodemailer from "nodemailer";
 import * as schema from "../database/schema.mjs";
 import { db } from "./db.mjs";
+const transporter = nodemailer.createTransport({
+  host: process.env.SMTP_ADDRESS,
+  port: Number(process.env.SMTP_PORT) || 587,
+  // secure: true, // true for 465, false for other ports
+  auth: {
+    user: process.env.SMTP_USERNAME,
+    pass: process.env.SMTP_PASSWORD
+  }
+});
 export const auth = betterAuth({
+  baseURL: process.env.URL,
   database: drizzleAdapter(db, {
-    provider: "sqlite",
+    provider: "pg",
     schema
-  })
-  //   socialProviders: {
-  //     github: {
-  //       clientId: process.env.GITHUB_CLIENT_ID as string,
-  //       clientSecret: process.env.GITHUB_CLIENT_SECRET as string,
-  //     },
-  //   },
+  }),
+  // hooks: {
+  //   before: createAuthMiddleware(async (ctx) => {
+  //     if (ctx.path !== '/sign-up/email') {
+  //       return;
+  //     }
+  //     const user = await db.query.users.findFirst({
+  //       where: {
+  //         email: ctx.body?.email,
+  //       },
+  //     });
+  //     if (!user) {
+  //       throw new APIError('BAD_REQUEST', {
+  //         error: 'Usuario no invitado',
+  //       });
+  //     }
+  //   }),
+  // },
+  emailVerification: {
+    sendOnSignUp: true,
+    sendOnSignIn: true,
+    async sendVerificationEmail({ url, user }) {
+      await transporter.sendMail({
+        from: process.env.EMAIL_FROM,
+        to: user.email,
+        subject: "Verify your email",
+        text: `Please verify your email by clicking the following link: ${url}`,
+        html: `<p>Please verify your email by clicking the following link:</p><a href="${url}">${url}</a>`
+      });
+    }
+  },
+  emailAndPassword: {
+    enabled: true,
+    requireEmailVerification: true,
+    async sendResetPassword({ url, user }) {
+      await transporter.sendMail({
+        from: process.env.EMAIL_FROM,
+        to: user.email,
+        subject: "Reset your password",
+        text: `You can reset your password by clicking the following link: ${url}`,
+        html: `<p>You can reset your password by clicking the following link:</p><a href="${url}">${url}</a>`
+      });
+    },
+    customSyntheticUser: ({ coreFields, additionalFields, id }) => ({
+      ...coreFields,
+      // Admin plugin fields (in schema order)
+      role: "user",
+      // or your configured defaultRole
+      banned: false,
+      banReason: null,
+      banExpires: null,
+      ...additionalFields,
+      id
+    })
+  },
+  session: {
+    cookieCache: {
+      enabled: true
+    }
+  },
+  plugins: [
+    admin({}),
+    username()
+    // bearer(),
+  ]
 });

package/cms/server/utils/db.d.ts

@@ -1,3 +1,5 @@
-export declare const db: import("drizzle-orm/libsql").LibSQLDatabase<Record<string, never>> & {
-    $client: import("@libsql/client/.").Client;
+import process from 'node:process';
+import * as schema from '../database/schema';
+export declare const db: import("drizzle-orm/node-postgres").NodePgDatabase<import("drizzle-orm").ExtractTablesWithRelations<{}, import("drizzle-orm").ExtractTablesFromSchema<typeof schema>>> & {
+    $client: import("drizzle-orm/node-postgres").NodePgClient extends TClient ? process : TClient;
 };

package/cms/server/utils/db.mjs

@@ -1,5 +1,8 @@
 import process from "node:process";
-import { createClient } from "@libsql/client";
-import { drizzle } from "drizzle-orm/libsql";
-const client = createClient({ url: process.env.DATABASE_URL || "file:local.db" });
-export const db = drizzle(client);
+import { defineRelations } from "drizzle-orm";
+import { drizzle } from "drizzle-orm/node-postgres";
+import * as schema from "../database/schema.mjs";
+const relations = defineRelations(schema, (_r) => ({}));
+export const db = drizzle(process.env.DATABASE_URL, {
+  relations
+});

package/cms/server/utils/github.d.ts

@@ -7,7 +7,6 @@ export declare const ghRepoContributors: any;
 export declare const ghRepoFiles: any;
 export declare const ghRepoFile: any;
 export declare const ghRepoBlob: any;
-export declare const ghMarkdown: any;
 export declare function ghCreateBlob(repo: string, body: any): Promise<any>;
 export declare function ghCreateTree(repo: string, body: any): Promise<any>;
 export declare function ghCreateCommit(repo: string, body: any): Promise<any>;

package/cms/server/utils/github.mjs

@@ -64,7 +64,8 @@ export const ghFetch = defineCachedFunction(
         return false;
       }
       return true;
-    }
+    },
+    getKey: (url) => url
   }
 );
 export async function ghFetchNoCache(url, opts = {}) {
@@ -106,35 +107,24 @@ export const ghRepoFiles = defineCachedFunction((repo, ref) => {
   repo = joinURL(OWNER, repo);
   return ghFetch(`/repos/${repo}/git/trees/${ref}?recursive=1`);
 }, cacheOptions("files"));
-export const ghRepoFile = defineCachedFunction((repo, ref, branch) => {
+export const ghRepoFile = defineCachedFunction((repo, ref, branch, invalidate = false) => {
   repo = joinURL(OWNER, repo);
-  return ghFetch(`/repos/${repo}/contents/${ref}?branch=${branch}`);
-}, cacheOptions("file"));
+  const url = `/repos/${repo}/contents/${ref}?branch=${branch}`;
+  if (invalidate) {
+    ghFetch.invalidate(url);
+  }
+  return ghFetch(url);
+}, {
+  ...cacheOptions("file"),
+  getKey: (repo, ref, branch, _invalidate) => {
+    const key = `${repo}/${ref}/${branch}`;
+    return key;
+  }
+});
 export const ghRepoBlob = defineCachedFunction((repo, sha) => {
   repo = joinURL(OWNER, repo);
   return ghFetch(`/repos/${repo}/git/blobs/${sha}`);
 }, cacheOptions("blobs"));
-export const ghMarkdown = defineCachedFunction(
-  (markdown, repo, _id) => {
-    if (!markdown) {
-      return "";
-    }
-    return ghFetch("/markdown", {
-      method: "POST",
-      headers: {
-        accept: "application/vnd.github+json"
-      },
-      body: JSON.stringify({
-        text: markdown,
-        context: repo
-      })
-    });
-  },
-  {
-    ...cacheOptions("markdown"),
-    getKey: (_markdown, repo, id) => `${repo}/${id}`
-  }
-);
 function isEmptyArray(val) {
   return Array.isArray(val) && val.length === 0;
 }

package/modules/cms/server/api/admin.mjs

@@ -5,7 +5,8 @@ const adminHtml = `<!DOCTYPE html>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>CMS</title>
-    <script type="module" crossorigin src="/cms/v3/assets/index-BIKzIEd2.js"><\/script>
+    <script type="module" crossorigin src="/cms/v3/assets/index.spa-_gVd6eNI.js"><\/script>
+    <link rel="stylesheet" crossorigin href="/cms/v3/assets/index-B-MXuuNZ.css">
   </head>
   <body>
     <div id="app"></div>

package/modules/images/cli-pregenerate.mjs

@@ -70,6 +70,7 @@ async function run() {
     outputDir,
     generatedManifestPath,
     generate: true,
+    useIpxPath: true,
     netlifyCache: false,
     options
   };

package/modules/images/runtime/build.mjs

@@ -146,14 +146,16 @@ export async function materializeGeneratedImages(config) {
         ...image,
         signature
       };
-      const outputPath = outputFilePath(config.outputDir, image.generate);
-      const cacheRelativePath = normalizeOutputPath(image.generate);
+      const outputPath = outputFilePath(config.outputDir, config.useIpxPath ? image.url : image.generate);
+      const cacheRelativePath = normalizeOutputPath(config.useIpxPath ? image.url : image.generate);
       const cachePath = config.generatedCacheDir ? outputFilePath(config.generatedCacheDir, cacheRelativePath) : void 0;
       activeCacheFiles.add(cacheRelativePath);
       await ensureParentDir(outputPath);
-      const publicPreGeneratedPath = outputFilePath(config.publicDir, image.generate);
+      const publicPreGeneratedPath = outputFilePath(config.publicDir, image.url);
       if (existsSync(publicPreGeneratedPath)) {
-        await copyFile(publicPreGeneratedPath, outputPath);
+        if (publicPreGeneratedPath !== outputPath) {
+          await copyFile(publicPreGeneratedPath, outputPath);
+        }
         return { cacheHit: 1, generated: 0 };
       }
       if (config.netlifyCache && cachePath && previousManifest[imageKey]?.signature === signature && existsSync(cachePath)) {

package/modules/images/runtime/image.mjs

@@ -168,8 +168,8 @@ export function createImageResolver(imagesOptions, stateImages, runtime = {}) {
       baseDir = getBaseDir(replacedPath, imagesOptions.dirImages);
     }
     const modifierSegment = getModifierSegment(image.modifiers);
-    const baseURL = imagesOptions.baseURL || "/_ipx";
-    image.generate = joinURL(baseURL, modifierSegment === "_" ? "" : modifierSegment, replacedPath);
+    const relativePath = getRelativePath(replacedPath, baseDir);
+    image.generate = joinURL(`/${baseDir}`, modifierSegment === "_" ? "" : modifierSegment, relativePath);
     if (originalExt) {
       image.generate = image.generate.replace(originalExt, image.ext);
     } else if (!image.generate.includes(".") && image.ext) {

package/modules/images/runtime/types.d.ts

@@ -93,6 +93,7 @@ export interface FlowImagesRuntimeConfig {
     generatedCacheDir?: string;
     generatedCacheManifestPath?: string;
     generate: boolean;
+    useIpxPath?: boolean;
     netlifyCache: boolean;
     options: FlowImageOptions;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "6.0.36",
+  "version": "6.0.38",
   "description": "@monkeyplus/flow package-first runtime with Vite, Nitro, Vue and a workspace playground.",
   "license": "MIT",
   "publishConfig": {
@@ -88,7 +88,7 @@
     "@vitejs/plugin-vue": "^6.0.5",
     "@vue/server-renderer": "^3.5.13",
     "ipx": "^3.1.1",
-    "nitro": "3.0.260429-beta",
+    "nitro": "3.0.260610-beta",
     "std-env": "^4.0.0",
     "ufo": "^1.6.1",
     "unhead": "^3.1.0",