Merge pull request #2646 from phacks/fix-redux-devtools-warning

[#2632] Fix deprecated Redux Dev Tools extension warning
marmelab · Dec 11, 2018 · d81aede · d81aede
2 parents 057a1d3 + 3acd746
commit d81aede
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/docs/CustomApp.md b/docs/CustomApp.md
@@ -70,8 +70,8 @@ export default ({
                 routerMiddleware(history),
                 // add your own middlewares here
             ),
-            typeof window !== 'undefined' && window.devToolsExtension
-                ? window.devToolsExtension()
+            typeof window !== 'undefined' && window.__REDUX_DEVTOOLS_EXTENSION__
+                ? window.__REDUX_DEVTOOLS_EXTENSION__()
                 : f => f
             // add your own enhancers here
         )

diff --git a/packages/ra-core/src/createAdminStore.ts b/packages/ra-core/src/createAdminStore.ts
@@ -10,7 +10,7 @@ import { defaultI18nProvider } from './i18n';
 import formMiddleware from './form/formMiddleware';
 
 interface Window {
-    devToolsExtension?: () => () => void;
+    __REDUX_DEVTOOLS_EXTENSION__?: () => () => void;
 }
 
 export default ({
@@ -48,8 +48,9 @@ export default ({
                 formMiddleware,
                 routerMiddleware(history)
             ),
-            typeof typedWindow !== 'undefined' && typedWindow.devToolsExtension
-                ? typedWindow.devToolsExtension()
+            typeof typedWindow !== 'undefined' &&
+            typedWindow.__REDUX_DEVTOOLS_EXTENSION__
+                ? typedWindow.__REDUX_DEVTOOLS_EXTENSION__()
                 : f => f
         )
     );