feat(wip): replace dequal, glob-to-regexp and bump path-to-regexp

Author: talentlessguy

package-lock.json

@@ -18,10 +18,10 @@
   },
   "homepage": "https://github.com/wheresrhys/fetch-mock#readme",
   "dependencies": {
-    "glob-to-regexp": "^0.4.1",
+    "dequal": "^2.0.3",
+    "globrex": "^0.1.2",
     "is-subset": "^0.1.1",
-    "lodash.isequal": "^4.5.0",
-    "path-to-regexp": "^2.4.0",
+    "path-to-regexp": "^7.1.0",
     "querystring": "^0.2.1"
   }
 }

packages/core/package.json

@@ -2,11 +2,11 @@
 /** @typedef {import('./Route').RouteConfig} RouteConfig */
 /** @typedef {import('./RequestUtils').NormalizedRequestOptions} NormalizedRequestOptions */
 /** @typedef {import('path-to-regexp').Key} Key */
-import glob from 'glob-to-regexp';
-import pathToRegexp from 'path-to-regexp';
+import glob from 'globrex';
+import { pathToRegexp } from 'path-to-regexp';
 import querystring from 'querystring';
 import isSubset from 'is-subset';
-import isEqual from 'lodash.isequal';
+import { dequal as isEqual } from 'dequal';
 import {
 	normalizeHeaders,
 	getPath,
@@ -54,7 +54,7 @@ const stringMatchers = {
 
 	glob: (targetString) => {
 		const urlRX = glob(targetString);
-		return (url) => urlRX.test(url);
+		return (url) => urlRX.regex.test(url);
 	},
 	express: (targetString) => {
 		const urlRX = pathToRegexp(targetString);
@@ -129,14 +129,12 @@ const getParamsMatcher = ({ params: expectedParams, url: matcherUrl }) => {
 			);
 		}
 		const expectedKeys = Object.keys(expectedParams);
-		/** @type {Key[]} */
-		const keys = [];
-		const re = pathToRegexp(matcherUrl.replace(/^express:/, ''), keys);
+		const re = pathToRegexp(matcherUrl.replace(/^express:/, ''));
 		return (url) => {
 			const vals = re.exec(getPath(url)) || [];
 			vals.shift();
 			/** @type {Object.<string,string>} */
-			const params = keys.reduce(
+			const params = re.keys.reduce(
 				(map, { name }, i) =>
 					vals[i] ? Object.assign(map, { [name]: vals[i] }) : map,
 				{},

packages/core/src/Matchers.js

@@ -33,10 +33,10 @@
   "homepage": "http://www.wheresrhys.co.uk/fetch-mock",
   "dependencies": {
     "debug": "^4.1.1",
-    "glob-to-regexp": "^0.4.0",
+    "dequal": "^2.0.3",
+    "globrex": "^0.1.2",
     "is-subset": "^0.1.1",
-    "lodash.isequal": "^4.5.0",
-    "path-to-regexp": "^2.2.1"
+    "path-to-regexp": "^7.1.0"
   },
   "peerDependenciesMeta": {
     "node-fetch": {

packages/fetch-mock/package.json

@@ -1,7 +1,7 @@
-import glob from 'glob-to-regexp';
-import pathToRegexp from 'path-to-regexp';
+import glob from 'globrex';
+import { pathToRegexp } from 'path-to-regexp';
 import isSubset from 'is-subset';
-import isEqual from 'lodash.isequal';
+import { dequal as isEqual } from 'dequal';
 import {
 	headers as headerUtils,
 	getPath,
@@ -24,7 +24,7 @@ const stringMatchers = {
 		),
 	glob: (targetString) => {
 		const urlRX = glob(targetString);
-		return debuggableUrlFunc((url) => urlRX.test(url));
+		return debuggableUrlFunc((url) => urlRX.regex.test(url));
 	},
 	express: (targetString) => {
 		const urlRX = pathToRegexp(targetString);