Skip to content

Commit 9f6c7aa

Browse files
committed
Deprecate window.devToolsExtension
Related to #220
1 parent ede072e commit 9f6c7aa

File tree

4 files changed

+56
-16
lines changed

4 files changed

+56
-16
lines changed

src/app/api/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ export function connect(preConfig) {
280280
export function updateStore(stores) {
281281
return function(newStore, instanceId) {
282282
/* eslint-disable no-console */
283-
console.warn('`devToolsExtension.updateStore` is deprecated, remove it and just use ' +
283+
console.warn('`__REDUX_DEVTOOLS_EXTENSION__.updateStore` is deprecated, remove it and just use ' +
284284
'`__REDUX_DEVTOOLS_EXTENSION_COMPOSE__` instead of the extension\'s store enhancer: ' +
285285
'https://github.com/zalmoxisus/redux-devtools-extension#12-advanced-store-setup');
286286
/* eslint-enable no-console */

src/app/stores/windowStore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default function configureStore(baseStore, position, preloadedState) {
1616
} else {
1717
enhancer = compose(
1818
applyMiddleware(...middlewares),
19-
window.devToolsExtension ? window.devToolsExtension() : noop => noop
19+
window.__REDUX_DEVTOOLS_EXTENSION__ ? window.__REDUX_DEVTOOLS_EXTENSION__() : noop => noop
2020
);
2121
}
2222
const store = createStore(rootReducer, preloadedState, enhancer);

src/browser/extension/inject/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ chrome.runtime.sendMessage(window.devToolsExtensionID, { type: 'GET_OPTIONS' },
1212
}
1313

1414
window.devToolsOptions = response.options;
15-
window.devToolsExtension.notifyErrors();
15+
window.__REDUX_DEVTOOLS_EXTENSION__.notifyErrors();
1616
});

src/browser/extension/inject/pageScript.js

Lines changed: 53 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function deprecateParam(oldParam, newParam) {
2424
/* eslint-enable no-console */
2525
}
2626

27-
const devToolsExtension = function(reducer, preloadedState, config) {
27+
const __REDUX_DEVTOOLS_EXTENSION__ = function(reducer, preloadedState, config) {
2828
/* eslint-disable no-param-reassign */
2929
if (typeof reducer === 'object') {
3030
config = reducer; reducer = undefined;
@@ -288,16 +288,56 @@ const devToolsExtension = function(reducer, preloadedState, config) {
288288
};
289289

290290
// noinspection JSAnnotator
291-
window.devToolsExtension = devToolsExtension;
292-
window.devToolsExtension.open = openWindow;
293-
window.devToolsExtension.updateStore = updateStore(stores);
294-
window.devToolsExtension.notifyErrors = notifyErrors;
295-
window.devToolsExtension.send = sendMessage;
296-
window.devToolsExtension.listen = setListener;
297-
window.devToolsExtension.connect = connect;
298-
window.devToolsExtension.disconnect = disconnect;
299-
300-
window.__REDUX_DEVTOOLS_EXTENSION__ = window.devToolsExtension;
291+
window.__REDUX_DEVTOOLS_EXTENSION__ = __REDUX_DEVTOOLS_EXTENSION__;
292+
window.__REDUX_DEVTOOLS_EXTENSION__.open = openWindow;
293+
window.__REDUX_DEVTOOLS_EXTENSION__.updateStore = updateStore(stores);
294+
window.__REDUX_DEVTOOLS_EXTENSION__.notifyErrors = notifyErrors;
295+
window.__REDUX_DEVTOOLS_EXTENSION__.send = sendMessage;
296+
window.__REDUX_DEVTOOLS_EXTENSION__.listen = setListener;
297+
window.__REDUX_DEVTOOLS_EXTENSION__.connect = connect;
298+
window.__REDUX_DEVTOOLS_EXTENSION__.disconnect = disconnect;
299+
300+
// Deprecated
301+
/* eslint-disable no-console */
302+
let varNameDeprecatedWarned;
303+
const varNameDeprecatedWarn = () => {
304+
if (varNameDeprecatedWarned) return;
305+
console.warn('`window.devToolsExtension` is deprecated in favor of `window.__REDUX_DEVTOOLS_EXTENSION__`, and will be removed in next version of Redux DevTools: https://git.io/fpEJZ');
306+
varNameDeprecatedWarned = true;
307+
};
308+
/* eslint-enable no-console */
309+
window.devToolsExtension = (...args) => {
310+
varNameDeprecatedWarn();
311+
return __REDUX_DEVTOOLS_EXTENSION__.apply(null, args);
312+
};
313+
window.devToolsExtension.open = (...args) => {
314+
varNameDeprecatedWarn();
315+
return openWindow.apply(null, args);
316+
};
317+
window.devToolsExtension.updateStore = (...args) => {
318+
varNameDeprecatedWarn();
319+
return updateStore(stores).apply(null, args);
320+
};
321+
window.devToolsExtension.notifyErrors = (...args) => {
322+
varNameDeprecatedWarn();
323+
return notifyErrors.apply(null, args);
324+
};
325+
window.devToolsExtension.send = (...args) => {
326+
varNameDeprecatedWarn();
327+
return sendMessage.apply(null, args);
328+
};
329+
window.devToolsExtension.listen = (...args) => {
330+
varNameDeprecatedWarn();
331+
return setListener.apply(null, args);
332+
};
333+
window.devToolsExtension.connect = (...args) => {
334+
varNameDeprecatedWarn();
335+
return connect.apply(null, args);
336+
};
337+
window.devToolsExtension.disconnect = (...args) => {
338+
varNameDeprecatedWarn();
339+
return disconnect.apply(null, args);
340+
};
301341

302342
const preEnhancer = instanceId => next =>
303343
(reducer, preloadedState, enhancer) => {
@@ -322,14 +362,14 @@ const extensionCompose = (config) => (...funcs) => {
322362
return (...args) => {
323363
const instanceId = generateId(config.instanceId);
324364
return [preEnhancer(instanceId), ...funcs].reduceRight(
325-
(composed, f) => f(composed), devToolsExtension({ ...config, instanceId })(...args)
365+
(composed, f) => f(composed), __REDUX_DEVTOOLS_EXTENSION__({ ...config, instanceId })(...args)
326366
);
327367
};
328368
};
329369

330370
window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ = (...funcs) => {
331371
if (funcs.length === 0) {
332-
return devToolsExtension();
372+
return __REDUX_DEVTOOLS_EXTENSION__();
333373
}
334374
if (funcs.length === 1 && typeof funcs[0] === 'object') {
335375
return extensionCompose(funcs[0]);

0 commit comments

Comments
 (0)