aws-s3: replace resolve-url by url-parse

So it works in browser-ish, but non-DOM, environments. Will use the global `URL` API if available, and fall back to url-parse, which has a compatible-enough API. Fixes #1720
transloadit · Sep 30, 2019 · d6e11ce · d6e11ce
1 parent 91ee6af
commit d6e11ce
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/@uppy/aws-s3-multipart/package.json b/packages/@uppy/aws-s3-multipart/package.json
@@ -24,8 +24,7 @@
   },
   "dependencies": {
     "@uppy/companion-client": "file:../companion-client",
-    "@uppy/utils": "file:../utils",
-    "resolve-url": "^0.2.1"
+    "@uppy/utils": "file:../utils"
   },
   "peerDependencies": {
     "@uppy/core": "^1.0.0"

diff --git a/packages/@uppy/aws-s3/package.json b/packages/@uppy/aws-s3/package.json
@@ -25,7 +25,7 @@
     "@uppy/companion-client": "file:../companion-client",
     "@uppy/utils": "file:../utils",
     "@uppy/xhr-upload": "file:../xhr-upload",
-    "resolve-url": "^0.2.1"
+    "url-parse": "^1.4.7"
   },
   "peerDependencies": {
     "@uppy/core": "^1.0.0"

diff --git a/packages/@uppy/aws-s3/src/index.js b/packages/@uppy/aws-s3/src/index.js
@@ -1,10 +1,15 @@
-const resolveUrl = require('resolve-url')
+// If global `URL` constructor is available, use it
+const URL_ = typeof URL === 'function' ? URL : require('url-parse')
 const { Plugin } = require('@uppy/core')
 const Translator = require('@uppy/utils/lib/Translator')
 const RateLimitedQueue = require('@uppy/utils/lib/RateLimitedQueue')
 const { RequestClient } = require('@uppy/companion-client')
 const XHRUpload = require('@uppy/xhr-upload')
 
+function resolveUrl (origin, link) {
+  return new URL_(link, origin).toString()
+}
+
 function isXml (xhr) {
   const contentType = xhr.headers ? xhr.headers['content-type'] : xhr.getResponseHeader('Content-Type')
   return typeof contentType === 'string' && contentType.toLowerCase() === 'application/xml'