goblin-laboratory 4.11.2 → 4.11.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goblin-laboratory",
-  "version": "4.11.2",
+  "version": "4.11.3",
   "description": "Laboratory",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -43,12 +43,12 @@
     "immutable": "4.0.0-rc.14",
     "linked-list": "^1.0.4",
     "obj-to-css": "^1.0.1",
+    "path-to-regexp": "^1.9.0",
     "prettier": "2.0.4",
     "prop-types": "^15.5.10",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-redux": "^8.1.3",
-    "react-router": "^5.0.0",
     "redux-thunk": "^2.3.0",
     "safe-stable-stringify": "^2.5.0",
     "xcraft-core-shredder": "^5.3.0",

package/widgets/with-route/matchPath.js

@@ -0,0 +1,67 @@
+import pathToRegexp from 'path-to-regexp';
+
+const cache = {};
+const cacheLimit = 10000;
+let cacheCount = 0;
+
+function compilePath(path, options) {
+  const cacheKey = `${options.end}${options.strict}${options.sensitive}`;
+  const pathCache = cache[cacheKey] || (cache[cacheKey] = {});
+
+  if (pathCache[path]) return pathCache[path];
+
+  const keys = [];
+  const regexp = pathToRegexp(path, keys, options);
+  const result = {regexp, keys};
+
+  if (cacheCount < cacheLimit) {
+    pathCache[path] = result;
+    cacheCount++;
+  }
+
+  return result;
+}
+
+/**
+ * Public API for matching a URL pathname to a path.
+ */
+function matchPath(pathname, options = {}) {
+  if (typeof options === 'string' || Array.isArray(options)) {
+    options = {path: options};
+  }
+
+  const {path, exact = false, strict = false, sensitive = false} = options;
+
+  const paths = [].concat(path);
+
+  return paths.reduce((matched, path) => {
+    if (!path && path !== '') return null;
+    if (matched) return matched;
+
+    const {regexp, keys} = compilePath(path, {
+      end: exact,
+      strict,
+      sensitive,
+    });
+    const match = regexp.exec(pathname);
+
+    if (!match) return null;
+
+    const [url, ...values] = match;
+    const isExact = pathname === url;
+
+    if (exact && !isExact) return null;
+
+    return {
+      path, // the path used to match
+      url: path === '/' && url === '' ? '/' : url, // the matched portion of the URL
+      isExact, // whether or not we matched exactly
+      params: keys.reduce((memo, key, index) => {
+        memo[key.name] = values[index];
+        return memo;
+      }, {}),
+    };
+  }, null);
+}
+
+export default matchPath;

package/widgets/with-route/with-route.js

@@ -1,8 +1,8 @@
 import {connect} from 'react-redux';
 import Shredder from 'xcraft-core-shredder';
-import {matchPath} from 'react-router';
 import {getParameter} from '../../lib/helpers.js';
 import shallowEqualShredder from '../widget/utils/shallowEqualShredder.js';
+import matchPath from './matchPath.js';
 
 export function withRoute(path, watchedParams, watchedSearchs, watchHash) {
   return connect(