@shopgate/pwa-common 6.23.1 → 6.23.2

package/actions/router/historyReplace.js

@@ -1,5 +1,15 @@
 function _extends(){_extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};return _extends.apply(this,arguments);}import{ACTION_REPLACE}from'@virtuous/conductor';import{navigate}from"../../action-creators/router";import{mutable}from"../../helpers/redux";/**
  * @mixes {MutableFunction}
  * @param {Object} params The history params.
+ * @param {Object} [options={}] Additional options for the action
+ * @param {boolean} [options.remountRoute=true] When set to "true", the target route will be forced
+ * to remount.
  * @return {Function} The dispatched action.
- */export var historyReplace=mutable(function(params){return function(dispatch){dispatch(navigate(_extends({},params,{action:ACTION_REPLACE})));};});
+ */export var historyReplace=mutable(function(params){var options=arguments.length>1&&arguments[1]!==undefined?arguments[1]:{};return function(dispatch){dispatch(navigate(_extends({},params,(options===null||options===void 0?void 0:options.remountRoute)!==false&&{state:_extends({},params.state,{/**
+         * When a route is "replaced" the router doesn't assign a new route id to the old route
+         * stack entry. This can cause issues when a route is replaced by itself, since the content
+         * will not remount out of the box.
+         *
+         * When the "replaceRouteId" state prop is injected, the Route component performs logic
+         * to enforce re-remounting routes which where replaced by itself.
+         */replaceRouteId:Math.random().toString(36).substring(2,7)})},{action:ACTION_REPLACE})));};});

package/components/Link/connector.js

@@ -1 +1 @@
-import{connect}from'react-redux';import{historyPush as _historyPush,historyReplace as _historyReplace}from"../../actions/router";var mapDispatchToProps={historyPush:function historyPush(params){return _historyPush(params);},historyReplace:function historyReplace(params){return _historyReplace(params);}};export default connect(null,mapDispatchToProps);
+import{connect}from'react-redux';import{historyPush,historyReplace}from"../../actions/router";var mapDispatchToProps={historyPush:historyPush,historyReplace:historyReplace};export default connect(null,mapDispatchToProps);

package/components/Route/index.js

@@ -9,4 +9,11 @@ function _typeof(obj){"@babel/helpers - typeof";return _typeof="function"==typeo
    */},{key:"render",value:function render(){var _this2=this;var _this$props=this.props,cache=_this$props.cache,Component=_this$props.component,pattern=_this$props.pattern;var matches=[];// If the current pattern does not match the whitelist but matches the current route
 // then add the current route as the only match.
 if(!cache&&pattern===this.currentRoute.pattern){matches=[[this.currentRoute.id,this.currentRoute]];}else if(cache){var subset=this.context.slice(0,router.routeIndex+1);// Find matching patterns.
-matches=subset.filter(function(_ref){var _ref2=_slicedToArray(_ref,2),route=_ref2[1];return route.pattern===pattern;});}if(!matches.length){return null;}return matches.map(function(_ref3){var _ref4=_slicedToArray(_ref3,2),route=_ref4[1];var setPattern=route.setPattern,context=_objectWithoutProperties(route,_excluded);context.open=true;context.visible=route.id===_this2.currentRoute.id;return/*#__PURE__*/React.createElement(ErrorBoundary,{key:"error.".concat(route.id)},/*#__PURE__*/React.createElement(RouteContext.Provider,{key:route.id,value:context},/*#__PURE__*/React.createElement(Suspense,{fallback:/*#__PURE__*/React.createElement(Loading,null)},/*#__PURE__*/React.createElement(Component,null))));});}}]);return Route;}(React.Component);_defineProperty(Route,"contextType",RouterContext);_defineProperty(Route,"defaultProps",{cache:false,transform:null});export default Route;
+matches=subset.filter(function(_ref){var _ref2=_slicedToArray(_ref,2),route=_ref2[1];return route.pattern===pattern;});}if(!matches.length){return null;}return matches.map(function(_ref3){var _context$state;var _ref4=_slicedToArray(_ref3,2),route=_ref4[1];var setPattern=route.setPattern,context=_objectWithoutProperties(route,_excluded);context.open=true;context.visible=route.id===_this2.currentRoute.id;/**
+       * When a route is "replaced" the router doesn't assign a new route id to the old route
+       * stack entry. This can cause issues when a route is replaced by itself, since the content
+       * will not remount out of the box.
+       *
+       * The "replaceRouteId" state prop is injected by the "historyReplace" action. It's used
+       * to enforce re-remounting routes which where replaced by itself.
+       */var replaceRouteId=(context===null||context===void 0?void 0:(_context$state=context.state)===null||_context$state===void 0?void 0:_context$state.replaceRouteId)||'';return/*#__PURE__*/React.createElement(ErrorBoundary,{key:"error.".concat(route.id,"_").concat(replaceRouteId)},/*#__PURE__*/React.createElement(RouteContext.Provider,{key:"".concat(route.id,"_").concat(replaceRouteId),value:context},/*#__PURE__*/React.createElement(Suspense,{fallback:/*#__PURE__*/React.createElement(Loading,null)},/*#__PURE__*/React.createElement(Component,null))));});}}]);return Route;}(React.Component);_defineProperty(Route,"contextType",RouterContext);_defineProperty(Route,"defaultProps",{cache:false,transform:null});export default Route;

package/helpers/redux/mutable.js

@@ -22,8 +22,9 @@ import noop from'lodash/noop';import{isObject}from"../validation";/**
  * @type {{next: Function, stop: Function, skipRest: Function}}
  */export var mutableActions={next:next,skipRest:skipRest,stop:stop};/**
  * Takes a function and makes it mutable.
- * @param {Function} func Original function to convert to a mutable
- * @returns {Function}
+ * @template {Function} T
+ * @param {T} func Original function to convert to a mutable
+ * @returns {T}
  */export var mutable=function mutable(func){var original=func;var current=func;var steps=[];/**
    * Takes the pre-processing steps and calls all step functions, as well as the mutable function
    * afterwards. Each step can transform the arguments, that are passed in to the next step in the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopgate/pwa-common",
-  "version": "6.23.1",
+  "version": "6.23.2",
   "description": "Common library for the Shopgate Connect PWA.",
   "license": "Apache-2.0",
   "author": "Shopgate <support@shopgate.com>",
@@ -16,7 +16,7 @@
   ],
   "dependencies": {
     "@sentry/browser": "^4.6.3",
-    "@shopgate/pwa-benchmark": "6.23.1",
+    "@shopgate/pwa-benchmark": "6.23.2",
     "@virtuous/conductor": "~2.4.0",
     "@virtuous/react-conductor": "~2.4.0",
     "@virtuous/redux-persister": "1.1.0-beta.7",
@@ -44,7 +44,7 @@
     "url-search-params": "^0.10.0"
   },
   "devDependencies": {
-    "@shopgate/pwa-core": "6.23.1",
+    "@shopgate/pwa-core": "6.23.2",
     "lodash": "^4.17.4",
     "prop-types": "~15.7.2",
     "react": "~16.12.0",