next-tinacms-s3 0.0.4 → 0.0.6

package/dist/errors.d.ts

@@ -10,10 +10,21 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-import { MediaListError } from '@tinacms/toolkit';
+interface MediaListErrorConfig {
+    title: string;
+    message: string;
+    docsLink: string;
+}
+declare class MediaListError extends Error {
+    ERR_TYPE: string;
+    title: string;
+    docsLink: string;
+    constructor(config: MediaListErrorConfig);
+}
 export declare const E_DEFAULT: MediaListError;
 export declare const E_UNAUTHORIZED: MediaListError;
 export declare const E_CONFIG: MediaListError;
 export declare const E_KEY_FAIL: MediaListError;
 export declare const E_BAD_ROUTE: MediaListError;
 export declare const interpretErrorMessage: (message: string) => MediaListError;
+export {};

package/dist/handlers.js

@@ -42,7 +42,8 @@ var createMediaHandler = (config, options) => {
   const bucket = config.bucket;
   const region = config.config.region || "us-east-1";
   const endpoint = config.config.endpoint || `https://s3.${region}.amazonaws.com`;
-  const cdnUrl = (options == null ? void 0 : options.cdnUrl) || endpoint.toString().replace(/http(s|):\/\//i, `https://${bucket}.`);
+  let cdnUrl = (options == null ? void 0 : options.cdnUrl) || endpoint.toString().replace(/http(s|):\/\//i, `https://${bucket}.`);
+  cdnUrl = cdnUrl + (cdnUrl.endsWith("/") ? "" : "/");
   return async (req, res) => {
     const isAuthorized = await config.authorized(req, res);
     if (!isAuthorized) {
@@ -53,7 +54,7 @@ var createMediaHandler = (config, options) => {
       case "GET":
         return listMedia(req, res, client, bucket, cdnUrl);
       case "POST":
-        return uploadMedia(req, res, client, bucket);
+        return uploadMedia(req, res, client, bucket, cdnUrl);
       case "DELETE":
         return deleteAsset(req, res, client, bucket);
       default:
@@ -61,7 +62,7 @@ var createMediaHandler = (config, options) => {
     }
   };
 };
-async function uploadMedia(req, res, client, bucket) {
+async function uploadMedia(req, res, client, bucket, cdnUrl) {
   try {
     const upload = (0, import_util.promisify)((0, import_multer.default)({
       storage: import_multer.default.diskStorage({
@@ -80,15 +81,27 @@ async function uploadMedia(req, res, client, bucket) {
       prefix = prefix + "/";
     const filePath = req.file.path;
     const blob = import_fs.default.readFileSync(filePath);
+    const filename = import_path.default.basename(filePath);
     const params = {
       Bucket: bucket,
-      Key: prefix + import_path.default.basename(filePath),
+      Key: prefix + filename,
       Body: blob,
       ACL: "public-read"
     };
     const command = new import_client_s3.PutObjectCommand(params);
-    const result = await client.send(command);
-    res.json(result);
+    try {
+      await client.send(command);
+      res.json({
+        type: "file",
+        id: prefix + filename,
+        filename,
+        directory: prefix,
+        previewSrc: cdnUrl + prefix + filename,
+        src: cdnUrl + prefix + filename
+      });
+    } catch (e) {
+      res.status(500).send(findErrorMessage(e));
+    }
   } catch (e) {
     res.status(500);
     const message = findErrorMessage(e);
@@ -167,8 +180,8 @@ function getS3ToTinaFunc(cdnUrl) {
       id: file.Key,
       filename,
       directory,
-      src: cdnUrl + "/" + file.Key,
-      previewSrc: cdnUrl + "/" + file.Key,
+      src: cdnUrl + file.Key,
+      previewSrc: cdnUrl + file.Key,
       type: "file"
     };
   };

package/dist/index.es.js

@@ -1,4 +1,11 @@
-import { MediaListError } from "@tinacms/toolkit";
+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.",
@@ -71,14 +78,7 @@ class S3MediaStore {
       await new Promise((resolve) => {
         setTimeout(resolve, 2e3);
       });
-      const parsedRes = {
-        type: "file",
-        id: fileRes.public_id,
-        filename: fileRes.original_filename,
-        directory: "/",
-        previewSrc: fileRes.url
-      };
-      newFiles.push(parsedRes);
+      newFiles.push(fileRes);
     }
     return newFiles;
   }

package/dist/index.js

@@ -1,28 +1,36 @@
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@tinacms/toolkit")) : typeof define === "function" && define.amd ? define(["exports", "@tinacms/toolkit"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["next-tinacms-s3"] = {}, global.NOOP));
-})(this, function(exports2, toolkit) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports) : typeof define === "function" && define.amd ? define(["exports"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["next-tinacms-s3"] = {}));
+})(this, function(exports2) {
   "use strict";
-  const E_DEFAULT = new toolkit.MediaListError({
+  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/packages/next-tinacms-s3"
   });
-  const E_UNAUTHORIZED = new toolkit.MediaListError({
+  const E_UNAUTHORIZED = new MediaListError({
     title: "Unauthorized",
     message: "You don't have access to this resource.",
     docsLink: "https://tina.io/packages/next-tinacms-s3"
   });
-  const E_CONFIG = new toolkit.MediaListError({
+  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/media-s3/"
   });
-  const E_KEY_FAIL = new toolkit.MediaListError({
+  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/media-s3/"
   });
-  const E_BAD_ROUTE = new toolkit.MediaListError({
+  const E_BAD_ROUTE = new MediaListError({
     title: "Bad Route",
     message: "The S3 API route is missing or misconfigured.",
     docsLink: "https://tina.io/packages/next-tinacms-s3/#set-up-api-routes"
@@ -74,14 +82,7 @@
         await new Promise((resolve) => {
           setTimeout(resolve, 2e3);
         });
-        const parsedRes = {
-          type: "file",
-          id: fileRes.public_id,
-          filename: fileRes.original_filename,
-          directory: "/",
-          previewSrc: fileRes.url
-        };
-        newFiles.push(parsedRes);
+        newFiles.push(fileRes);
       }
       return newFiles;
     }

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

@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-import { Media, MediaList, MediaListOptions, MediaStore, MediaUploadOptions } from '@tinacms/toolkit';
+import type { Media, MediaList, MediaListOptions, MediaStore, MediaUploadOptions } from '@tinacms/toolkit';
 export declare class S3MediaStore implements MediaStore {
     fetchFunction: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
     accept: string;

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

@@ -11,7 +11,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import { S3MediaStore } from './s3-media-store';
-import { Client } from 'tinacms';
+import type { Client } from 'tinacms';
 export declare class TinaCloudS3MediaStore extends S3MediaStore {
     client: Client;
     constructor(client: Client);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-tinacms-s3",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "main": "dist/index.js",
   "files": [
     "dist"
@@ -22,25 +22,17 @@
     "multer": "1.4.5-lts.1"
   },
   "devDependencies": {
-    "@tinacms/toolkit": "0.58.0",
-    "@tinacms/scripts": "0.51.2",
+    "@tinacms/toolkit": "0.58.2",
+    "@tinacms/scripts": "0.51.3",
     "@types/crypto-js": "^3.1.47",
     "@types/js-cookie": "^2.2.6",
     "@types/node": "^13.13.1",
     "@types/react": "^16.9.43",
     "next": "12.2.4",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
-    "tinacms": "0.69.17",
+    "tinacms": "0.69.20",
     "typescript": "4.3.5"
   },
-  "peerDependencies": {
-    "@tinacms/toolkit": "*",
-    "react": ">=16.14",
-    "react-dom": ">=16.14",
-    "react-is": "^16.13.1 || <18.0.0",
-    "tinacms": ">=0.50.0"
-  },
+  "peerDependencies": {},
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },