@strapi/provider-upload-aws-s3 4.14.2 → 4.14.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/provider-upload-aws-s3",
-  "version": "4.14.2",
+  "version": "4.14.4",
   "description": "AWS S3 provider for strapi upload",
   "keywords": [
     "upload",
@@ -30,32 +30,34 @@
     }
   ],
   "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "files": [
     "./dist"
   ],
   "scripts": {
-    "build": "run -T tsc",
-    "build:ts": "run -T tsc",
-    "watch": "run -T tsc -w --preserveWatchOutput",
+    "build": "pack-up build",
     "clean": "run -T rimraf ./dist",
+    "lint": "run -T eslint .",
     "prepublishOnly": "yarn clean && yarn build",
     "test:unit": "run -T jest",
     "test:unit:watch": "run -T jest --watch",
-    "lint": "run -T eslint ."
+    "watch": "pack-up watch"
   },
   "dependencies": {
-    "aws-sdk": "2.1437.0",
+    "aws-sdk": "2.1472.0",
     "lodash": "4.17.21"
   },
   "devDependencies": {
+    "@strapi/pack-up": "4.14.4",
     "@types/jest": "29.5.2",
-    "eslint-config-custom": "4.14.2",
-    "tsconfig": "4.14.2"
+    "eslint-config-custom": "4.14.4",
+    "tsconfig": "4.14.4"
   },
   "engines": {
     "node": ">=16.0.0 <=20.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "5dbbe10fdf99f63e91b78a0439ec84581f3c9c6a"
+  "gitHead": "fbd6e3e3014b1c5eee1d7bb8d65e273318662656"
 }

package/dist/utils.js

@@ -1,70 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUrlFromBucket = void 0;
-const ENDPOINT_PATTERN = /^(.+\.)?s3[.-]([a-z0-9-]+)\./;
-function isUrlFromBucket(fileUrl, bucketName, baseUrl = '') {
-    const url = new URL(fileUrl);
-    // Check if the file URL is using a base URL (e.g. a CDN).
-    // In this case do not sign the URL.
-    if (baseUrl) {
-        return false;
-    }
-    const { bucket } = getBucketFromAwsUrl(fileUrl);
-    if (bucket) {
-        return bucket === bucketName;
-    }
-    // File URL might be of an S3-compatible provider. (or an invalid URL)
-    // In this case, check if the bucket name appears in the URL host or path.
-    // e.g. https://minio.example.com/bucket-name/object-key
-    // e.g. https://bucket.nyc3.digitaloceanspaces.com/folder/img.png
-    return url.host.startsWith(`${bucketName}.`) || url.pathname.includes(`/${bucketName}/`);
-}
-exports.isUrlFromBucket = isUrlFromBucket;
-/**
- * Parse the bucket name from a URL.
- * See all URL formats in https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-bucket-intro.html
- *
- * @param {string} fileUrl - the URL to parse
- * @returns {object} result
- * @returns {string} result.bucket - the bucket name
- * @returns {string} result.err - if any
- */
-function getBucketFromAwsUrl(fileUrl) {
-    const url = new URL(fileUrl);
-    // S3://<bucket-name>/<key>
-    if (url.protocol === 's3:') {
-        const bucket = url.host;
-        if (!bucket) {
-            return { err: `Invalid S3 url: no bucket: ${url}` };
-        }
-        return { bucket };
-    }
-    if (!url.host) {
-        return { err: `Invalid S3 url: no hostname: ${url}` };
-    }
-    const matches = url.host.match(ENDPOINT_PATTERN);
-    if (!matches) {
-        return { err: `Invalid S3 url: hostname does not appear to be a valid S3 endpoint: ${url}` };
-    }
-    const prefix = matches[1];
-    // https://s3.amazonaws.com/<bucket-name>
-    if (!prefix) {
-        if (url.pathname === '/') {
-            return { bucket: null };
-        }
-        const index = url.pathname.indexOf('/', 1);
-        // https://s3.amazonaws.com/<bucket-name>
-        if (index === -1) {
-            return { bucket: url.pathname.substring(1) };
-        }
-        // https://s3.amazonaws.com/<bucket-name>/
-        if (index === url.pathname.length - 1) {
-            return { bucket: url.pathname.substring(1, index) };
-        }
-        // https://s3.amazonaws.com/<bucket-name>/key
-        return { bucket: url.pathname.substring(1, index) };
-    }
-    // https://<bucket-name>.s3.amazonaws.com/
-    return { bucket: prefix.substring(0, prefix.length - 1) };
-}
-//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,MAAM,gBAAgB,GAAG,8BAA8B,CAAC;AAOxD,SAAgB,eAAe,CAAC,OAAe,EAAE,UAAkB,EAAE,OAAO,GAAG,EAAE;IAC/E,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IAE7B,0DAA0D;IAC1D,oCAAoC;IACpC,IAAI,OAAO,EAAE;QACX,OAAO,KAAK,CAAC;KACd;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAEhD,IAAI,MAAM,EAAE;QACV,OAAO,MAAM,KAAK,UAAU,CAAC;KAC9B;IAED,sEAAsE;IACtE,0EAA0E;IAC1E,wDAAwD;IACxD,iEAAiE;IACjE,OAAO,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,UAAU,GAAG,CAAC,CAAC;AAC3F,CAAC;AApBD,0CAoBC;AAED;;;;;;;;GAQG;AACH,SAAS,mBAAmB,CAAC,OAAe;IAC1C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IAE7B,2BAA2B;IAC3B,IAAI,GAAG,CAAC,QAAQ,KAAK,KAAK,EAAE;QAC1B,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC;QAExB,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,EAAE,GAAG,EAAE,8BAA8B,GAAG,EAAE,EAAE,CAAC;SACrD;QACD,OAAO,EAAE,MAAM,EAAE,CAAC;KACnB;IAED,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;QACb,OAAO,EAAE,GAAG,EAAE,gCAAgC,GAAG,EAAE,EAAE,CAAC;KACvD;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACjD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,EAAE,GAAG,EAAE,uEAAuE,GAAG,EAAE,EAAE,CAAC;KAC9F;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1B,yCAAyC;IACzC,IAAI,CAAC,MAAM,EAAE;QACX,IAAI,GAAG,CAAC,QAAQ,KAAK,GAAG,EAAE;YACxB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SACzB;QAED,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAE3C,yCAAyC;QACzC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9C;QAED,0CAA0C;QAC1C,IAAI,KAAK,KAAK,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACrC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;SACrD;QAED,6CAA6C;QAC7C,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;KACrD;IAED,0CAA0C;IAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;AAC5D,CAAC"}