react-redux - npm Package Compare versions

Comparing version 5.0.0-rc.1 to 5.0.0-rc.2

dist/redux.js

@@ -156,3 +156,2 @@ (function webpackUniversalModuleDefinition(root, factory) {
 
-	var defaultReact15CompatibilityMode = true;
 	var hotReloadingVersion = 0;
@@ -184,4 +183,2 @@ function connectAdvanced(
 	      methodName = _ref$methodName === undefined ? 'connectAdvanced' : _ref$methodName,
-	      _ref$react15Compatibi = _ref.react15CompatibilityMode,
-	      react15CompatibilityMode = _ref$react15Compatibi === undefined ? undefined : _ref$react15Compatibi,
 	      _ref$renderCountProp = _ref.renderCountProp,
@@ -195,3 +192,3 @@ renderCountProp = _ref$renderCountProp === undefined ? undefined : _ref$renderCountProp,
 	      withRef = _ref$withRef === undefined ? false : _ref$withRef,
-	      connectOptions = _objectWithoutProperties(_ref, ['getDisplayName', 'methodName', 'react15CompatibilityMode', 'renderCountProp', 'shouldHandleStateChanges', 'storeKey', 'withRef']);
+	      connectOptions = _objectWithoutProperties(_ref, ['getDisplayName', 'methodName', 'renderCountProp', 'shouldHandleStateChanges', 'storeKey', 'withRef']);
 
@@ -201,3 +198,3 @@ var subscriptionKey = storeKey + 'Subscription';
 
-	  var contextTypes = (_contextTypes = {}, _contextTypes[storeKey] = _storeShape2.default, _contextTypes[subscriptionKey] = _react.PropTypes.instanceOf(_Subscription2.default), _contextTypes.react15CompatibilityMode = _react.PropTypes.bool, _contextTypes);
+	  var contextTypes = (_contextTypes = {}, _contextTypes[storeKey] = _storeShape2.default, _contextTypes[subscriptionKey] = _react.PropTypes.instanceOf(_Subscription2.default), _contextTypes);
 	  var childContextTypes = (_childContextTypes = {}, _childContextTypes[subscriptionKey] = _react.PropTypes.instanceOf(_Subscription2.default), _childContextTypes);
@@ -236,12 +233,4 @@
 	        _this.store = _this.props[storeKey] || _this.context[storeKey];
+	        _this.parentSub = props[subscriptionKey] || context[subscriptionKey];
 
-	        // react15CompatibilityMode controls whether the subscription system is used. This is for
-	        // https://github.com/reactjs/react-redux/issues/525 and should be removed completely when
-	        // react-redux's dependency on react is bumped to mimimum v16, which is expected to include
-	        // PR https://github.com/facebook/react/pull/8204 which fixes the issue.
-	        var compatMode = [react15CompatibilityMode, props.react15CompatibilityMode, context.react15CompatibilityMode, defaultReact15CompatibilityMode].find(function (cm) {
-	          return cm !== undefined && cm !== null;
-	        });
-	        _this.parentSub = compatMode ? null : props[subscriptionKey] || context[subscriptionKey];
-
 	        _this.setWrappedInstance = _this.setWrappedInstance.bind(_this);
@@ -339,3 +328,2 @@
 	            var subscription = _this2.subscription = new _Subscription2.default(_this2.store, _this2.parentSub);
-	            var notifyNestedSubs = subscription.notifyNestedSubs.bind(subscription);
 	            var dummyState = {};
@@ -349,3 +337,8 @@
 	              } else {
-	                this.setState(dummyState, notifyNestedSubs);
+	                this.componentDidUpdate = function componentDidUpdate() {
+	                  this.componentDidUpdate = undefined;
+	                  subscription.notifyNestedSubs();
+	                };
+
+	                this.setState(dummyState);
 	              }
@@ -411,6 +404,2 @@ }.bind(_this2);
 
-	connectAdvanced.setDefaultReact15CompatibilityMode = function setDefaultReact15CompatibilityMode(compat) {
-	  defaultReact15CompatibilityMode = compat;
-	};
-
 /***/ },
@@ -765,5 +754,3 @@ /* 4 */
 
-	var connect = createConnect();
-	connect.setDefaultReact15CompatibilityMode = _connectAdvanced2.default.setDefaultReact15CompatibilityMode;
-	exports.default = connect;
+	exports.default = createConnect();
 
@@ -770,0 +757,0 @@ /***/ },

dist/redux.min.js

@@ -1,1 +0,1 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("react"),require("redux")):"function"==typeof define&&define.amd?define(["react","redux"],e):"object"==typeof exports?exports.ReactRedux=e(require("react"),require("redux")):t.ReactRedux=e(t.React,t.Redux)}(this,function(t,e){return function(t){function e(r){if(n[r])return n[r].exports;var o=n[r]={exports:{},id:r,loaded:!1};return t[r].call(o.exports,o,o.exports,e),o.loaded=!0,o.exports}var n={};return e.m=t,e.c=n,e.p="",e(0)}([function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}e.__esModule=!0,e.connect=e.connectAdvanced=e.Provider=void 0;var o=n(8),i=r(o),u=n(3),s=r(u),a=n(9),p=r(a);e.Provider=i.default,e.connectAdvanced=s.default,e.connect=p.default},function(t,e){"use strict";function n(t){"undefined"!=typeof console&&"function"==typeof console.error&&console.error(t);try{throw Error(t)}catch(t){}}e.__esModule=!0,e.default=n},function(e,n){e.exports=t},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function u(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function s(t,e){var n={};for(var r in t)e.indexOf(r)<0&&Object.prototype.hasOwnProperty.call(t,r)&&(n[r]=t[r]);return n}function a(t){var e,n,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},a=r.getDisplayName,c=void 0===a?function(t){return"ConnectAdvanced("+t+")"}:a,l=r.methodName,y=void 0===l?"connectAdvanced":l,b=r.react15CompatibilityMode,w=void 0===b?void 0:b,g=r.renderCountProp,M=void 0===g?void 0:g,S=r.shouldHandleStateChanges,T=void 0===S||S,_=r.storeKey,C=void 0===_?"store":_,x=r.withRef,j=void 0!==x&&x,E=s(r,["getDisplayName","methodName","react15CompatibilityMode","renderCountProp","shouldHandleStateChanges","storeKey","withRef"]),q=C+"Subscription",N=O++,R=(e={},e[C]=P.default,e[q]=h.PropTypes.instanceOf(v.default),e.react15CompatibilityMode=h.PropTypes.bool,e),D=(n={},n[q]=h.PropTypes.instanceOf(v.default),n);return function(e){(0,d.default)("function"==typeof e,"You must pass a component to the function returned by connect. Instead received "+e);var n=e.displayName||e.name||"Component",r=c(n),s=p({},E,{getDisplayName:c,methodName:y,renderCountProp:M,shouldHandleStateChanges:T,storeKey:C,withRef:j,displayName:r,wrappedComponentName:n,WrappedComponent:e}),a=function(n){function a(t,e){o(this,a);var u=i(this,n.call(this,t,e));u.version=N,u.state={},u.renderCount=0,u.store=u.props[C]||u.context[C];var s=[w,t.react15CompatibilityMode,e.react15CompatibilityMode,m].find(function(t){return void 0!==t&&null!==t});return u.parentSub=s?null:t[q]||e[q],u.setWrappedInstance=u.setWrappedInstance.bind(u),(0,d.default)(u.store,'Could not find "'+C+'" in either the context or '+('props of "'+r+'". ')+"Either wrap the root component in a <Provider>, "+('or explicitly pass "'+C+'" as a prop to "'+r+'".')),u.getState=u.store.getState.bind(u.store),u.initSelector(),u.initSubscription(),u}return u(a,n),a.prototype.getChildContext=function(){var t;return t={},t[q]=this.subscription,t},a.prototype.componentDidMount=function(){T&&(this.subscription.trySubscribe(),this.selector.run(this.props),this.selector.shouldComponentUpdate&&this.forceUpdate())},a.prototype.componentWillReceiveProps=function(t){this.selector.run(t)},a.prototype.shouldComponentUpdate=function(){return this.selector.shouldComponentUpdate},a.prototype.componentWillUnmount=function(){this.subscription&&this.subscription.tryUnsubscribe(),this.subscription=null,this.store=null,this.parentSub=null,this.selector.run=function(){}},a.prototype.getWrappedInstance=function(){return(0,d.default)(j,"To access the wrapped instance, you need to specify "+("{ withRef: true } in the options argument of the "+y+"() call.")),this.wrappedInstance},a.prototype.setWrappedInstance=function(t){this.wrappedInstance=t},a.prototype.initSelector=function(){var e=this.store.dispatch,n=this.getState,r=t(e,s),o=this.selector={shouldComponentUpdate:!0,props:r(n(),this.props),run:function(t){try{var e=r(n(),t);(o.error||e!==o.props)&&(o.shouldComponentUpdate=!0,o.props=e,o.error=null)}catch(t){o.shouldComponentUpdate=!0,o.error=t}}}},a.prototype.initSubscription=function(){var t=this;T&&!function(){var e=t.subscription=new v.default(t.store,t.parentSub),n=e.notifyNestedSubs.bind(e),r={};e.onStateChange=function(){this.selector.run(this.props),this.selector.shouldComponentUpdate?this.setState(r,n):e.notifyNestedSubs()}.bind(t)}()},a.prototype.isSubscribed=function(){return!!this.subscription&&this.subscription.isSubscribed()},a.prototype.addExtraProps=function(t){if(!j&&!M)return t;var e=p({},t);return j&&(e.ref=this.setWrappedInstance),M&&(e[M]=this.renderCount++),e},a.prototype.render=function(){var t=this.selector;if(t.shouldComponentUpdate=!1,t.error)throw t.error;return(0,h.createElement)(e,this.addExtraProps(t.props))},a}(h.Component);return a.WrappedComponent=e,a.displayName=r,a.childContextTypes=D,a.contextTypes=R,a.propTypes=R,(0,f.default)(a,e)}}e.__esModule=!0;var p=Object.assign||function(t){for(var e=1;arguments.length>e;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t};e.default=a;var c=n(17),f=r(c),l=n(18),d=r(l),h=n(2),y=n(15),v=r(y),b=n(5),P=r(b),m=!0,O=0;a.setDefaultReact15CompatibilityMode=function(t){m=t}},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t){return function(e,n){function r(){return o}var o=t(e,n);return r.dependsOnOwnProps=!1,r}}function i(t){return null!==t.dependsOnOwnProps&&void 0!==t.dependsOnOwnProps?!!t.dependsOnOwnProps:1!==t.length}function u(t,e){return function(e,n){var r=function(t,e){return r.dependsOnOwnProps?r.mapToProps(t,e):r.mapToProps(t)};return r.dependsOnOwnProps=i(t),r.mapToProps=function(e,n){r.mapToProps=t;var o=r(e,n);return"function"==typeof o&&(r.mapToProps=o,r.dependsOnOwnProps=i(o),o=r(e,n)),o},r}}e.__esModule=!0,e.wrapMapToPropsConstant=o,e.getDependsOnOwnProps=i,e.wrapMapToPropsFunc=u;var s=n(6);r(s)},function(t,e,n){"use strict";e.__esModule=!0;var r=n(2);e.default=r.PropTypes.shape({subscribe:r.PropTypes.func.isRequired,dispatch:r.PropTypes.func.isRequired,getState:r.PropTypes.func.isRequired})},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){(0,u.default)(t)||(0,a.default)(n+"() in "+e+" must return a plain object. Instead received "+t+".")}e.__esModule=!0,e.default=o;var i=n(27),u=r(i),s=n(1),a=r(s)},function(t,e,n){var r=n(25),o=r.Symbol;t.exports=o},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function u(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}e.__esModule=!0,e.default=void 0;var s=n(2),a=n(5),p=r(a),c=n(1),f=(r(c),function(t){function e(n,r){o(this,e);var u=i(this,t.call(this,n,r));return u.store=n.store,u}return u(e,t),e.prototype.getChildContext=function(){return{store:this.store}},e.prototype.render=function(){return s.Children.only(this.props.children)},e}(s.Component));e.default=f,f.propTypes={store:p.default.isRequired,children:s.PropTypes.element.isRequired},f.childContextTypes={store:p.default.isRequired},f.displayName="Provider"},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){var n={};for(var r in t)e.indexOf(r)<0&&Object.prototype.hasOwnProperty.call(t,r)&&(n[r]=t[r]);return n}function i(t,e,n){for(var r=e.length-1;r>=0;r--){var o=e[r](t);if(o)return o}return function(e,r){throw Error("Invalid value of type "+typeof t+" for "+n+" argument when connecting component "+r.wrappedComponentName+".")}}function u(t,e){return t===e}function s(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},e=t.connectHOC,n=void 0===e?c.default:e,r=t.mapStateToPropsFactories,s=void 0===r?v.default:r,p=t.mapDispatchToPropsFactories,f=void 0===p?h.default:p,d=t.mergePropsFactories,y=void 0===d?P.default:d,b=t.selectorFactory,m=void 0===b?O.default:b;return function(t,e,r){var p=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{},c=p.pure,d=void 0===c||c,h=p.areStatesEqual,v=void 0===h?u:h,b=p.areOwnPropsEqual,P=void 0===b?l.default:b,O=p.areStatePropsEqual,w=void 0===O?l.default:O,g=p.areMergedPropsEqual,M=void 0===g?l.default:g,S=o(p,["pure","areStatesEqual","areOwnPropsEqual","areStatePropsEqual","areMergedPropsEqual"]),T=i(t,s,"mapStateToProps"),_=i(e,f,"mapDispatchToProps"),C=i(r,y,"mergeProps");return n(m,a({methodName:"connect",getDisplayName:function(t){return"Connect("+t+")"},shouldHandleStateChanges:!!t,initMapStateToProps:T,initMapDispatchToProps:_,initMergeProps:C,pure:d,areStatesEqual:v,areOwnPropsEqual:P,areStatePropsEqual:w,areMergedPropsEqual:M},S))}}e.__esModule=!0;var a=Object.assign||function(t){for(var e=1;arguments.length>e;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t};e.createConnect=s;var p=n(3),c=r(p),f=n(16),l=r(f),d=n(10),h=r(d),y=n(11),v=r(y),b=n(12),P=r(b),m=n(13),O=r(m),w=s();w.setDefaultReact15CompatibilityMode=c.default.setDefaultReact15CompatibilityMode,e.default=w},function(t,e,n){"use strict";function r(t){return"function"==typeof t?(0,s.wrapMapToPropsFunc)(t,"mapDispatchToProps"):void 0}function o(t){return t?void 0:(0,s.wrapMapToPropsConstant)(function(t){return{dispatch:t}})}function i(t){return t&&"object"==typeof t?(0,s.wrapMapToPropsConstant)(function(e){return(0,u.bindActionCreators)(t,e)}):void 0}e.__esModule=!0,e.whenMapDispatchToPropsIsFunction=r,e.whenMapDispatchToPropsIsMissing=o,e.whenMapDispatchToPropsIsObject=i;var u=n(28),s=n(4);e.default=[r,o,i]},function(t,e,n){"use strict";function r(t){return"function"==typeof t?(0,i.wrapMapToPropsFunc)(t,"mapStateToProps"):void 0}function o(t){return t?void 0:(0,i.wrapMapToPropsConstant)(function(){return{}})}e.__esModule=!0,e.whenMapStateToPropsIsFunction=r,e.whenMapStateToPropsIsMissing=o;var i=n(4);e.default=[r,o]},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){return a({},n,t,e)}function i(t){return function(e,n){var r=n.pure,o=n.areMergedPropsEqual,i=!1,u=void 0;return function(e,n,s){var a=t(e,n,s);return i?r&&o(a,u)||(u=a):(i=!0,u=a),u}}}function u(t){return"function"==typeof t?i(t):void 0}function s(t){return t?void 0:function(){return o}}e.__esModule=!0;var a=Object.assign||function(t){for(var e=1;arguments.length>e;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t};e.defaultMergeProps=o,e.wrapMergePropsFunc=i,e.whenMergePropsIsFunction=u,e.whenMergePropsIsOmitted=s;var p=n(6);r(p);e.default=[u,s]},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){var n={};for(var r in t)e.indexOf(r)<0&&Object.prototype.hasOwnProperty.call(t,r)&&(n[r]=t[r]);return n}function i(t,e,n,r){return function(o,i){return n(t(o,i),e(r,i),i)}}function u(t,e,n,r,o){function i(o,i){return h=o,y=i,v=t(h,y),b=e(r,y),P=n(v,b,y),d=!0,P}function u(){return v=t(h,y),e.dependsOnOwnProps&&(b=e(r,y)),P=n(v,b,y)}function s(){return t.dependsOnOwnProps&&(v=t(h,y)),e.dependsOnOwnProps&&(b=e(r,y)),P=n(v,b,y)}function a(){var e=t(h,y),r=!l(e,v);return v=e,r&&(P=n(v,b,y)),P}function p(t,e){var n=!f(e,y),r=!c(t,h);return h=t,y=e,n&&r?u():n?s():r?a():P}var c=o.areStatesEqual,f=o.areOwnPropsEqual,l=o.areStatePropsEqual,d=!1,h=void 0,y=void 0,v=void 0,b=void 0,P=void 0;return function(t,e){return d?p(t,e):i(t,e)}}function s(t,e){var n=e.initMapStateToProps,r=e.initMapDispatchToProps,s=e.initMergeProps,a=o(e,["initMapStateToProps","initMapDispatchToProps","initMergeProps"]),p=n(t,a),c=r(t,a),f=s(t,a),l=a.pure?u:i;return l(p,c,f,t,a)}e.__esModule=!0,e.impureFinalPropsSelectorFactory=i,e.pureFinalPropsSelectorFactory=u,e.default=s;var a=n(14);r(a)},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){if(!t)throw Error("Unexpected value for "+e+" in "+n+".");"mapStateToProps"!==e&&"mapDispatchToProps"!==e||t.hasOwnProperty("dependsOnOwnProps")||(0,s.default)("The selector for "+e+" of "+n+" did not specify a value for dependsOnOwnProps.")}function i(t,e,n,r){o(t,"mapStateToProps",r),o(e,"mapDispatchToProps",r),o(n,"mergeProps",r)}e.__esModule=!0,e.default=i;var u=n(1),s=r(u)},function(t,e){"use strict";function n(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function r(){var t=[],e=[];return{clear:function(){e=o,t=o},notify:function(){for(var n=t=e,r=0;n.length>r;r++)n[r]()},subscribe:function(n){var r=!0;return e===t&&(e=t.slice()),e.push(n),function(){r&&t!==o&&(r=!1,e===t&&(e=t.slice()),e.splice(e.indexOf(n),1))}}}}e.__esModule=!0;var o=null,i=function(){function t(e,o){n(this,t),this.subscribe=o?o.addNestedSub.bind(o):e.subscribe.bind(e),this.unsubscribe=null,this.listeners=r()}return t.prototype.addNestedSub=function(t){return this.trySubscribe(),this.listeners.subscribe(t)},t.prototype.notifyNestedSubs=function(){this.listeners.notify()},t.prototype.isSubscribed=function(){return!!this.unsubscribe},t.prototype.trySubscribe=function(){this.unsubscribe||(this.unsubscribe=this.subscribe(this.onStateChange))},t.prototype.tryUnsubscribe=function(){this.unsubscribe&&(this.unsubscribe(),this.listeners.clear()),this.unsubscribe=null,this.subscribe=null,this.listeners={notify:function(){}}},t}();e.default=i},function(t,e){"use strict";function n(t,e){if(t===e)return!0;var n=0,o=0;for(var i in t){if(r.call(t,i)&&t[i]!==e[i])return!1;n++}for(var u in e)r.call(e,u)&&o++;return n===o}e.__esModule=!0,e.default=n;var r=Object.prototype.hasOwnProperty},function(t,e){"use strict";var n={childContextTypes:!0,contextTypes:!0,defaultProps:!0,displayName:!0,getDefaultProps:!0,mixins:!0,propTypes:!0,type:!0},r={name:!0,length:!0,prototype:!0,caller:!0,arguments:!0,arity:!0},o="function"==typeof Object.getOwnPropertySymbols;t.exports=function(t,e,i){if("string"!=typeof e){var u=Object.getOwnPropertyNames(e);o&&(u=u.concat(Object.getOwnPropertySymbols(e)));for(var s=0;u.length>s;++s)if(!(n[u[s]]||r[u[s]]||i&&i[u[s]]))try{t[u[s]]=e[u[s]]}catch(t){}}return t}},function(t,e,n){"use strict";var r=function(t,e,n,r,o,i,u,s){if(!t){var a;if(void 0===e)a=Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var p=[n,r,o,i,u,s],c=0;a=Error(e.replace(/%s/g,function(){return p[c++]})),a.name="Invariant Violation"}throw a.framesToPop=1,a}};t.exports=r},function(t,e,n){function r(t){return null==t?void 0===t?a:s:(t=Object(t),p&&p in t?i(t):u(t))}var o=n(7),i=n(22),u=n(23),s="[object Null]",a="[object Undefined]",p=o?o.toStringTag:void 0;t.exports=r},function(t,e){(function(e){var n="object"==typeof e&&e&&e.Object===Object&&e;t.exports=n}).call(e,function(){return this}()||Function("return this")())},function(t,e,n){var r=n(24),o=r(Object.getPrototypeOf,Object);t.exports=o},function(t,e,n){function r(t){var e=u.call(t,a),n=t[a];try{t[a]=void 0;var r=!0}catch(t){}var o=s.call(t);return r&&(e?t[a]=n:delete t[a]),o}var o=n(7),i=Object.prototype,u=i.hasOwnProperty,s=i.toString,a=o?o.toStringTag:void 0;t.exports=r},function(t,e){function n(t){return o.call(t)}var r=Object.prototype,o=r.toString;t.exports=n},function(t,e){function n(t,e){return function(n){return t(e(n))}}t.exports=n},function(t,e,n){var r=n(20),o="object"==typeof self&&self&&self.Object===Object&&self,i=r||o||Function("return this")();t.exports=i},function(t,e){function n(t){return null!=t&&"object"==typeof t}t.exports=n},function(t,e,n){function r(t){if(!u(t)||o(t)!=s)return!1;var e=i(t);if(null===e)return!0;var n=f.call(e,"constructor")&&e.constructor;return"function"==typeof n&&n instanceof n&&c.call(n)==l}var o=n(19),i=n(21),u=n(26),s="[object Object]",a=Function.prototype,p=Object.prototype,c=a.toString,f=p.hasOwnProperty,l=c.call(Object);t.exports=r},function(t,n){t.exports=e}])});
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("react"),require("redux")):"function"==typeof define&&define.amd?define(["react","redux"],e):"object"==typeof exports?exports.ReactRedux=e(require("react"),require("redux")):t.ReactRedux=e(t.React,t.Redux)}(this,function(t,e){return function(t){function e(r){if(n[r])return n[r].exports;var o=n[r]={exports:{},id:r,loaded:!1};return t[r].call(o.exports,o,o.exports,e),o.loaded=!0,o.exports}var n={};return e.m=t,e.c=n,e.p="",e(0)}([function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}e.__esModule=!0,e.connect=e.connectAdvanced=e.Provider=void 0;var o=n(8),i=r(o),s=n(3),u=r(s),a=n(9),p=r(a);e.Provider=i.default,e.connectAdvanced=u.default,e.connect=p.default},function(t,e){"use strict";function n(t){"undefined"!=typeof console&&"function"==typeof console.error&&console.error(t);try{throw Error(t)}catch(t){}}e.__esModule=!0,e.default=n},function(e,n){e.exports=t},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function s(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function u(t,e){var n={};for(var r in t)e.indexOf(r)<0&&Object.prototype.hasOwnProperty.call(t,r)&&(n[r]=t[r]);return n}function a(t){var e,n,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},a=r.getDisplayName,c=void 0===a?function(t){return"ConnectAdvanced("+t+")"}:a,d=r.methodName,v=void 0===d?"connectAdvanced":d,b=r.renderCountProp,O=void 0===b?void 0:b,w=r.shouldHandleStateChanges,g=void 0===w||w,S=r.storeKey,T=void 0===S?"store":S,M=r.withRef,_=void 0!==M&&M,x=u(r,["getDisplayName","methodName","renderCountProp","shouldHandleStateChanges","storeKey","withRef"]),C=T+"Subscription",j=m++,E=(e={},e[T]=P.default,e[C]=h.PropTypes.instanceOf(y.default),e),q=(n={},n[C]=h.PropTypes.instanceOf(y.default),n);return function(e){(0,l.default)("function"==typeof e,"You must pass a component to the function returned by connect. Instead received "+e);var n=e.displayName||e.name||"Component",r=c(n),u=p({},x,{getDisplayName:c,methodName:v,renderCountProp:O,shouldHandleStateChanges:g,storeKey:T,withRef:_,displayName:r,wrappedComponentName:n,WrappedComponent:e}),a=function(n){function a(t,e){o(this,a);var s=i(this,n.call(this,t,e));return s.version=j,s.state={},s.renderCount=0,s.store=s.props[T]||s.context[T],s.parentSub=t[C]||e[C],s.setWrappedInstance=s.setWrappedInstance.bind(s),(0,l.default)(s.store,'Could not find "'+T+'" in either the context or '+('props of "'+r+'". ')+"Either wrap the root component in a <Provider>, "+('or explicitly pass "'+T+'" as a prop to "'+r+'".')),s.getState=s.store.getState.bind(s.store),s.initSelector(),s.initSubscription(),s}return s(a,n),a.prototype.getChildContext=function(){var t;return t={},t[C]=this.subscription,t},a.prototype.componentDidMount=function(){g&&(this.subscription.trySubscribe(),this.selector.run(this.props),this.selector.shouldComponentUpdate&&this.forceUpdate())},a.prototype.componentWillReceiveProps=function(t){this.selector.run(t)},a.prototype.shouldComponentUpdate=function(){return this.selector.shouldComponentUpdate},a.prototype.componentWillUnmount=function(){this.subscription&&this.subscription.tryUnsubscribe(),this.subscription=null,this.store=null,this.parentSub=null,this.selector.run=function(){}},a.prototype.getWrappedInstance=function(){return(0,l.default)(_,"To access the wrapped instance, you need to specify "+("{ withRef: true } in the options argument of the "+v+"() call.")),this.wrappedInstance},a.prototype.setWrappedInstance=function(t){this.wrappedInstance=t},a.prototype.initSelector=function(){var e=this.store.dispatch,n=this.getState,r=t(e,u),o=this.selector={shouldComponentUpdate:!0,props:r(n(),this.props),run:function(t){try{var e=r(n(),t);(o.error||e!==o.props)&&(o.shouldComponentUpdate=!0,o.props=e,o.error=null)}catch(t){o.shouldComponentUpdate=!0,o.error=t}}}},a.prototype.initSubscription=function(){var t=this;g&&!function(){var e=t.subscription=new y.default(t.store,t.parentSub),n={};e.onStateChange=function(){this.selector.run(this.props),this.selector.shouldComponentUpdate?(this.componentDidUpdate=function(){this.componentDidUpdate=void 0,e.notifyNestedSubs()},this.setState(n)):e.notifyNestedSubs()}.bind(t)}()},a.prototype.isSubscribed=function(){return!!this.subscription&&this.subscription.isSubscribed()},a.prototype.addExtraProps=function(t){if(!_&&!O)return t;var e=p({},t);return _&&(e.ref=this.setWrappedInstance),O&&(e[O]=this.renderCount++),e},a.prototype.render=function(){var t=this.selector;if(t.shouldComponentUpdate=!1,t.error)throw t.error;return(0,h.createElement)(e,this.addExtraProps(t.props))},a}(h.Component);return a.WrappedComponent=e,a.displayName=r,a.childContextTypes=q,a.contextTypes=E,a.propTypes=E,(0,f.default)(a,e)}}e.__esModule=!0;var p=Object.assign||function(t){for(var e=1;arguments.length>e;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t};e.default=a;var c=n(17),f=r(c),d=n(18),l=r(d),h=n(2),v=n(15),y=r(v),b=n(5),P=r(b),m=0},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t){return function(e,n){function r(){return o}var o=t(e,n);return r.dependsOnOwnProps=!1,r}}function i(t){return null!==t.dependsOnOwnProps&&void 0!==t.dependsOnOwnProps?!!t.dependsOnOwnProps:1!==t.length}function s(t,e){return function(e,n){var r=function(t,e){return r.dependsOnOwnProps?r.mapToProps(t,e):r.mapToProps(t)};return r.dependsOnOwnProps=i(t),r.mapToProps=function(e,n){r.mapToProps=t;var o=r(e,n);return"function"==typeof o&&(r.mapToProps=o,r.dependsOnOwnProps=i(o),o=r(e,n)),o},r}}e.__esModule=!0,e.wrapMapToPropsConstant=o,e.getDependsOnOwnProps=i,e.wrapMapToPropsFunc=s;var u=n(6);r(u)},function(t,e,n){"use strict";e.__esModule=!0;var r=n(2);e.default=r.PropTypes.shape({subscribe:r.PropTypes.func.isRequired,dispatch:r.PropTypes.func.isRequired,getState:r.PropTypes.func.isRequired})},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){(0,s.default)(t)||(0,a.default)(n+"() in "+e+" must return a plain object. Instead received "+t+".")}e.__esModule=!0,e.default=o;var i=n(27),s=r(i),u=n(1),a=r(u)},function(t,e,n){var r=n(25),o=r.Symbol;t.exports=o},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function s(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}e.__esModule=!0,e.default=void 0;var u=n(2),a=n(5),p=r(a),c=n(1),f=(r(c),function(t){function e(n,r){o(this,e);var s=i(this,t.call(this,n,r));return s.store=n.store,s}return s(e,t),e.prototype.getChildContext=function(){return{store:this.store}},e.prototype.render=function(){return u.Children.only(this.props.children)},e}(u.Component));e.default=f,f.propTypes={store:p.default.isRequired,children:u.PropTypes.element.isRequired},f.childContextTypes={store:p.default.isRequired},f.displayName="Provider"},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){var n={};for(var r in t)e.indexOf(r)<0&&Object.prototype.hasOwnProperty.call(t,r)&&(n[r]=t[r]);return n}function i(t,e,n){for(var r=e.length-1;r>=0;r--){var o=e[r](t);if(o)return o}return function(e,r){throw Error("Invalid value of type "+typeof t+" for "+n+" argument when connecting component "+r.wrappedComponentName+".")}}function s(t,e){return t===e}function u(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},e=t.connectHOC,n=void 0===e?c.default:e,r=t.mapStateToPropsFactories,u=void 0===r?y.default:r,p=t.mapDispatchToPropsFactories,f=void 0===p?h.default:p,l=t.mergePropsFactories,v=void 0===l?P.default:l,b=t.selectorFactory,m=void 0===b?O.default:b;return function(t,e,r){var p=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{},c=p.pure,l=void 0===c||c,h=p.areStatesEqual,y=void 0===h?s:h,b=p.areOwnPropsEqual,P=void 0===b?d.default:b,O=p.areStatePropsEqual,w=void 0===O?d.default:O,g=p.areMergedPropsEqual,S=void 0===g?d.default:g,T=o(p,["pure","areStatesEqual","areOwnPropsEqual","areStatePropsEqual","areMergedPropsEqual"]),M=i(t,u,"mapStateToProps"),_=i(e,f,"mapDispatchToProps"),x=i(r,v,"mergeProps");return n(m,a({methodName:"connect",getDisplayName:function(t){return"Connect("+t+")"},shouldHandleStateChanges:!!t,initMapStateToProps:M,initMapDispatchToProps:_,initMergeProps:x,pure:l,areStatesEqual:y,areOwnPropsEqual:P,areStatePropsEqual:w,areMergedPropsEqual:S},T))}}e.__esModule=!0;var a=Object.assign||function(t){for(var e=1;arguments.length>e;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t};e.createConnect=u;var p=n(3),c=r(p),f=n(16),d=r(f),l=n(10),h=r(l),v=n(11),y=r(v),b=n(12),P=r(b),m=n(13),O=r(m);e.default=u()},function(t,e,n){"use strict";function r(t){return"function"==typeof t?(0,u.wrapMapToPropsFunc)(t,"mapDispatchToProps"):void 0}function o(t){return t?void 0:(0,u.wrapMapToPropsConstant)(function(t){return{dispatch:t}})}function i(t){return t&&"object"==typeof t?(0,u.wrapMapToPropsConstant)(function(e){return(0,s.bindActionCreators)(t,e)}):void 0}e.__esModule=!0,e.whenMapDispatchToPropsIsFunction=r,e.whenMapDispatchToPropsIsMissing=o,e.whenMapDispatchToPropsIsObject=i;var s=n(28),u=n(4);e.default=[r,o,i]},function(t,e,n){"use strict";function r(t){return"function"==typeof t?(0,i.wrapMapToPropsFunc)(t,"mapStateToProps"):void 0}function o(t){return t?void 0:(0,i.wrapMapToPropsConstant)(function(){return{}})}e.__esModule=!0,e.whenMapStateToPropsIsFunction=r,e.whenMapStateToPropsIsMissing=o;var i=n(4);e.default=[r,o]},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){return a({},n,t,e)}function i(t){return function(e,n){var r=n.pure,o=n.areMergedPropsEqual,i=!1,s=void 0;return function(e,n,u){var a=t(e,n,u);return i?r&&o(a,s)||(s=a):(i=!0,s=a),s}}}function s(t){return"function"==typeof t?i(t):void 0}function u(t){return t?void 0:function(){return o}}e.__esModule=!0;var a=Object.assign||function(t){for(var e=1;arguments.length>e;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t};e.defaultMergeProps=o,e.wrapMergePropsFunc=i,e.whenMergePropsIsFunction=s,e.whenMergePropsIsOmitted=u;var p=n(6);r(p);e.default=[s,u]},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){var n={};for(var r in t)e.indexOf(r)<0&&Object.prototype.hasOwnProperty.call(t,r)&&(n[r]=t[r]);return n}function i(t,e,n,r){return function(o,i){return n(t(o,i),e(r,i),i)}}function s(t,e,n,r,o){function i(o,i){return h=o,v=i,y=t(h,v),b=e(r,v),P=n(y,b,v),l=!0,P}function s(){return y=t(h,v),e.dependsOnOwnProps&&(b=e(r,v)),P=n(y,b,v)}function u(){return t.dependsOnOwnProps&&(y=t(h,v)),e.dependsOnOwnProps&&(b=e(r,v)),P=n(y,b,v)}function a(){var e=t(h,v),r=!d(e,y);return y=e,r&&(P=n(y,b,v)),P}function p(t,e){var n=!f(e,v),r=!c(t,h);return h=t,v=e,n&&r?s():n?u():r?a():P}var c=o.areStatesEqual,f=o.areOwnPropsEqual,d=o.areStatePropsEqual,l=!1,h=void 0,v=void 0,y=void 0,b=void 0,P=void 0;return function(t,e){return l?p(t,e):i(t,e)}}function u(t,e){var n=e.initMapStateToProps,r=e.initMapDispatchToProps,u=e.initMergeProps,a=o(e,["initMapStateToProps","initMapDispatchToProps","initMergeProps"]),p=n(t,a),c=r(t,a),f=u(t,a),d=a.pure?s:i;return d(p,c,f,t,a)}e.__esModule=!0,e.impureFinalPropsSelectorFactory=i,e.pureFinalPropsSelectorFactory=s,e.default=u;var a=n(14);r(a)},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){if(!t)throw Error("Unexpected value for "+e+" in "+n+".");"mapStateToProps"!==e&&"mapDispatchToProps"!==e||t.hasOwnProperty("dependsOnOwnProps")||(0,u.default)("The selector for "+e+" of "+n+" did not specify a value for dependsOnOwnProps.")}function i(t,e,n,r){o(t,"mapStateToProps",r),o(e,"mapDispatchToProps",r),o(n,"mergeProps",r)}e.__esModule=!0,e.default=i;var s=n(1),u=r(s)},function(t,e){"use strict";function n(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function r(){var t=[],e=[];return{clear:function(){e=o,t=o},notify:function(){for(var n=t=e,r=0;n.length>r;r++)n[r]()},subscribe:function(n){var r=!0;return e===t&&(e=t.slice()),e.push(n),function(){r&&t!==o&&(r=!1,e===t&&(e=t.slice()),e.splice(e.indexOf(n),1))}}}}e.__esModule=!0;var o=null,i=function(){function t(e,o){n(this,t),this.subscribe=o?o.addNestedSub.bind(o):e.subscribe.bind(e),this.unsubscribe=null,this.listeners=r()}return t.prototype.addNestedSub=function(t){return this.trySubscribe(),this.listeners.subscribe(t)},t.prototype.notifyNestedSubs=function(){this.listeners.notify()},t.prototype.isSubscribed=function(){return!!this.unsubscribe},t.prototype.trySubscribe=function(){this.unsubscribe||(this.unsubscribe=this.subscribe(this.onStateChange))},t.prototype.tryUnsubscribe=function(){this.unsubscribe&&(this.unsubscribe(),this.listeners.clear()),this.unsubscribe=null,this.subscribe=null,this.listeners={notify:function(){}}},t}();e.default=i},function(t,e){"use strict";function n(t,e){if(t===e)return!0;var n=0,o=0;for(var i in t){if(r.call(t,i)&&t[i]!==e[i])return!1;n++}for(var s in e)r.call(e,s)&&o++;return n===o}e.__esModule=!0,e.default=n;var r=Object.prototype.hasOwnProperty},function(t,e){"use strict";var n={childContextTypes:!0,contextTypes:!0,defaultProps:!0,displayName:!0,getDefaultProps:!0,mixins:!0,propTypes:!0,type:!0},r={name:!0,length:!0,prototype:!0,caller:!0,arguments:!0,arity:!0},o="function"==typeof Object.getOwnPropertySymbols;t.exports=function(t,e,i){if("string"!=typeof e){var s=Object.getOwnPropertyNames(e);o&&(s=s.concat(Object.getOwnPropertySymbols(e)));for(var u=0;s.length>u;++u)if(!(n[s[u]]||r[s[u]]||i&&i[s[u]]))try{t[s[u]]=e[s[u]]}catch(t){}}return t}},function(t,e,n){"use strict";var r=function(t,e,n,r,o,i,s,u){if(!t){var a;if(void 0===e)a=Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var p=[n,r,o,i,s,u],c=0;a=Error(e.replace(/%s/g,function(){return p[c++]})),a.name="Invariant Violation"}throw a.framesToPop=1,a}};t.exports=r},function(t,e,n){function r(t){return null==t?void 0===t?a:u:(t=Object(t),p&&p in t?i(t):s(t))}var o=n(7),i=n(22),s=n(23),u="[object Null]",a="[object Undefined]",p=o?o.toStringTag:void 0;t.exports=r},function(t,e){(function(e){var n="object"==typeof e&&e&&e.Object===Object&&e;t.exports=n}).call(e,function(){return this}()||Function("return this")())},function(t,e,n){var r=n(24),o=r(Object.getPrototypeOf,Object);t.exports=o},function(t,e,n){function r(t){var e=s.call(t,a),n=t[a];try{t[a]=void 0;var r=!0}catch(t){}var o=u.call(t);return r&&(e?t[a]=n:delete t[a]),o}var o=n(7),i=Object.prototype,s=i.hasOwnProperty,u=i.toString,a=o?o.toStringTag:void 0;t.exports=r},function(t,e){function n(t){return o.call(t)}var r=Object.prototype,o=r.toString;t.exports=n},function(t,e){function n(t,e){return function(n){return t(e(n))}}t.exports=n},function(t,e,n){var r=n(20),o="object"==typeof self&&self&&self.Object===Object&&self,i=r||o||Function("return this")();t.exports=i},function(t,e){function n(t){return null!=t&&"object"==typeof t}t.exports=n},function(t,e,n){function r(t){if(!s(t)||o(t)!=u)return!1;var e=i(t);if(null===e)return!0;var n=f.call(e,"constructor")&&e.constructor;return"function"==typeof n&&n instanceof n&&c.call(n)==d}var o=n(19),i=n(21),s=n(26),u="[object Object]",a=Function.prototype,p=Object.prototype,c=a.toString,f=p.hasOwnProperty,d=c.call(Object);t.exports=r},function(t,n){t.exports=e}])});

es/components/connectAdvanced.js

@@ -18,3 +18,2 @@ var _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; };
 
-var defaultReact15CompatibilityMode = true;
 var hotReloadingVersion = 0;
@@ -46,4 +45,2 @@ export default function connectAdvanced(
       methodName = _ref$methodName === undefined ? 'connectAdvanced' : _ref$methodName,
-      _ref$react15Compatibi = _ref.react15CompatibilityMode,
-      react15CompatibilityMode = _ref$react15Compatibi === undefined ? undefined : _ref$react15Compatibi,
       _ref$renderCountProp = _ref.renderCountProp,
@@ -57,3 +54,3 @@ renderCountProp = _ref$renderCountProp === undefined ? undefined : _ref$renderCountProp,
       withRef = _ref$withRef === undefined ? false : _ref$withRef,
-      connectOptions = _objectWithoutProperties(_ref, ['getDisplayName', 'methodName', 'react15CompatibilityMode', 'renderCountProp', 'shouldHandleStateChanges', 'storeKey', 'withRef']);
+      connectOptions = _objectWithoutProperties(_ref, ['getDisplayName', 'methodName', 'renderCountProp', 'shouldHandleStateChanges', 'storeKey', 'withRef']);
 
@@ -63,3 +60,3 @@ var subscriptionKey = storeKey + 'Subscription';
 
-  var contextTypes = (_contextTypes = {}, _contextTypes[storeKey] = storeShape, _contextTypes[subscriptionKey] = PropTypes.instanceOf(Subscription), _contextTypes.react15CompatibilityMode = PropTypes.bool, _contextTypes);
+  var contextTypes = (_contextTypes = {}, _contextTypes[storeKey] = storeShape, _contextTypes[subscriptionKey] = PropTypes.instanceOf(Subscription), _contextTypes);
   var childContextTypes = (_childContextTypes = {}, _childContextTypes[subscriptionKey] = PropTypes.instanceOf(Subscription), _childContextTypes);
@@ -98,12 +95,4 @@
         _this.store = _this.props[storeKey] || _this.context[storeKey];
+        _this.parentSub = props[subscriptionKey] || context[subscriptionKey];
 
-        // react15CompatibilityMode controls whether the subscription system is used. This is for
-        // https://github.com/reactjs/react-redux/issues/525 and should be removed completely when
-        // react-redux's dependency on react is bumped to mimimum v16, which is expected to include
-        // PR https://github.com/facebook/react/pull/8204 which fixes the issue.
-        var compatMode = [react15CompatibilityMode, props.react15CompatibilityMode, context.react15CompatibilityMode, defaultReact15CompatibilityMode].find(function (cm) {
-          return cm !== undefined && cm !== null;
-        });
-        _this.parentSub = compatMode ? null : props[subscriptionKey] || context[subscriptionKey];
-
         _this.setWrappedInstance = _this.setWrappedInstance.bind(_this);
@@ -201,3 +190,2 @@
             var subscription = _this2.subscription = new Subscription(_this2.store, _this2.parentSub);
-            var notifyNestedSubs = subscription.notifyNestedSubs.bind(subscription);
             var dummyState = {};
@@ -211,3 +199,8 @@
               } else {
-                this.setState(dummyState, notifyNestedSubs);
+                this.componentDidUpdate = function componentDidUpdate() {
+                  this.componentDidUpdate = undefined;
+                  subscription.notifyNestedSubs();
+                };
+
+                this.setState(dummyState);
               }
@@ -271,6 +264,2 @@ }.bind(_this2);
   };
-}
-
-connectAdvanced.setDefaultReact15CompatibilityMode = function setDefaultReact15CompatibilityMode(compat) {
-  defaultReact15CompatibilityMode = compat;
-};
+}

es/connect/connect.js

@@ -103,4 +103,2 @@ var _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; };
 
-var connect = createConnect();
-connect.setDefaultReact15CompatibilityMode = connectAdvanced.setDefaultReact15CompatibilityMode;
-export default connect;
+export default createConnect();

lib/components/connectAdvanced.js

@@ -37,3 +37,2 @@ 'use strict';
 
-var defaultReact15CompatibilityMode = true;
 var hotReloadingVersion = 0;
@@ -65,4 +64,2 @@ function connectAdvanced(
       methodName = _ref$methodName === undefined ? 'connectAdvanced' : _ref$methodName,
-      _ref$react15Compatibi = _ref.react15CompatibilityMode,
-      react15CompatibilityMode = _ref$react15Compatibi === undefined ? undefined : _ref$react15Compatibi,
       _ref$renderCountProp = _ref.renderCountProp,
@@ -76,3 +73,3 @@ renderCountProp = _ref$renderCountProp === undefined ? undefined : _ref$renderCountProp,
       withRef = _ref$withRef === undefined ? false : _ref$withRef,
-      connectOptions = _objectWithoutProperties(_ref, ['getDisplayName', 'methodName', 'react15CompatibilityMode', 'renderCountProp', 'shouldHandleStateChanges', 'storeKey', 'withRef']);
+      connectOptions = _objectWithoutProperties(_ref, ['getDisplayName', 'methodName', 'renderCountProp', 'shouldHandleStateChanges', 'storeKey', 'withRef']);
 
@@ -82,3 +79,3 @@ var subscriptionKey = storeKey + 'Subscription';
 
-  var contextTypes = (_contextTypes = {}, _contextTypes[storeKey] = _storeShape2.default, _contextTypes[subscriptionKey] = _react.PropTypes.instanceOf(_Subscription2.default), _contextTypes.react15CompatibilityMode = _react.PropTypes.bool, _contextTypes);
+  var contextTypes = (_contextTypes = {}, _contextTypes[storeKey] = _storeShape2.default, _contextTypes[subscriptionKey] = _react.PropTypes.instanceOf(_Subscription2.default), _contextTypes);
   var childContextTypes = (_childContextTypes = {}, _childContextTypes[subscriptionKey] = _react.PropTypes.instanceOf(_Subscription2.default), _childContextTypes);
@@ -117,12 +114,4 @@
         _this.store = _this.props[storeKey] || _this.context[storeKey];
+        _this.parentSub = props[subscriptionKey] || context[subscriptionKey];
 
-        // react15CompatibilityMode controls whether the subscription system is used. This is for
-        // https://github.com/reactjs/react-redux/issues/525 and should be removed completely when
-        // react-redux's dependency on react is bumped to mimimum v16, which is expected to include
-        // PR https://github.com/facebook/react/pull/8204 which fixes the issue.
-        var compatMode = [react15CompatibilityMode, props.react15CompatibilityMode, context.react15CompatibilityMode, defaultReact15CompatibilityMode].find(function (cm) {
-          return cm !== undefined && cm !== null;
-        });
-        _this.parentSub = compatMode ? null : props[subscriptionKey] || context[subscriptionKey];
-
         _this.setWrappedInstance = _this.setWrappedInstance.bind(_this);
@@ -220,3 +209,2 @@
             var subscription = _this2.subscription = new _Subscription2.default(_this2.store, _this2.parentSub);
-            var notifyNestedSubs = subscription.notifyNestedSubs.bind(subscription);
             var dummyState = {};
@@ -230,3 +218,8 @@
               } else {
-                this.setState(dummyState, notifyNestedSubs);
+                this.componentDidUpdate = function componentDidUpdate() {
+                  this.componentDidUpdate = undefined;
+                  subscription.notifyNestedSubs();
+                };
+
+                this.setState(dummyState);
               }
@@ -290,6 +283,2 @@ }.bind(_this2);
   };
-}
-
-connectAdvanced.setDefaultReact15CompatibilityMode = function setDefaultReact15CompatibilityMode(compat) {
-  defaultReact15CompatibilityMode = compat;
-};
+}

lib/connect/connect.js

@@ -128,4 +128,2 @@ 'use strict';
 
-var connect = createConnect();
-connect.setDefaultReact15CompatibilityMode = _connectAdvanced2.default.setDefaultReact15CompatibilityMode;
-exports.default = connect;
+exports.default = createConnect();

package.json

 {
   "name": "react-redux",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.2",
   "description": "Official React bindings for Redux",
@@ -5,0 +5,0 @@ "main": "./lib/index.js",

src/components/connectAdvanced.js

@@ -8,4 +8,2 @@ import hoistStatics from 'hoist-non-react-statics'
 
-
-let defaultReact15CompatibilityMode = true
 let hotReloadingVersion = 0
@@ -41,5 +39,2 @@ export default function connectAdvanced(
 
-    // temporary compatibility setting for React 15. See Connect constructor for details
-    react15CompatibilityMode = undefined,
-
     // if defined, the name of the property passed to the wrapped element indicating the number of
@@ -68,3 +63,2 @@ // calls to render. useful for watching in react devtools for unnecessary re-renders.
     [subscriptionKey]: PropTypes.instanceOf(Subscription),
-    react15CompatibilityMode: PropTypes.bool,
   }
@@ -109,14 +103,3 @@ const childContextTypes = {
         this.store = this.props[storeKey] || this.context[storeKey]
-        
-        // react15CompatibilityMode controls whether the subscription system is used. This is for
-        // https://github.com/reactjs/react-redux/issues/525 and should be removed completely when
-        // react-redux's dependency on react is bumped to mimimum v16, which is expected to include
-        // PR https://github.com/facebook/react/pull/8204 which fixes the issue.
-        const compatMode = [
-          react15CompatibilityMode,
-          props.react15CompatibilityMode,
-          context.react15CompatibilityMode,
-          defaultReact15CompatibilityMode
-        ].find(cm => cm !== undefined && cm !== null)
-        this.parentSub = compatMode ? null : props[subscriptionKey] || context[subscriptionKey]
+        this.parentSub = props[subscriptionKey] || context[subscriptionKey]
 
@@ -216,3 +199,2 @@ this.setWrappedInstance = this.setWrappedInstance.bind(this)
           const subscription = this.subscription = new Subscription(this.store, this.parentSub)
-          const notifyNestedSubs = subscription.notifyNestedSubs.bind(subscription)
           const dummyState = {}
@@ -226,3 +208,8 @@
             } else {
-              this.setState(dummyState, notifyNestedSubs)
+              this.componentDidUpdate = function componentDidUpdate() {
+                this.componentDidUpdate = undefined
+                subscription.notifyNestedSubs()
+              }
+
+              this.setState(dummyState)
             }
@@ -284,7 +271,1 @@ }.bind(this)
 }
-
-connectAdvanced.setDefaultReact15CompatibilityMode =
-  function setDefaultReact15CompatibilityMode(compat) {
-    defaultReact15CompatibilityMode = compat
-  }
-

src/connect/connect.js

@@ -90,4 +90,2 @@ import connectAdvanced from '../components/connectAdvanced'
 
-const connect = createConnect()
-connect.setDefaultReact15CompatibilityMode = connectAdvanced.setDefaultReact15CompatibilityMode
-export default connect
+export default createConnect()

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

179444

decreased by-2.59%

Lines of code

3307

decreased by-1.58%

No dependency changes