Replaced resolve-url dependency per #773 (#774)

naptha · Jun 2, 2023 · fd1c8b2 · fd1c8b2
1 parent a5f10d8
commit fd1c8b2
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,7 +70,6 @@
     "node-fetch": "^2.6.9",
     "opencollective-postinstall": "^2.0.3",
     "regenerator-runtime": "^0.13.3",
-    "resolve-url": "^0.2.1",
     "tesseract.js-core": "^4.0.4",
     "wasm-feature-detect": "^1.2.11",
     "zlibjs": "^0.3.1"

diff --git a/src/utils/resolvePaths.js b/src/utils/resolvePaths.js
@@ -1,5 +1,6 @@
 const isBrowser = require('./getEnvironment')('type') === 'browser';
-const resolveURL = isBrowser ? require('resolve-url') : s => s; // eslint-disable-line
+
+const resolveURL = isBrowser ? s => (new URL(s, window.location.href)).href : s => s; // eslint-disable-line
 
 module.exports = (options) => {
   const opts = { ...options };

diff --git a/src/worker/browser/defaultOptions.js b/src/worker/browser/defaultOptions.js
@@ -1,4 +1,4 @@
-const resolveURL = require('resolve-url');
+const resolveURL = (s) => (new URL(s, window.location.href)).href;
 const { version } = require('../../../package.json');
 const defaultOptions = require('../../constants/defaultOptions');
 

diff --git a/src/worker/browser/loadImage.js b/src/worker/browser/loadImage.js
@@ -1,5 +1,3 @@
-const resolveURL = require('resolve-url');
-
 /**
  * readFromBlobOrFile
  *
@@ -40,7 +38,7 @@ const loadImage = async (image) => {
         .split('')
         .map((c) => c.charCodeAt(0));
     } else {
-      const resp = await fetch(resolveURL(image));
+      const resp = await fetch(image);
       data = await resp.arrayBuffer();
     }
   } else if (typeof HTMLElement !== 'undefined' && image instanceof HTMLElement) {