fix(urls): replace base URL regex with url-parse

Reimplements #160. Closes #150. Closes #160.
pouchdb-community · Nov 17, 2017 · 7472135 · 7472135
1 parent d600426
commit 7472135
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,7 +41,8 @@
     "pouchdb-extend": "0.1.2",
     "pouchdb-promise": "6.3.4",
     "pouchdb-utils": "6.3.4",
-    "url-join": "2.0.2"
+    "url-join": "2.0.2",
+    "url-parse": "1.2.0"
   },
   "devDependencies": {
     "babel-preset-env": "^1.6.1",

diff --git a/src/utils.js b/src/utils.js
@@ -1,14 +1,15 @@
 'use strict';
 
 import urlJoin from 'url-join';
+import urlParse from 'url-parse';
 
 function getBaseUrl(db) {
   if (typeof db.getUrl === 'function') { // pouchdb pre-6.0.0
-    return db.getUrl().replace(/[^/]+\/?$/, '');
+    return urlParse(db.getUrl()).origin;
   } else if (db.__opts && db.__opts.prefix) { // PouchDB.defaults
     return db.__opts.prefix;
   } else { // pouchdb post-6.0.0
-    return db.name.replace(/[^/]+\/?$/, '');
+    return urlParse(db.name).origin;
   }
 }