Fxing some import issues

Author: Ron Radtke

polyfill/Fetch.js

@@ -1,7 +1,8 @@
 import Log from '../utils/log.js';
 import Blob from './Blob';
-import {config as RNconfig, wrap} from "../fetch";
+import {config as RNconfig} from "../fetch";
 import type {ReactNativeBlobUtilConfig} from "../types";
+import URIUtil from "../utils/uri";
 import {FetchBlobResponse} from "../class/ReactNativeBlobUtilBlobResponse";
 
 const log = new Log('FetchPolyfill');
@@ -40,12 +41,12 @@ class ReactNativeBlobUtilFetchPolyfill {
                     promise = Blob.build(body).then((b) => {
                         blobCache = b;
                         options.headers['Content-Type'] = 'multipart/form-data;boundary=' + b.multipartBoundary;
-                        return Promise.resolve(wrap(b._ref));
+                        return Promise.resolve(URIUtil.wrap(b._ref));
                     });
                 }
                 // When request body is a Blob, use file URI of the Blob as request body.
                 else if (body.isReactNativeBlobUtilPolyfill)
-                    promise = Promise.resolve(wrap(body.blobPath));
+                    promise = Promise.resolve(URIUtil.wrap(body.blobPath));
                 else if (typeof body !== 'object' && options.headers['Content-Type'] !== 'application/json')
                     promise = Promise.resolve(JSON.stringify(body));
                 else if (typeof body !== 'string')

polyfill/XMLHttpRequest.js

@@ -6,10 +6,9 @@ import XMLHttpRequestEventTarget from './XMLHttpRequestEventTarget.js';
 import Log from '../utils/log.js';
 import Blob from './Blob.js';
 import ProgressEvent from './ProgressEvent.js';
-import URIUtil from '../utils/uri';
-import {NativeModules} from "react-native";
+import URIUtil from "../utils/uri";
+import {config} from "../fetch";
 
-const ReactNativeBlobUtil = NativeModules.ReactNativeBlobUtil;
 const log = new Log('XMLHttpRequest');
 
 
@@ -183,7 +182,7 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget {
                         };
                     }
                     log.debug('body created send request');
-                    body = ReactNativeBlobUtil.wrap(blob.getReactNativeBlobUtilRef());
+                    body = URIUtil.wrap(blob.getReactNativeBlobUtilRef());
                     resolve();
                 });
             });
@@ -203,13 +202,12 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget {
                 _headers[h] = _headers[h].toString();
             }
 
-            this._task = ReactNativeBlobUtil
-                .config({
-                    auto: true,
-                    timeout: this._timeout,
-                    increment: this._increment,
-                    binaryContentTypes: XMLHttpRequest.binaryContentTypes
-                })
+            this._task = config({
+                auto: true,
+                timeout: this._timeout,
+                increment: this._increment,
+                binaryContentTypes: XMLHttpRequest.binaryContentTypes
+            })
                 .fetch(_method, _url, _headers, body);
             this._task
                 .stateChange(this._headerReceived)