From 0ad23b3cd7a96c67f86b7944c7d02fcf92b22ab1 Mon Sep 17 00:00:00 2001 From: Kevin Killingsworth Date: Wed, 22 Aug 2018 23:17:04 -0500 Subject: [PATCH 1/2] Data: Registry - check for window The registry code is blindly deferencing window, which will fail if ever run in node for test or server-side rendering. This adds a simple check to ensure window exists before dereferencing. --- packages/data/src/registry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/data/src/registry.js b/packages/data/src/registry.js index 273389c556d672..8cff7ef60fd947 100644 --- a/packages/data/src/registry.js +++ b/packages/data/src/registry.js @@ -140,7 +140,7 @@ export function createRegistry( storeConfigs = {} ) { */ function registerReducer( reducerKey, reducer ) { const enhancers = []; - if ( window.__REDUX_DEVTOOLS_EXTENSION__ ) { + if ( window && window.__REDUX_DEVTOOLS_EXTENSION__ ) { enhancers.push( window.__REDUX_DEVTOOLS_EXTENSION__( { name: reducerKey, instanceId: reducerKey } ) ); } const store = createStore( reducer, flowRight( enhancers ) ); From e57a1caa42fadb9cc99359799ea6fe03437e8b2c Mon Sep 17 00:00:00 2001 From: Kevin Killingsworth Date: Thu, 23 Aug 2018 11:53:27 -0500 Subject: [PATCH 2/2] Data: Check window type before using --- packages/data/src/registry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/data/src/registry.js b/packages/data/src/registry.js index 8cff7ef60fd947..2a35bd7a03ff09 100644 --- a/packages/data/src/registry.js +++ b/packages/data/src/registry.js @@ -140,7 +140,7 @@ export function createRegistry( storeConfigs = {} ) { */ function registerReducer( reducerKey, reducer ) { const enhancers = []; - if ( window && window.__REDUX_DEVTOOLS_EXTENSION__ ) { + if ( typeof window !== 'undefined' && window.__REDUX_DEVTOOLS_EXTENSION__ ) { enhancers.push( window.__REDUX_DEVTOOLS_EXTENSION__( { name: reducerKey, instanceId: reducerKey } ) ); } const store = createStore( reducer, flowRight( enhancers ) );