Removed import of url module in browser build due to significant size…

… overhead; (#4594) Removed pointless `Malformed URL` checking in client build;
axios · Apr 26, 2022 · 4f7e3e3 · 4f7e3e3
1 parent cdd7add
commit 4f7e3e3
Show file tree

Hide file tree

Showing 6 changed files with 1,010 additions and 878 deletions.
diff --git a/lib/adapters/http.js b/lib/adapters/http.js
@@ -17,6 +17,8 @@ var CanceledError = require('../cancel/CanceledError');
 
 var isHttps = /https:?/;
 
+var supportedProtocols = [ 'http:', 'https:', 'file:' ];
+
 /**
  *
  * @param {http.ClientRequestArgs} options
@@ -129,9 +131,9 @@ module.exports = function httpAdapter(config) {
     // Parse url
     var fullPath = buildFullPath(config.baseURL, config.url);
     var parsed = url.parse(fullPath);
-    var protocol = utils.getProtocol(parsed.protocol);
+    var protocol = parsed.protocol || supportedProtocols[0];
 
-    if (!utils.supportedProtocols.includes(protocol)) {
+    if (supportedProtocols.indexOf(protocol) === -1) {
       return reject(new AxiosError(
         'Unsupported protocol ' + protocol,
         AxiosError.ERR_BAD_REQUEST,

diff --git a/lib/adapters/xhr.js b/lib/adapters/xhr.js
@@ -7,7 +7,6 @@ var buildURL = require('./../helpers/buildURL');
 var buildFullPath = require('../core/buildFullPath');
 var parseHeaders = require('./../helpers/parseHeaders');
 var isURLSameOrigin = require('./../helpers/isURLSameOrigin');
-var url = require('url');
 var transitionalDefaults = require('../defaults/transitional');
 var AxiosError = require('../core/AxiosError');
 var CanceledError = require('../cancel/CanceledError');
@@ -38,8 +37,6 @@ module.exports = function xhrAdapter(config) {
     }
 
     var fullPath = buildFullPath(config.baseURL, config.url);
-    var parsed = url.parse(fullPath);
-    var protocol = utils.getProtocol(parsed.protocol);
 
     request.open(config.method.toUpperCase(), buildURL(fullPath, config.params, config.paramsSerializer), true);
 
@@ -206,16 +203,15 @@ module.exports = function xhrAdapter(config) {
       requestData = null;
     }
 
-    if (parsed.path === null) {
-      reject(new AxiosError('Malformed URL ' + fullPath, AxiosError.ERR_BAD_REQUEST, config));
-      return;
-    }
+    var tokens = fullPath.split(':', 2);
+    var protocol = tokens.length > 1 && tokens[0];
 
-    if (!utils.supportedProtocols.includes(protocol)) {
-      reject(new AxiosError('Unsupported protocol ' + protocol, AxiosError.ERR_BAD_REQUEST, config));
+    if (protocol && [ 'http', 'https', 'file' ].indexOf(protocol) === -1) {
+      reject(new AxiosError('Unsupported protocol ' + protocol + ':', AxiosError.ERR_BAD_REQUEST, config));
       return;
     }
 
+
     // Send the request
     request.send(requestData);
   });

diff --git a/lib/utils.js b/lib/utils.js
@@ -22,22 +22,6 @@ function kindOfTest(type) {
   };
 }
 
-/**
- * Array with axios supported protocols.
- */
-var supportedProtocols = [ 'http:', 'https:', 'file:' ];
-
-/**
- * Returns URL protocol passed as param if is not undefined or null,
- * otherwise just returns 'http:'
- *
- * @param {String} protocol The String value of URL protocol
- * @returns {String} Protocol if the value is not undefined or null
- */
-function getProtocol(protocol) {
-  return protocol || 'http:';
-}
-
 /**
  * Determine if a value is an Array
  *
@@ -453,8 +437,6 @@ var isTypedArray = (function(TypedArray) {
 })(typeof Uint8Array !== 'undefined' && Object.getPrototypeOf(Uint8Array));
 
 module.exports = {
-  supportedProtocols: supportedProtocols,
-  getProtocol: getProtocol,
   isArray: isArray,
   isArrayBuffer: isArrayBuffer,
   isBuffer: isBuffer,