chore: fix yarn.lock conflicts

packages/medusa-file-minio/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.0.7](https://github.com/medusajs/medusa/compare/medusa-file-minio@1.0.6...medusa-file-minio@1.0.7) (2022-07-05)
+
+
+### Bug Fixes
+
+* **medusa-file-spaces,medusa-file-s3,medusa-file-minio:** Add options to super call in file plugins ([#1714](https://github.com/medusajs/medusa/issues/1714)) ([a5f717b](https://github.com/medusajs/medusa/commit/a5f717be5ae1954f3dbf1e7b2edb35d11088a8c8))
+
+
+### Features
+
+* **medusa:** Delete and download url endpoints ([#1705](https://github.com/medusajs/medusa/issues/1705)) ([cc29b64](https://github.com/medusajs/medusa/commit/cc29b641c9358415b46179371988e7ddc11d2664))
+* **medusa:** Extend file-service interface + move to core ([#1577](https://github.com/medusajs/medusa/issues/1577)) ([8e42d37](https://github.com/medusajs/medusa/commit/8e42d37e84e80c003b9c0311117ab8a8871aa61b))
+
+
+
+
+
 ## [1.0.6](https://github.com/medusajs/medusa/compare/medusa-file-minio@1.0.4...medusa-file-minio@1.0.6) (2022-06-19)
 
 **Note:** Version bump only for package medusa-file-minio

packages/medusa-file-minio/README.md

@@ -13,4 +13,4 @@ Learn more about how you can use this plugin in the [documentation](https://docs
   access_key_id: "YOUR-ACCESS-KEY",
   secret_access_key: "YOUR-SECRET-KEY",
 }
-```
+```

packages/medusa-file-minio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-file-minio",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "MinIO server file connector for Medusa",
   "main": "index.js",
   "repository": {

packages/medusa-file-minio/src/services/minio.js

@@ -1,10 +1,11 @@
-import fs from "fs"
+import { AbstractFileService } from '@medusajs/medusa'
 import aws from "aws-sdk"
-import { FileService } from "medusa-interfaces"
+import fs from "fs"
 
-class MinioService extends FileService {
+class MinioService extends AbstractFileService {
+  
   constructor({}, options) {
-    super()
+    super({}, options)
 
     this.bucket_ = options.bucket
     this.accessKeyId_ = options.access_key_id
@@ -15,14 +16,14 @@ class MinioService extends FileService {
   }
 
   upload(file) {
-    aws.config.setPromisesDependency()
+    aws.config.setPromisesDependency(null)
     aws.config.update({
       accessKeyId: this.accessKeyId_,
       secretAccessKey: this.secretAccessKey_,
       endpoint: this.endpoint_,
       s3ForcePathStyle: this.s3ForcePathStyle_,
       signatureVersion: this.signatureVersion_,
-    })
+    }, true)
 
     const s3 = new aws.S3()
     const params = {
@@ -46,14 +47,14 @@ class MinioService extends FileService {
   }
 
   delete(file) {
-    aws.config.setPromisesDependency()
+    aws.config.setPromisesDependency(null)
     aws.config.update({
       accessKeyId: this.accessKeyId_,
       secretAccessKey: this.secretAccessKey_,
       endpoint: this.endpoint_,
       s3ForcePathStyle: this.s3ForcePathStyle_,
       signatureVersion: this.signatureVersion_,
-    })
+    }, true)
 
     const s3 = new aws.S3()
     const params = {
@@ -71,6 +72,18 @@ class MinioService extends FileService {
       })
     })
   }
+
+  async getUploadStreamDescriptor(fileData) {
+    throw new Error("Method not implemented.")
+  }
+
+  async getDownloadStream(fileData) {
+    throw new Error("Method not implemented.")
+  }
+
+  async getPresignedDownloadUrl(fileData) {
+    throw new Error("Method not implemented.")
+  }
 }
 
 export default MinioService