Skip to content

Commit e7c8000

Browse files
jhen0409jhen0409
committed
Use redux-devtools-core instead of remotedev-utils
1 parent 265347f commit e7c8000

File tree

4 files changed

+85
-42
lines changed

4 files changed

+85
-42
lines changed

‎app/worker/reduxAPI.js

Lines changed: 49 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,22 @@ import {
77
generateId,
88
stringify,
99
getSeralizeParameter,
10-
} from 'remotedev-utils';
11-
import importState from 'remotedev-utils/lib/importState';
10+
} from 'redux-devtools-core/lib/utils';
11+
import importState from 'redux-devtools-core/lib/utils/importState';
1212
import {
1313
getLocalFilter,
1414
isFiltered,
1515
filterStagedActions,
1616
filterState,
17-
} from 'remotedev-utils/lib/filters';
17+
} from 'redux-devtools-core/lib/utils/filters';
1818

1919
function configureStore(next, subscriber, options) {
2020
return instrument(subscriber, options)(next);
2121
}
2222

23-
const instances = { /* [id]: { name, store, ... } */ };
23+
const instances = {
24+
/* [id]: { name, store, ... } */
25+
};
2426

2527
let lastAction;
2628
let isExcess;
@@ -34,9 +36,12 @@ function getLiftedState(store, filters) {
3436

3537
function relay(type, state, instance, action, nextActionId) {
3638
const {
37-
filters, predicate,
38-
stateSanitizer, actionSanitizer,
39-
serializeState, serializeAction,
39+
filters,
40+
predicate,
41+
stateSanitizer,
42+
actionSanitizer,
43+
serializeState,
44+
serializeAction,
4045
} = instance;
4146

4247
const message = {
@@ -45,12 +50,21 @@ function relay(type, state, instance, action, nextActionId) {
4550
name: instance.name,
4651
};
4752
if (state) {
48-
message.payload = type === 'ERROR' ?
49-
state :
50-
stringify(
51-
filterState(state, type, filters, stateSanitizer, actionSanitizer, nextActionId, predicate),
52-
serializeState
53-
);
53+
message.payload =
54+
type === 'ERROR'
55+
? state
56+
: stringify(
57+
filterState(
58+
state,
59+
type,
60+
filters,
61+
stateSanitizer,
62+
actionSanitizer,
63+
nextActionId,
64+
predicate
65+
),
66+
serializeState
67+
);
5468
}
5569
if (type === 'ACTION') {
5670
message.action = stringify(
@@ -103,9 +117,9 @@ function exportState({ id: instanceId, store, serializeState }) {
103117
type: 'EXPORT',
104118
payload: stringify(payload, serializeState),
105119
committedState:
106-
typeof liftedState.committedState !== 'undefined' ?
107-
stringify(liftedState.committedState, serializeState) :
108-
undefined,
120+
typeof liftedState.committedState !== 'undefined'
121+
? stringify(liftedState.committedState, serializeState)
122+
: undefined,
109123
instanceId,
110124
},
111125
});
@@ -228,16 +242,14 @@ export default function devToolsEnhancer(options = {}) {
228242
const serializeAction = getSeralizeParameter(options, 'serializeAction');
229243

230244
return next => (reducer, initialState) => {
231-
const store = configureStore(
232-
next, monitorReducer, {
233-
maxAge,
234-
shouldCatchErrors,
235-
shouldHotReload,
236-
shouldRecordChanges,
237-
shouldStartLocked,
238-
pauseActionType,
239-
}
240-
)(reducer, initialState);
245+
const store = configureStore(next, monitorReducer, {
246+
maxAge,
247+
shouldCatchErrors,
248+
shouldHotReload,
249+
shouldRecordChanges,
250+
shouldStartLocked,
251+
pauseActionType,
252+
})(reducer, initialState);
241253

242254
instances[id] = {
243255
name: name || id,
@@ -266,20 +278,17 @@ export default function devToolsEnhancer(options = {}) {
266278
};
267279
}
268280

269-
const preEnhancer = instanceId => next =>
270-
(reducer, initialState, enhancer) => {
271-
const store = next(reducer, initialState, enhancer);
281+
const preEnhancer = instanceId => next => (reducer, initialState, enhancer) => {
282+
const store = next(reducer, initialState, enhancer);
272283

273-
if (instances[instanceId]) {
274-
instances[instanceId].store = store;
275-
}
276-
return {
277-
...store,
278-
dispatch: (action) => (
279-
locked ? action : store.dispatch(action)
280-
),
281-
};
284+
if (instances[instanceId]) {
285+
instances[instanceId].store = store;
286+
}
287+
return {
288+
...store,
289+
dispatch: action => (locked ? action : store.dispatch(action)),
282290
};
291+
};
283292

284293
devToolsEnhancer.updateStore = (newStore, instanceId) => {
285294
console.warn(
@@ -309,7 +318,8 @@ devToolsEnhancer.updateStore = (newStore, instanceId) => {
309318
const compose = options => (...funcs) => (...args) => {
310319
const instanceId = generateId(options.instanceId);
311320
return [preEnhancer(instanceId), ...funcs].reduceRight(
312-
(composed, f) => f(composed), devToolsEnhancer({ ...options, instanceId })(...args)
321+
(composed, f) => f(composed),
322+
devToolsEnhancer({ ...options, instanceId })(...args)
313323
);
314324
};
315325

‎app/worker/remotedev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Edit from https://github.com/zalmoxisus/remotedev/blob/master/src/devTools.js
22

33
import { stringify, parse } from 'jsan';
4-
import { generateId, getActionsArray } from 'remotedev-utils';
4+
import { generateId, getActionsArray } from 'redux-devtools-core/lib/utils';
55

66
let listenerAdded;
77
const listeners = {};

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@
8787
"react-redux": "^5.0.7",
8888
"redux": "^3.7.2",
8989
"redux-devtools": "^3.4.1",
90+
"redux-devtools-core": "^0.2.1",
9091
"redux-devtools-instrument": "^1.9.0",
9192
"redux-persist": "^4.10.2",
9293
"remotedev-app": "^0.10.8",
9394
"remotedev-monitor-components": "^0.0.5",
94-
"remotedev-slider": "^1.1.3",
95-
"remotedev-utils": "^0.1.4"
95+
"remotedev-slider": "^1.1.3"
9696
},
9797
"optionalDependencies": {
9898
"electron-named-image": "^1.0.4"

‎yarn.lock

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5890,6 +5890,11 @@ jsan@^3.1.0, jsan@^3.1.2, jsan@^3.1.3, jsan@^3.1.5, jsan@^3.1.9:
58905890
resolved "https://registry.yarnpkg.com/jsan/-/jsan-3.1.10.tgz#ba9917b864defff567e0c990a34ae7a8d5eb1d90"
58915891
integrity sha512-Rpme/mJFG3BlIM8/9L+0qAIGccx6dyYEODdkZUHYKyJI3NIl6d13buXa7aE3lO1kZAGMalG0/6QzalXdDdUc4g==
58925892

5893+
jsan@^3.1.13:
5894+
version "3.1.13"
5895+
resolved "https://registry.yarnpkg.com/jsan/-/jsan-3.1.13.tgz#4de8c7bf8d1cfcd020c313d438f930cec4b91d86"
5896+
integrity sha512-9kGpCsGHifmw6oJet+y8HaCl14y7qgAsxVdV3pCHDySNR3BfDC30zgkssd7x5LRVAT22dnpbe9JdzzmXZnq9/g==
5897+
58935898
jsbn@~0.1.0:
58945899
version "0.1.1"
58955900
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -6310,6 +6315,11 @@ lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.0,
63106315
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
63116316
integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
63126317

6318+
lodash@^4.17.11:
6319+
version "4.17.11"
6320+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
6321+
integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
6322+
63136323
lodash@^4.17.5:
63146324
version "4.17.5"
63156325
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
@@ -6819,6 +6829,11 @@ nan@^2.6.2:
68196829
resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
68206830
integrity sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=
68216831

6832+
nanoid@^2.0.0:
6833+
version "2.0.0"
6834+
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.0.0.tgz#e1ab4a4b024a38d15531ba34a712a201540de639"
6835+
integrity sha512-SG2qscLE3iM4C0CNzGrsAojJHSVHMS1J8NnvJ31P1lH8P0hGHOiafmniNJz6w6q7vuoDlV7RdySlJgtqkFEVtQ==
6836+
68226837
nanomatch@^1.2.9:
68236838
version "1.2.9"
68246839
resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
@@ -8271,6 +8286,17 @@ redux-devtools-chart-monitor@^1.6.1:
82718286
react-pure-render "^1.0.2"
82728287
redux-devtools-themes "^1.0.0"
82738288

8289+
redux-devtools-core@^0.2.1:
8290+
version "0.2.1"
8291+
resolved "https://registry.yarnpkg.com/redux-devtools-core/-/redux-devtools-core-0.2.1.tgz#4e43cbe590a1f18c13ee165d2d42e0bc77a164d8"
8292+
integrity sha512-RAGOxtUFdr/1USAvxrWd+Gq/Euzgw7quCZlO5TgFpDfG7rB5tMhZUrNyBjpzgzL2yMk0eHnPYIGm7NkIfRzHxQ==
8293+
dependencies:
8294+
get-params "^0.1.2"
8295+
jsan "^3.1.13"
8296+
lodash "^4.17.11"
8297+
nanoid "^2.0.0"
8298+
remotedev-serialize "^0.1.8"
8299+
82748300
redux-devtools-instrument@^1.0.1:
82758301
version "1.8.2"
82768302
resolved "https://registry.yarnpkg.com/redux-devtools-instrument/-/redux-devtools-instrument-1.8.2.tgz#5e91cfe402e790dae3fd2f0d235f7b7d84b09ffe"
@@ -8500,6 +8526,13 @@ remotedev-serialize@^0.1.0:
85008526
dependencies:
85018527
jsan "^3.1.0"
85028528

8529+
remotedev-serialize@^0.1.8:
8530+
version "0.1.8"
8531+
resolved "https://registry.yarnpkg.com/remotedev-serialize/-/remotedev-serialize-0.1.8.tgz#c99cb184e7f71a906162abc404be8ce33810205f"
8532+
integrity sha512-3YG/FDcOmiK22bl5oMRM8RRnbGrFEuPGjbcDG+z2xi5aQaNQNZ8lqoRnZTwXVfaZtutXuiAQOgPRrogzQk8edg==
8533+
dependencies:
8534+
jsan "^3.1.13"
8535+
85038536
[email protected], remotedev-slider@^1.1.3:
85048537
version "1.1.3"
85058538
resolved "https://registry.yarnpkg.com/remotedev-slider/-/remotedev-slider-1.1.3.tgz#3ecb14ad9afb8ac5b7b7a0b86825a3a08ba19d46"

0 commit comments

Comments
 (0)