goblin-laboratory 4.11.1 → 4.11.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goblin-laboratory",
-  "version": "4.11.1",
+  "version": "4.11.3",
   "description": "Laboratory",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -37,19 +37,18 @@
   },
   "devDependencies": {
     "aphrodite": "^2.2.2",
-    "connected-react-router": "^6.3.2",
     "css-key": "^1.0.0",
     "@fortawesome/react-fontawesome": "^0.1.9",
     "history": "^4.6.1",
     "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/renderer.js

@@ -1,20 +1,14 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import Root from 'goblin-laboratory/widgets/root';
-import {createHashHistory} from 'history';
-import {push} from 'connected-react-router/immutable';
 import configureStore from 'goblin-laboratory/widgets/store/store';
 
 class Renderer {
   constructor(send, options = {}) {
     this.send = send;
-    this.push = push;
     this.options = options;
 
     this.history = undefined;
-    if (this.options.useRouter !== false) {
-      this.history = createHashHistory();
-    }
 
     this._store = configureStore(
       window.__INITIAL_STATE__,
@@ -69,12 +63,7 @@ class Renderer {
       render = ReactDOM.hydrate;
     }
     render(
-      <Root
-        store={this.store}
-        labId={labId}
-        useRouter={this.options.useRouter !== false}
-        history={this.history}
-      />,
+      <Root store={this.store} labId={labId} history={this.history} />,
       rootElement
     );
   }

package/widgets/root/index.js

@@ -4,11 +4,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import {Provider} from 'react-redux';
-import {ConnectedRouter} from 'connected-react-router/immutable';
 import Laboratory from '../laboratory/widget';
-import {withRoute} from '../with-route/with-route.js';
-
-const LabWithRoute = withRoute('/')(Laboratory);
 
 class Root extends React.PureComponent {
   getChildContext() {
@@ -27,23 +23,11 @@ class Root extends React.PureComponent {
     };
   }
 
-  renderLabWithRouter() {
-    const {history, labId} = this.props;
-    return (
-      <ConnectedRouter history={history}>
-        <LabWithRoute id={labId} />
-      </ConnectedRouter>
-    );
-  }
-
   renderLab() {
     return <Laboratory id={this.props.labId} />;
   }
 
   renderContent() {
-    if (this.props.useRouter) {
-      return this.renderLabWithRouter();
-    }
     return this.renderLab();
   }
 

package/widgets/store/store.js

@@ -1,16 +1,13 @@
 import {applyMiddleware, compose, createStore} from 'redux';
-import {routerMiddleware} from 'connected-react-router/immutable';
 import thunk from 'redux-thunk';
 import middlewares from './middlewares';
 
-const rootReducer = require('goblin-laboratory/widgets/store/root-reducer')
-  .default;
+const rootReducer =
+  require('goblin-laboratory/widgets/store/root-reducer').default;
 
 export default function configureStore(initialState, history, send) {
-  const {transitMiddleware, formMiddleware, questMiddleware} = middlewares(
-    send
-  );
-  const routerHistory = routerMiddleware(history);
+  const {transitMiddleware, formMiddleware, questMiddleware} =
+    middlewares(send);
 
   const composeEnhancers =
     (process.env.NODE_ENV === 'development' &&
@@ -19,20 +16,14 @@ export default function configureStore(initialState, history, send) {
 
   const finalCreateStore = composeEnhancers(
     // Middleware you want to use in development:
-    applyMiddleware(
-      thunk,
-      routerHistory,
-      transitMiddleware,
-      questMiddleware,
-      formMiddleware
-    )
+    applyMiddleware(thunk, transitMiddleware, questMiddleware, formMiddleware)
   )(createStore);
 
   const store = finalCreateStore(rootReducer, initialState);
   if (module.hot) {
     module.hot.accept('goblin-laboratory/widgets/store/root-reducer', () => {
-      const nextRootReducer = require('goblin-laboratory/widgets/store/root-reducer')
-        .default;
+      const nextRootReducer =
+        require('goblin-laboratory/widgets/store/root-reducer').default;
       store.replaceReducer(nextRootReducer);
     });
   }

package/widgets/widget/index.js

@@ -2,7 +2,6 @@ import React from 'react';
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import Shredder from 'xcraft-core-shredder';
-import {push} from 'connected-react-router/immutable';
 import {flushToStyleTag} from 'aphrodite/no-important';
 import importer from 'goblin_importer';
 import shallowEqualShredder from './utils/shallowEqualShredder';
@@ -430,12 +429,8 @@ class Widget extends React.Component {
     this.context.store.dispatch(action);
   }
 
-  nav(route, frontOnly) {
-    if (frontOnly) {
-      this.context.dispatch(push(route));
-    } else {
-      this.doFor(this.context.labId, 'nav', {route});
-    }
+  nav(route) {
+    this.doFor(this.context.labId, 'nav', {route});
   }
 
   setBackendValue(path, value) {

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(