mktcms 0.1.13 → 0.1.14

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "mktcms",
   "configKey": "mktcms",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/server/api/admin/content/upload.js

@@ -39,8 +39,7 @@ export default defineEventHandler(async (event) => {
       statusMessage: "Invalid file type. Only PDF, JPG, JPEG, and PNG files are allowed."
     });
   }
-  const filePath = [s3Prefix, sanePath, sanitizeFilename(file.filename)].filter(Boolean).join("/");
+  const filePath = [s3Prefix, sanePath, sanitizeFilename(file.filename)].filter(Boolean).join(":");
   await useStorage("content").setItemRaw(filePath, Buffer.from(file.data));
-  const returnFileName = filePath;
-  return { success: true, path: returnFileName };
+  return { success: true, path: filePath };
 });

package/dist/runtime/server/api/content/[path].js

@@ -12,7 +12,7 @@ export default defineEventHandler(async (event) => {
   const file = await storage.getItem(fullPath);
   if (!file) {
     const fallbackStorage = useStorage("fallback");
-    const fallbackFile = await fallbackStorage.getItem(path);
+    const fallbackFile = await fallbackStorage.getItem(fullPath);
     if (fallbackFile) {
       return fallbackFile;
     }

package/dist/runtime/server/plugins/storage.js

@@ -3,23 +3,21 @@ import createFsDriver from "unstorage/drivers/fs";
 import { defineNitroPlugin, useStorage, useRuntimeConfig } from "nitropack/runtime";
 export default defineNitroPlugin(() => {
   const storage = useStorage();
-  const s3Driver = createS3Driver({
-    accessKeyId: useRuntimeConfig().mktcms.s3AccessKey,
-    secretAccessKey: useRuntimeConfig().mktcms.s3SecretKey,
-    endpoint: useRuntimeConfig().mktcms.s3Endpoint,
-    bucket: useRuntimeConfig().mktcms.s3Bucket,
-    region: useRuntimeConfig().mktcms.s3Region
-  });
-  const fsDriver = createFsDriver({
-    base: "./.storage"
-  });
-  const fallbackDriver = createFsDriver({
-    base: "./content"
-  });
-  storage.mount("fallback", fallbackDriver);
-  if (process.env.NODE_ENV === "production") {
-    storage.mount("content", s3Driver);
+  const { mktcms: { s3AccessKey, s3SecretKey, s3Endpoint, s3Bucket, s3Region } } = useRuntimeConfig();
+  if (s3AccessKey && s3SecretKey && s3Endpoint && s3Bucket && s3Region) {
+    storage.mount("content", createS3Driver({
+      accessKeyId: s3AccessKey,
+      secretAccessKey: s3SecretKey,
+      endpoint: s3Endpoint,
+      bucket: s3Bucket,
+      region: s3Region
+    }));
   } else {
-    storage.mount("content", fsDriver);
+    storage.mount("content", createFsDriver({
+      base: "./.storage"
+    }));
   }
+  storage.mount("fallback", createFsDriver({
+    base: "./content"
+  }));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mktcms",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Simple CMS module for Nuxt",
   "repository": "mktcode/mktcms",
   "license": "MIT",