Skip to content

Commit 32423a0

Browse files
kelsonpwkelsonpw
committed
Remove idx
1 parent b456dfc commit 32423a0

File tree

10 files changed

+29
-70
lines changed

10 files changed

+29
-70
lines changed

‎babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
module.exports = {
1010
presets: ['@babel/preset-flow', '@babel/preset-react', '@babel/preset-env'],
11-
plugins: ['@babel/plugin-proposal-object-rest-spread', 'babel-plugin-idx'],
11+
plugins: ['@babel/plugin-proposal-object-rest-spread'],
1212
env: {
1313
test: {
1414
presets: [

‎package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"@babel/preset-flow": "^7.0.0",
1616
"@babel/preset-react": "^7.0.0",
1717
"babel-jest": "^24.8.0",
18-
"babel-plugin-idx": "^2.4.0",
1918
"codecov": "^3.5.0",
2019
"flow-bin": "^0.100.0",
2120
"husky": "^1.3.1",

‎packages/redux-query-interface-superagent/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6158,10 +6158,10 @@ realpath-native@^2.0.0:
61586158
resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866"
61596159
integrity sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==
61606160

6161-
redux-query@^3.5.0-alpha.1:
6162-
version "3.5.0-alpha.3"
6163-
resolved "https://registry.yarnpkg.com/redux-query/-/redux-query-3.5.0-alpha.3.tgz#3aad3415599d57229a3ef982b241bae1948d7168"
6164-
integrity sha512-oqzScFf3/TaQI2p7h6t1IapcAZ+q59BHYVURwjFJQsoBpfdKK9a2JJRY3yw8SfYm9PeFTq4xg+3cM9+dBm2kiw==
6161+
redux-query@^3.5.1-alpha.1:
6162+
version "3.5.1-alpha.1"
6163+
resolved "https://registry.yarnpkg.com/redux-query/-/redux-query-3.5.1-alpha.1.tgz#bd3d1109e0a8dc8b0c8c96fa03bd2631979b57e9"
6164+
integrity sha512-YqbdV2qamE9+LD2u7r557s1q6zS1LJy6L7a7vArAgIWwLeHGu8TOi5BShZQmu62w9Zuob+4MM324wFDBZuL3Hg==
61656165
dependencies:
61666166
backo "^1.1.0"
61676167
idx "^2.5.6"

‎packages/redux-query-react/yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6333,10 +6333,10 @@ q@^1.0.1:
63336333
resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
63346334
integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
63356335

6336-
qs@6.2.4, qs@^1.2.1, qs@~6.5.2:
6337-
version "6.2.4"
6338-
resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.4.tgz#d90821bb8537cecc140e6c34f54ec76e54b39b22"
6339-
integrity sha512-E57gmgKXqDda+qWTkUJgIwgJICK7zgMfqZZopTRKZ6mY9gzLlmJN9EpXNnDrTxXFlOM/a+I28kJkF/60rqgnYw==
6336+
qs@6.9.7, qs@^1.2.1, qs@~6.5.2:
6337+
version "6.9.7"
6338+
resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
6339+
integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
63406340

63416341
querystring-es3@^0.2.0:
63426342
version "0.2.1"
@@ -6502,10 +6502,10 @@ realpath-native@^2.0.0:
65026502
resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866"
65036503
integrity sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==
65046504

6505-
redux-query@^3.5.0-alpha.1:
6506-
version "3.5.0-alpha.3"
6507-
resolved "https://registry.yarnpkg.com/redux-query/-/redux-query-3.5.0-alpha.3.tgz#3aad3415599d57229a3ef982b241bae1948d7168"
6508-
integrity sha512-oqzScFf3/TaQI2p7h6t1IapcAZ+q59BHYVURwjFJQsoBpfdKK9a2JJRY3yw8SfYm9PeFTq4xg+3cM9+dBm2kiw==
6505+
redux-query@^3.5.1-alpha.1:
6506+
version "3.5.1-alpha.1"
6507+
resolved "https://registry.yarnpkg.com/redux-query/-/redux-query-3.5.1-alpha.1.tgz#bd3d1109e0a8dc8b0c8c96fa03bd2631979b57e9"
6508+
integrity sha512-YqbdV2qamE9+LD2u7r557s1q6zS1LJy6L7a7vArAgIWwLeHGu8TOi5BShZQmu62w9Zuob+4MM324wFDBZuL3Hg==
65096509
dependencies:
65106510
backo "^1.1.0"
65116511
idx "^2.5.6"

‎packages/redux-query/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"license": "MIT",
3535
"dependencies": {
3636
"backo": "^1.1.0",
37-
"idx": "^2.5.6",
3837
"invariant": "^2.2.0",
3938
"json-stable-stringify": "^1.0.0",
4039
"reselect": "^4.0.0"
@@ -53,7 +52,6 @@
5352
"babel-eslint": "^10.0.1",
5453
"babel-jest": "^24.8.0",
5554
"babel-loader": "^8.0.2",
56-
"babel-plugin-idx": "^2.4.0",
5755
"cross-env": "^1.0.7",
5856
"eslint": "^5.11.1",
5957
"eslint-plugin-flowtype": "^3.10.1",

‎packages/redux-query/src/middleware/query.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// @flow
22

33
import Backoff from 'backo';
4-
import idx from 'idx';
54

65
import {
76
requestStart,
@@ -137,8 +136,8 @@ const queryMiddleware = (
137136
const queries = queriesSelector(state);
138137

139138
const queriesState = queries[queryKey];
140-
const isPending = idx(queriesState, _ => _.isPending);
141-
const status = idx(queriesState, _ => _.status);
139+
const isPending = queriesState?.isPending;
140+
const status = queriesState?.status;
142141
const hasSucceeded = isStatusOk(status);
143142

144143
if (force || !queriesState || (retry && !isPending && !hasSucceeded)) {

‎packages/redux-query/src/selectors/error.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// @flow
22

3-
import idx from 'idx';
4-
53
import type { State as ErrorsState } from '../reducers/errors';
64
import { getQueryKey } from '../lib/query-key';
75
import type { QueryConfig } from '../types';
@@ -16,7 +14,7 @@ export const responseBody = (
1614
return null;
1715
}
1816

19-
return idx(errorsState, _ => _[queryKey].responseBody);
17+
return errorsState?.[queryKey]?.responseBody;
2018
};
2119

2220
export const responseText = (errorsState: ErrorsState, queryConfig: QueryConfig): ?string => {
@@ -26,7 +24,7 @@ export const responseText = (errorsState: ErrorsState, queryConfig: QueryConfig)
2624
return null;
2725
}
2826

29-
return idx(errorsState, _ => _[queryKey].responseText);
27+
return errorsState?.[queryKey]?.responseText;
3028
};
3129

3230
export const responseHeaders = (
@@ -39,5 +37,5 @@ export const responseHeaders = (
3937
return null;
4038
}
4139

42-
return idx(errorsState, _ => _[queryKey].responseHeaders);
40+
return errorsState?.[queryKey]?.responseHeaders;
4341
};

‎packages/redux-query/src/selectors/query.js

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// @flow
22

3-
import idx from 'idx';
4-
53
import type { State as QueriesState } from '../reducers/queries';
64
import { getQueryKey } from '../lib/query-key';
75
import type { QueryConfig, QueryDetails } from '../types';
@@ -24,53 +22,35 @@ export const getQueryDetails: (
2422
return defaultDetailsObject;
2523
}
2624

27-
return idx(queriesState, _ => _[queryKey]) || defaultDetailsObject;
25+
return queriesState?.[queryKey] ?? defaultDetailsObject;
2826
};
2927

3028
export const isFinished: (
3129
queriesState: QueriesState,
3230
queryConfig: ?QueryConfig,
33-
) => boolean = createSelector(
34-
getQueryDetails,
35-
query => query.isFinished,
36-
);
31+
) => boolean = createSelector(getQueryDetails, query => query.isFinished);
3732

3833
export const isPending: (
3934
queriesState: QueriesState,
4035
queryConfig: ?QueryConfig,
41-
) => boolean = createSelector(
42-
getQueryDetails,
43-
query => query.isPending,
44-
);
36+
) => boolean = createSelector(getQueryDetails, query => query.isPending);
4537

4638
export const status: (
4739
queriesState: QueriesState,
4840
queryConfig: ?QueryConfig,
49-
) => ?number = createSelector(
50-
getQueryDetails,
51-
query => query.status,
52-
);
41+
) => ?number = createSelector(getQueryDetails, query => query.status);
5342

5443
export const headers: (
5544
queriesState: QueriesState,
5645
queryConfig: ?QueryConfig,
57-
) => ?{ [key: string]: any } = createSelector(
58-
getQueryDetails,
59-
query => query.headers,
60-
);
46+
) => ?{ [key: string]: any } = createSelector(getQueryDetails, query => query.headers);
6147

6248
export const lastUpdated: (
6349
queriesState: QueriesState,
6450
queryConfig: ?QueryConfig,
65-
) => ?number = createSelector(
66-
getQueryDetails,
67-
query => query.lastUpdated,
68-
);
51+
) => ?number = createSelector(getQueryDetails, query => query.lastUpdated);
6952

7053
export const queryCount: (
7154
queriesState: QueriesState,
7255
queryConfig: ?QueryConfig,
73-
) => number = createSelector(
74-
getQueryDetails,
75-
query => query.queryCount,
76-
);
56+
) => number = createSelector(getQueryDetails, query => query.queryCount);

‎packages/redux-query/yarn.lock

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1965,11 +1965,6 @@ babel-loader@^8.0.2:
19651965
make-dir "^3.1.0"
19661966
schema-utils "^2.6.5"
19671967

1968-
babel-plugin-idx@^2.4.0:
1969-
version "2.4.0"
1970-
resolved "https://registry.yarnpkg.com/babel-plugin-idx/-/babel-plugin-idx-2.4.0.tgz#5d144eb337fb22c4bf1ff75cb2e1c051a76a0323"
1971-
integrity sha512-+rEYZgSCLh0suJDlgZ64isSLhDW7Qxu6AnUMGhl/mW1kyYvfwqLqsDmgj3e5QXH0oX7A4Hq2x0BgqdU8tiuo5A==
1972-
19731968
babel-plugin-istanbul@^5.1.0:
19741969
version "5.2.0"
19751970
resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz#df4ade83d897a92df069c4d9a25cf2671293c854"
@@ -3927,11 +3922,6 @@ [email protected], iconv-lite@^0.4.24:
39273922
dependencies:
39283923
safer-buffer ">= 2.1.2 < 3"
39293924

3930-
idx@^2.5.6:
3931-
version "2.5.6"
3932-
resolved "https://registry.yarnpkg.com/idx/-/idx-2.5.6.tgz#1f824595070100ae9ad585c86db08dc74f83a59d"
3933-
integrity sha512-WFXLF7JgPytbMgelpRY46nHz5tyDcedJ76pLV+RJWdb8h33bxFq4bdZau38DhNSzk5eVniBf1K3jwfK+Lb5nYA==
3934-
39353925
ieee754@^1.1.4:
39363926
version "1.2.1"
39373927
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
@@ -6015,10 +6005,10 @@ punycode@^2.1.1:
60156005
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
60166006
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
60176007

6018-
qs@~6.5.2:
6019-
version "6.5.3"
6020-
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
6021-
integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
6008+
qs@6.9.7, qs@~6.5.2:
6009+
version "6.9.7"
6010+
resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
6011+
integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
60226012

60236013
querystring-es3@^0.2.0:
60246014
version "0.2.1"

‎yarn.lock

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2295,11 +2295,6 @@ babel-jest@^25.5.1:
22952295
graceful-fs "^4.2.4"
22962296
slash "^3.0.0"
22972297

2298-
babel-plugin-idx@^2.4.0:
2299-
version "2.4.0"
2300-
resolved "https://registry.yarnpkg.com/babel-plugin-idx/-/babel-plugin-idx-2.4.0.tgz#5d144eb337fb22c4bf1ff75cb2e1c051a76a0323"
2301-
integrity sha512-+rEYZgSCLh0suJDlgZ64isSLhDW7Qxu6AnUMGhl/mW1kyYvfwqLqsDmgj3e5QXH0oX7A4Hq2x0BgqdU8tiuo5A==
2302-
23032298
babel-plugin-istanbul@^5.1.0:
23042299
version "5.2.0"
23052300
resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz#df4ade83d897a92df069c4d9a25cf2671293c854"

0 commit comments

Comments
 (0)