chore: fix yarn.lock conflicts

packages/medusa-file-s3/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.3](https://github.com/medusajs/medusa/compare/medusa-file-s3@1.1.2...medusa-file-s3@1.1.3) (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:** Extend file-service interface + move to core ([#1577](https://github.com/medusajs/medusa/issues/1577)) ([8e42d37](https://github.com/medusajs/medusa/commit/8e42d37e84e80c003b9c0311117ab8a8871aa61b))
+
+
+
+
+
 ## [1.1.2](https://github.com/medusajs/medusa/compare/medusa-file-s3@1.1.0...medusa-file-s3@1.1.2) (2022-06-19)
 
 **Note:** Version bump only for package medusa-file-s3

packages/medusa-file-s3/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-file-s3",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "AWS s3 file connector for Medusa",
   "main": "index.js",
   "repository": {

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

@@ -1,10 +1,10 @@
 import fs from "fs"
 import aws from "aws-sdk"
-import { FileService } from "medusa-interfaces"
+import { AbstractFileService } from '@medusajs/medusa'
 
-class S3Service extends FileService {
+class S3Service extends AbstractFileService {
   constructor({}, options) {
-    super()
+    super({}, options)
 
     this.bucket_ = options.bucket
     this.s3Url_ = options.s3_url
@@ -15,13 +15,13 @@ class S3Service extends FileService {
   }
 
   upload(file) {
-    aws.config.setPromisesDependency()
+    aws.config.setPromisesDependency(null)
     aws.config.update({
       accessKeyId: this.accessKeyId_,
       secretAccessKey: this.secretAccessKey_,
       region: this.region_,
       endpoint: this.endpoint_,
-    })
+    }, true)
 
     const s3 = new aws.S3()
     var params = {
@@ -44,13 +44,13 @@ class S3Service extends FileService {
   }
 
   delete(file) {
-    aws.config.setPromisesDependency()
+    aws.config.setPromisesDependency(null)
     aws.config.update({
       accessKeyId: this.accessKeyId_,
       secretAccessKey: this.secretAccessKey_,
       region: this.region_,
       endpoint: this.endpoint_,
-    })
+    }, true)
 
     const s3 = new aws.S3()
     var params = {
@@ -68,6 +68,18 @@ class S3Service 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 S3Service