next-tinacms-s3 13.0.1 → 14.0.0

package/dist/handlers.js

@@ -1,49 +1,20 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
 // src/handlers.ts
-var handlers_exports = {};
-__export(handlers_exports, {
-  createMediaHandler: () => createMediaHandler,
-  getUploadUrl: () => getUploadUrl,
-  mediaHandlerConfig: () => mediaHandlerConfig
-});
-module.exports = __toCommonJS(handlers_exports);
-var import_client_s3 = require("@aws-sdk/client-s3");
-var import_s3_request_presigner = require("@aws-sdk/s3-request-presigner");
-var import_node_path = __toESM(require("node:path"));
+import {
+  S3Client,
+  ListObjectsCommand,
+  PutObjectCommand,
+  DeleteObjectCommand,
+  HeadObjectCommand
+} from "@aws-sdk/client-s3";
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
+import path from "node:path";
 var mediaHandlerConfig = {
   api: {
     bodyParser: false
   }
 };
 var createMediaHandler = (config, options) => {
-  const client = new import_client_s3.S3Client(config.config);
+  const client = new S3Client(config.config);
   const bucket = config.bucket;
   const region = config.config.region || "us-east-1";
   let mediaRoot = config.mediaRoot || "";
@@ -119,11 +90,11 @@ async function listMedia(req, res, client, bucket, mediaRoot, cdnUrl) {
     const params = {
       Bucket: bucket,
       Delimiter: "/",
-      Prefix: mediaRoot ? import_node_path.default.join(mediaRoot, prefix) : prefix,
+      Prefix: mediaRoot ? path.join(mediaRoot, prefix) : prefix,
       Marker: offset?.toString(),
       MaxKeys: directory && !offset ? +limit + 1 : +limit
     };
-    const command = new import_client_s3.ListObjectsCommand(params);
+    const command = new ListObjectsCommand(params);
     const response = await client.send(command);
     const items = [];
     response.CommonPrefixes?.forEach(({ Prefix }) => {
@@ -134,8 +105,8 @@ async function listMedia(req, res, client, bucket, mediaRoot, cdnUrl) {
       items.push({
         id: Prefix,
         type: "dir",
-        filename: import_node_path.default.basename(strippedPrefix),
-        directory: import_node_path.default.dirname(strippedPrefix)
+        filename: path.basename(strippedPrefix),
+        directory: path.dirname(strippedPrefix)
       });
     });
     items.push(
@@ -169,7 +140,7 @@ async function deleteAsset(req, res, client, bucket) {
     Bucket: bucket,
     Key: objectKey
   };
-  const command = new import_client_s3.DeleteObjectCommand(params);
+  const command = new DeleteObjectCommand(params);
   try {
     const data = await client.send(command);
     res.json(data);
@@ -183,7 +154,7 @@ async function deleteAsset(req, res, client, bucket) {
 }
 async function keyExists(client, bucket, key) {
   try {
-    const cmd = new import_client_s3.HeadObjectCommand({
+    const cmd = new HeadObjectCommand({
       Bucket: bucket,
       Key: key
     });
@@ -200,9 +171,9 @@ async function keyExists(client, bucket, key) {
   }
 }
 var getUploadUrl = async (bucket, key, expiresIn, client) => {
-  return (0, import_s3_request_presigner.getSignedUrl)(
+  return getSignedUrl(
     client,
-    new import_client_s3.PutObjectCommand({
+    new PutObjectCommand({
       Bucket: bucket,
       Key: key
     }),
@@ -212,8 +183,8 @@ var getUploadUrl = async (bucket, key, expiresIn, client) => {
 function getS3ToTinaFunc(cdnUrl, mediaRoot) {
   return function s3ToTina(file) {
     const strippedKey = stripMediaRoot(mediaRoot, file.Key);
-    const filename = import_node_path.default.basename(strippedKey);
-    const directory = import_node_path.default.dirname(strippedKey) + "/";
+    const filename = path.basename(strippedKey);
+    const directory = path.dirname(strippedKey) + "/";
     const src = cdnUrl + file.Key;
     return {
       id: file.Key,
@@ -229,9 +200,8 @@ function getS3ToTinaFunc(cdnUrl, mediaRoot) {
     };
   };
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   createMediaHandler,
   getUploadUrl,
   mediaHandlerConfig
-});
+};

package/dist/index.js

@@ -1,182 +1,179 @@
-(function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("tinacms")) : typeof define === "function" && define.amd ? define(["exports", "tinacms"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["next-tinacms-s3"] = {}, global.NOOP));
-})(this, function(exports2, tinacms) {
-  "use strict";
-  class MediaListError extends Error {
-    constructor(config) {
-      super(config.message);
-      this.ERR_TYPE = "MediaListError";
-      this.title = config.title;
-      this.docsLink = config.docsLink;
-    }
+import { DEFAULT_MEDIA_UPLOAD_TYPES } from "tinacms";
+class MediaListError extends Error {
+  constructor(config) {
+    super(config.message);
+    this.ERR_TYPE = "MediaListError";
+    this.title = config.title;
+    this.docsLink = config.docsLink;
   }
-  const E_DEFAULT = new MediaListError({
-    title: "An Error Occurred",
-    message: "Something went wrong fetching your media from S3.",
-    docsLink: "https://tina.io/docs/r/aws-s3-bucket"
-  });
-  const E_UNAUTHORIZED = new MediaListError({
-    title: "Unauthorized",
-    message: "You don't have access to this resource.",
-    docsLink: "https://tina.io/docs/r/aws-s3-bucket"
-  });
-  const E_CONFIG = new MediaListError({
-    title: "Missing Credentials",
-    message: "Unable to connect to S3 because one or more environment variables are missing.",
-    docsLink: "https://tina.io/docs/r/aws-s3-bucket/"
-  });
-  const E_KEY_FAIL = new MediaListError({
-    title: "Bad Credentials",
-    message: "Unable to connect to S3 because one or more environment variables are misconfigured.",
-    docsLink: "https://tina.io/docs/r/aws-s3-bucket/"
-  });
-  const E_BAD_ROUTE = new MediaListError({
-    title: "Bad Route",
-    message: "The S3 API route is missing or misconfigured.",
-    docsLink: "https://tina.io/docs/r/aws-s3-bucket/#set-up-api-routes"
-  });
-  const interpretErrorMessage = (message) => {
-    switch (message) {
-      case "Must supply cloud_name":
-      case "Must supply api_key":
-      case "Must supply api_secret":
-        return E_CONFIG;
-      case "unknown api_key":
-        return E_KEY_FAIL;
-      default:
-        return E_DEFAULT;
-    }
-  };
-  const s3ErrorRegex = /<Error>.*<Code>(.+)<\/Code>.*<Message>(.+)<\/Message>.*/;
-  class S3MediaStore {
-    constructor() {
-      this.fetchFunction = (input, init) => {
-        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) {
-        let directory = item.directory;
-        if (directory == null ? void 0 : directory.endsWith("/")) {
-          directory = directory.substr(0, directory.length - 1);
-        }
-        const path = `${directory && directory !== "/" ? `${directory}/${item.file.name}` : item.file.name}`;
-        const res = await this.fetchWithBasePath(
-          `/api/s3/media/upload_url?key=${path}`,
-          {
-            method: "GET"
-          }
-        );
-        if (res.status != 200) {
-          const responseData = await res.json();
-          throw new Error(responseData.message);
-        }
-        const { signedUrl, src } = await res.json();
-        if (!signedUrl || !src) {
-          throw new Error("Unexpected error generating upload url");
-        }
-        const uploadRes = await fetch(signedUrl, {
-          method: "PUT",
-          body: item.file,
-          headers: {
-            "Content-Type": item.file.type || "application/octet-stream"
-          }
-        });
-        if (!uploadRes.ok) {
-          const xmlRes = await uploadRes.text();
-          const matches = s3ErrorRegex.exec(xmlRes);
-          console.error(xmlRes);
-          if (!matches) {
-            throw new Error("Unexpected error uploading media asset");
-          } else {
-            throw new Error(`Upload error: '${matches[2]}'`);
-          }
-        }
-        await new Promise((resolve) => {
-          setTimeout(resolve, 2e3);
-        });
-        newFiles.push({
-          directory: item.directory,
-          filename: item.file.name,
-          id: item.file.name,
-          type: "file",
-          thumbnails: {
-            "75x75": src,
-            "400x400": src,
-            "1000x1000": src
-          },
-          src
-        });
+}
+const E_DEFAULT = new MediaListError({
+  title: "An Error Occurred",
+  message: "Something went wrong fetching your media from S3.",
+  docsLink: "https://tina.io/docs/r/aws-s3-bucket"
+});
+const E_UNAUTHORIZED = new MediaListError({
+  title: "Unauthorized",
+  message: "You don't have access to this resource.",
+  docsLink: "https://tina.io/docs/r/aws-s3-bucket"
+});
+const E_CONFIG = new MediaListError({
+  title: "Missing Credentials",
+  message: "Unable to connect to S3 because one or more environment variables are missing.",
+  docsLink: "https://tina.io/docs/r/aws-s3-bucket/"
+});
+const E_KEY_FAIL = new MediaListError({
+  title: "Bad Credentials",
+  message: "Unable to connect to S3 because one or more environment variables are misconfigured.",
+  docsLink: "https://tina.io/docs/r/aws-s3-bucket/"
+});
+const E_BAD_ROUTE = new MediaListError({
+  title: "Bad Route",
+  message: "The S3 API route is missing or misconfigured.",
+  docsLink: "https://tina.io/docs/r/aws-s3-bucket/#set-up-api-routes"
+});
+const interpretErrorMessage = (message) => {
+  switch (message) {
+    case "Must supply cloud_name":
+    case "Must supply api_key":
+    case "Must supply api_secret":
+      return E_CONFIG;
+    case "unknown api_key":
+      return E_KEY_FAIL;
+    default:
+      return E_DEFAULT;
+  }
+};
+const s3ErrorRegex = /<Error>.*<Code>(.+)<\/Code>.*<Message>(.+)<\/Message>.*/;
+class S3MediaStore {
+  constructor() {
+    this.fetchFunction = (input, init) => {
+      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) {
+      let directory = item.directory;
+      if (directory == null ? void 0 : directory.endsWith("/")) {
+        directory = directory.substr(0, directory.length - 1);
       }
-      return newFiles;
-    }
-    async delete(media) {
-      await this.fetchWithBasePath(
-        `/api/s3/media/${encodeURIComponent(media.id)}`,
+      const path = `${directory && directory !== "/" ? `${directory}/${item.file.name}` : item.file.name}`;
+      const res = await this.fetchWithBasePath(
+        `/api/s3/media/upload_url?key=${path}`,
         {
-          method: "DELETE"
+          method: "GET"
         }
       );
-    }
-    async list(options) {
-      const query = this.buildQuery(options);
-      const response = await this.fetchWithBasePath("/api/s3/media" + query);
-      if (response.status == 401) {
-        throw E_UNAUTHORIZED;
+      if (res.status != 200) {
+        const responseData = await res.json();
+        throw new Error(responseData.message);
       }
-      if (response.status == 404) {
-        throw E_BAD_ROUTE;
+      const { signedUrl, src } = await res.json();
+      if (!signedUrl || !src) {
+        throw new Error("Unexpected error generating upload url");
       }
-      if (response.status >= 500) {
-        const { e } = await response.json();
-        const error = interpretErrorMessage(e);
-        throw error;
+      const uploadRes = await fetch(signedUrl, {
+        method: "PUT",
+        body: item.file,
+        headers: {
+          "Content-Type": item.file.type || "application/octet-stream"
+        }
+      });
+      if (!uploadRes.ok) {
+        const xmlRes = await uploadRes.text();
+        const matches = s3ErrorRegex.exec(xmlRes);
+        console.error(xmlRes);
+        if (!matches) {
+          throw new Error("Unexpected error uploading media asset");
+        } else {
+          throw new Error(`Upload error: '${matches[2]}'`);
+        }
       }
-      const { items, offset } = await response.json();
-      return {
-        items: items.map((item) => item),
-        nextOffset: offset
-      };
-    }
-    buildQuery(options) {
-      const params = Object.keys(options).filter((key) => options[key] !== "" && options[key] !== void 0).map((key) => `${key}=${options[key]}`).join("&");
-      return `?${params}`;
+      await new Promise((resolve) => {
+        setTimeout(resolve, 2e3);
+      });
+      newFiles.push({
+        directory: item.directory,
+        filename: item.file.name,
+        id: item.file.name,
+        type: "file",
+        thumbnails: {
+          "75x75": src,
+          "400x400": src,
+          "1000x1000": src
+        },
+        src
+      });
     }
+    return newFiles;
   }
-  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();
-          const query = `${url.includes("?") ? "&" : "?"}clientID=${client.clientId}`;
-          const res = client.authProvider.fetchWithToken(url + query, init);
-          return res;
-        } catch (error) {
-          console.error(error);
-        }
-      };
+  async delete(media) {
+    await this.fetchWithBasePath(
+      `/api/s3/media/${encodeURIComponent(media.id)}`,
+      {
+        method: "DELETE"
+      }
+    );
+  }
+  async list(options) {
+    const query = this.buildQuery(options);
+    const response = await this.fetchWithBasePath("/api/s3/media" + query);
+    if (response.status == 401) {
+      throw E_UNAUTHORIZED;
+    }
+    if (response.status == 404) {
+      throw E_BAD_ROUTE;
+    }
+    if (response.status >= 500) {
+      const { e } = await response.json();
+      const error = interpretErrorMessage(e);
+      throw error;
     }
+    const { items, offset } = await response.json();
+    return {
+      items: items.map((item) => item),
+      nextOffset: offset
+    };
   }
-  exports2.S3MediaStore = S3MediaStore;
-  exports2.TinaCloudS3MediaStore = TinaCloudS3MediaStore;
-  Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
-});
+  buildQuery(options) {
+    const params = Object.keys(options).filter((key) => options[key] !== "" && options[key] !== void 0).map((key) => `${key}=${options[key]}`).join("&");
+    return `?${params}`;
+  }
+}
+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();
+        const query = `${url.includes("?") ? "&" : "?"}clientID=${client.clientId}`;
+        const res = client.authProvider.fetchWithToken(url + query, init);
+        return res;
+      } catch (error) {
+        console.error(error);
+      }
+    };
+  }
+}
+export {
+  S3MediaStore,
+  TinaCloudS3MediaStore
+};

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "next-tinacms-s3",
-  "version": "13.0.1",
+  "version": "14.0.0",
   "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "module": "./dist/index.js",
   "files": [
     "dist"
   ],
@@ -27,10 +27,10 @@
     "react-dom": "^18.3.1",
     "typescript": "^5.7.3",
     "@tinacms/scripts": "1.4.1",
-    "tinacms": "2.10.1"
+    "tinacms": "3.0.0"
   },
   "peerDependencies": {
-    "tinacms": "2.10.1"
+    "tinacms": "3.0.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/dist/index.mjs

@@ -1,179 +0,0 @@
-import { DEFAULT_MEDIA_UPLOAD_TYPES } from "tinacms";
-class MediaListError extends Error {
-  constructor(config) {
-    super(config.message);
-    this.ERR_TYPE = "MediaListError";
-    this.title = config.title;
-    this.docsLink = config.docsLink;
-  }
-}
-const E_DEFAULT = new MediaListError({
-  title: "An Error Occurred",
-  message: "Something went wrong fetching your media from S3.",
-  docsLink: "https://tina.io/docs/r/aws-s3-bucket"
-});
-const E_UNAUTHORIZED = new MediaListError({
-  title: "Unauthorized",
-  message: "You don't have access to this resource.",
-  docsLink: "https://tina.io/docs/r/aws-s3-bucket"
-});
-const E_CONFIG = new MediaListError({
-  title: "Missing Credentials",
-  message: "Unable to connect to S3 because one or more environment variables are missing.",
-  docsLink: "https://tina.io/docs/r/aws-s3-bucket/"
-});
-const E_KEY_FAIL = new MediaListError({
-  title: "Bad Credentials",
-  message: "Unable to connect to S3 because one or more environment variables are misconfigured.",
-  docsLink: "https://tina.io/docs/r/aws-s3-bucket/"
-});
-const E_BAD_ROUTE = new MediaListError({
-  title: "Bad Route",
-  message: "The S3 API route is missing or misconfigured.",
-  docsLink: "https://tina.io/docs/r/aws-s3-bucket/#set-up-api-routes"
-});
-const interpretErrorMessage = (message) => {
-  switch (message) {
-    case "Must supply cloud_name":
-    case "Must supply api_key":
-    case "Must supply api_secret":
-      return E_CONFIG;
-    case "unknown api_key":
-      return E_KEY_FAIL;
-    default:
-      return E_DEFAULT;
-  }
-};
-const s3ErrorRegex = /<Error>.*<Code>(.+)<\/Code>.*<Message>(.+)<\/Message>.*/;
-class S3MediaStore {
-  constructor() {
-    this.fetchFunction = (input, init) => {
-      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) {
-      let directory = item.directory;
-      if (directory == null ? void 0 : directory.endsWith("/")) {
-        directory = directory.substr(0, directory.length - 1);
-      }
-      const path = `${directory && directory !== "/" ? `${directory}/${item.file.name}` : item.file.name}`;
-      const res = await this.fetchWithBasePath(
-        `/api/s3/media/upload_url?key=${path}`,
-        {
-          method: "GET"
-        }
-      );
-      if (res.status != 200) {
-        const responseData = await res.json();
-        throw new Error(responseData.message);
-      }
-      const { signedUrl, src } = await res.json();
-      if (!signedUrl || !src) {
-        throw new Error("Unexpected error generating upload url");
-      }
-      const uploadRes = await fetch(signedUrl, {
-        method: "PUT",
-        body: item.file,
-        headers: {
-          "Content-Type": item.file.type || "application/octet-stream"
-        }
-      });
-      if (!uploadRes.ok) {
-        const xmlRes = await uploadRes.text();
-        const matches = s3ErrorRegex.exec(xmlRes);
-        console.error(xmlRes);
-        if (!matches) {
-          throw new Error("Unexpected error uploading media asset");
-        } else {
-          throw new Error(`Upload error: '${matches[2]}'`);
-        }
-      }
-      await new Promise((resolve) => {
-        setTimeout(resolve, 2e3);
-      });
-      newFiles.push({
-        directory: item.directory,
-        filename: item.file.name,
-        id: item.file.name,
-        type: "file",
-        thumbnails: {
-          "75x75": src,
-          "400x400": src,
-          "1000x1000": src
-        },
-        src
-      });
-    }
-    return newFiles;
-  }
-  async delete(media) {
-    await this.fetchWithBasePath(
-      `/api/s3/media/${encodeURIComponent(media.id)}`,
-      {
-        method: "DELETE"
-      }
-    );
-  }
-  async list(options) {
-    const query = this.buildQuery(options);
-    const response = await this.fetchWithBasePath("/api/s3/media" + query);
-    if (response.status == 401) {
-      throw E_UNAUTHORIZED;
-    }
-    if (response.status == 404) {
-      throw E_BAD_ROUTE;
-    }
-    if (response.status >= 500) {
-      const { e } = await response.json();
-      const error = interpretErrorMessage(e);
-      throw error;
-    }
-    const { items, offset } = await response.json();
-    return {
-      items: items.map((item) => item),
-      nextOffset: offset
-    };
-  }
-  buildQuery(options) {
-    const params = Object.keys(options).filter((key) => options[key] !== "" && options[key] !== void 0).map((key) => `${key}=${options[key]}`).join("&");
-    return `?${params}`;
-  }
-}
-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();
-        const query = `${url.includes("?") ? "&" : "?"}clientID=${client.clientId}`;
-        const res = client.authProvider.fetchWithToken(url + query, init);
-        return res;
-      } catch (error) {
-        console.error(error);
-      }
-    };
-  }
-}
-export {
-  S3MediaStore,
-  TinaCloudS3MediaStore
-};