next-tinacms-s3 10.0.0 → 10.0.2

package/dist/handlers.js

@@ -66,7 +66,7 @@ var createMediaHandler = (config, options) => {
     }
     switch (req.method) {
       case "GET":
-        if (req.url.startsWith("/api/s3/media/upload_url")) {
+        if (req.query.key) {
           const expiresIn = req.query.expiresIn && Number(req.query.expiresIn) || 3600;
           const s3_key = req.query.key ? Array.isArray(req.query.key) ? req.query.key[0] : req.query.key : null;
           if (!s3_key) {
@@ -82,9 +82,8 @@ var createMediaHandler = (config, options) => {
             client
           );
           return res.json({ signedUrl, src: cdnUrl + s3_key });
-        } else {
-          return listMedia(req, res, client, bucket, mediaRoot, cdnUrl);
         }
+        return listMedia(req, res, client, bucket, mediaRoot, cdnUrl);
       case "DELETE":
         return deleteAsset(req, res, client, bucket);
       default:

package/dist/index.js

@@ -54,10 +54,19 @@
         return fetch(input, init);
       };
       this.accept = tinacms.DEFAULT_MEDIA_UPLOAD_TYPES;
+      this.basePath = "";
       this.parse = (img) => {
         return img.src;
       };
     }
+    fetchWithBasePath(path, init) {
+      const fullPath = this.getFullPath(path);
+      const normalizedPath = fullPath.startsWith("/") ? fullPath : `/${fullPath}`;
+      return this.fetchFunction(normalizedPath, init);
+    }
+    getFullPath(path) {
+      return `${this.basePath}${path}`;
+    }
     async persist(media) {
       const newFiles = [];
       for (const item of media) {
@@ -66,7 +75,7 @@
           directory = directory.substr(0, directory.length - 1);
         }
         const path = `${directory && directory !== "/" ? `${directory}/${item.file.name}` : item.file.name}`;
-        const res = await this.fetchFunction(
+        const res = await this.fetchWithBasePath(
           `/api/s3/media/upload_url?key=${path}`,
           {
             method: "GET"
@@ -116,13 +125,16 @@
       return newFiles;
     }
     async delete(media) {
-      await this.fetchFunction(`/api/s3/media/${encodeURIComponent(media.id)}`, {
-        method: "DELETE"
-      });
+      await this.fetchWithBasePath(
+        `/api/s3/media/${encodeURIComponent(media.id)}`,
+        {
+          method: "DELETE"
+        }
+      );
     }
     async list(options) {
       const query = this.buildQuery(options);
-      const response = await this.fetchFunction("/api/s3/media" + query);
+      const response = await this.fetchWithBasePath("/api/s3/media" + query);
       if (response.status == 401) {
         throw E_UNAUTHORIZED;
       }
@@ -147,8 +159,11 @@
   }
   class TinaCloudS3MediaStore extends S3MediaStore {
     constructor(client) {
+      var _a;
       super();
       this.client = client;
+      const basePath = (_a = this.client.schema.config.config.build) == null ? void 0 : _a.basePath;
+      this.basePath = basePath || "";
       this.fetchFunction = async (input, init) => {
         try {
           const url = input.toString();

package/dist/index.mjs

@@ -51,10 +51,19 @@ class S3MediaStore {
       return fetch(input, init);
     };
     this.accept = DEFAULT_MEDIA_UPLOAD_TYPES;
+    this.basePath = "";
     this.parse = (img) => {
       return img.src;
     };
   }
+  fetchWithBasePath(path, init) {
+    const fullPath = this.getFullPath(path);
+    const normalizedPath = fullPath.startsWith("/") ? fullPath : `/${fullPath}`;
+    return this.fetchFunction(normalizedPath, init);
+  }
+  getFullPath(path) {
+    return `${this.basePath}${path}`;
+  }
   async persist(media) {
     const newFiles = [];
     for (const item of media) {
@@ -63,7 +72,7 @@ class S3MediaStore {
         directory = directory.substr(0, directory.length - 1);
       }
       const path = `${directory && directory !== "/" ? `${directory}/${item.file.name}` : item.file.name}`;
-      const res = await this.fetchFunction(
+      const res = await this.fetchWithBasePath(
         `/api/s3/media/upload_url?key=${path}`,
         {
           method: "GET"
@@ -113,13 +122,16 @@ class S3MediaStore {
     return newFiles;
   }
   async delete(media) {
-    await this.fetchFunction(`/api/s3/media/${encodeURIComponent(media.id)}`, {
-      method: "DELETE"
-    });
+    await this.fetchWithBasePath(
+      `/api/s3/media/${encodeURIComponent(media.id)}`,
+      {
+        method: "DELETE"
+      }
+    );
   }
   async list(options) {
     const query = this.buildQuery(options);
-    const response = await this.fetchFunction("/api/s3/media" + query);
+    const response = await this.fetchWithBasePath("/api/s3/media" + query);
     if (response.status == 401) {
       throw E_UNAUTHORIZED;
     }
@@ -144,8 +156,11 @@ class S3MediaStore {
 }
 class TinaCloudS3MediaStore extends S3MediaStore {
   constructor(client) {
+    var _a;
     super();
     this.client = client;
+    const basePath = (_a = this.client.schema.config.config.build) == null ? void 0 : _a.basePath;
+    this.basePath = basePath || "";
     this.fetchFunction = async (input, init) => {
       try {
         const url = input.toString();

package/dist/s3-media-store.d.ts

@@ -5,6 +5,9 @@ import type { Media, MediaList, MediaListOptions, MediaStore, MediaUploadOptions
 export declare class S3MediaStore implements MediaStore {
     fetchFunction: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
     accept: string;
+    basePath: string;
+    protected fetchWithBasePath(path: string, init?: RequestInit): Promise<Response>;
+    protected getFullPath(path: string): string;
     persist(media: MediaUploadOptions[]): Promise<Media[]>;
     delete(media: Media): Promise<void>;
     list(options: MediaListOptions): Promise<MediaList>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-tinacms-s3",
-  "version": "10.0.0",
+  "version": "10.0.2",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "files": [
@@ -26,11 +26,11 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "typescript": "^5.7.3",
-    "@tinacms/scripts": "1.3.2",
-    "tinacms": "2.7.0"
+    "@tinacms/scripts": "1.3.3",
+    "tinacms": "2.7.2"
   },
   "peerDependencies": {
-    "tinacms": "2.7.0"
+    "tinacms": "2.7.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"