feat(deps): remove whatwg-url dependency (#227)

Author: lisathesecond

package.json

@@ -44,6 +44,7 @@
     "@babel/polyfill": "^7.0.0",
     "@babel/preset-env": "^7.1.0",
     "assert": "^1.4.1",
+    "axios": "~0.21.1",
     "babel-loader": "^8.0.4",
     "cache-control-esm": "1.0.0",
     "codecov": "^3.0.0",
@@ -61,6 +62,7 @@
     "karma-webpack": "^2.0.3",
     "localforage": "^1.7.2",
     "localforage-memoryStorageDriver": "^0.9.2",
+    "lodash": "^4.17.11",
     "mocha": "^5.0.4",
     "mockdate": "^2.0.2",
     "puppeteer": "^3.1.0",
@@ -70,14 +72,12 @@
     "snazzy": "^7.0.0",
     "standard": "^14.3.1",
     "webpack": "^4.1.1",
-    "webpack-cli": "^3.1.1",
-    "axios": "~0.21.1"
+    "webpack-bundle-analyzer": "^4.4.0",
+    "webpack-cli": "^3.1.1"
   },
   "dependencies": {
     "cache-control-esm": "1.0.0",
-    "lodash": "^4.17.11",
-    "md5": "^2.2.1",
-    "whatwg-url": "^7.1.0"
+    "md5": "^2.2.1"
   },
   "peerDependencies": {
     "axios": "~0.21.1"

src/cache.js

@@ -1,7 +1,5 @@
-import isString from 'lodash/isString'
-import isFunction from 'lodash/isFunction'
+import { isString, isFunction } from './utilities'
 import md5 from 'md5'
-import { URL } from 'whatwg-url'
 
 import serialize from './serialize'
 
@@ -71,14 +69,14 @@ function key (config) {
   let cacheKey
   if (isString(config.key)) {
     cacheKey = req => {
-      const url = new URL(req.url, req.baseURL)
-      const key = `${config.key}/${url.href}${serializeQuery(req)}`
+      const url = `${req.baseURL ? req.baseURL : ''}${req.url}`
+      const key = `${config.key}/${url}${serializeQuery(req)}`
       return req.data ? key + md5(req.data) : key
     }
   } else {
     cacheKey = req => {
-      const url = new URL(req.url, req.baseURL)
-      const key = url.href + serializeQuery(req)
+      const url = `${req.baseURL ? req.baseURL : ''}${req.url}`
+      const key = url + serializeQuery(req)
       return req.data ? key + md5(req.data) : key
     }
   }

test/spec/cache.spec.js

@@ -136,11 +136,11 @@ describe('Cache store', () => {
     let cacheKey = cache.key({ key: 'my-key' })
 
     assert.ok(isFunction(cacheKey))
-    assert.equal(cacheKey({ url: 'https://httpbin.org' }), 'my-key/https://httpbin.org/')
+    assert.equal(cacheKey({ url: 'https://httpbin.org/' }), 'my-key/https://httpbin.org/')
 
     cacheKey = cache.key({})
 
     assert.ok(isFunction(cacheKey))
-    assert.equal(cacheKey({ url: 'https://httpbin.org' }), 'https://httpbin.org/')
+    assert.equal(cacheKey({ url: 'https://httpbin.org/' }), 'https://httpbin.org/')
   })
 })

test/spec/index.spec.js

@@ -322,7 +322,7 @@ describe('Integration', function () {
     const url = 'https://httpbin.org/status/404'
     const api5 = setup({
       cache: {
-        // debug: true,
+        debug: true,
         maxAge: 1,
         readOnError: (err, config) => {
           return err.response.status === 404

webpack.config.js

@@ -1,6 +1,7 @@
 const path = require('path')
 const webpack = require('webpack')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
+// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
 
 const cwd = process.cwd()
 
@@ -9,7 +10,9 @@ let filename = 'cache[version].js'
 let version = ['']
 
 // Start with empty list of plugins and externals and an undefined devtool
-const plugins = []
+const plugins = [
+  // new BundleAnalyzerPlugin()
+]
 let externals = {}
 
 let mode = 'development'
@@ -170,7 +173,7 @@ const test = {
     port: 3000
   },
   target: 'web',
-  devtool: 'inline-source-map'
+  devtool: 'source-map'
 }
 
 module.exports = process.env.NODE_ENV === 'test' ? test : build