Skip to content

Commit 9226dcb

Browse files
committed
removed dependency from idx package
1 parent b456dfc commit 9226dcb

File tree

10 files changed

+1757
-1958
lines changed

10 files changed

+1757
-1958
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: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3939,10 +3939,7 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
39393939
dependencies:
39403940
safer-buffer ">= 2.1.2 < 3"
39413941

3942-
idx@^2.5.6:
3943-
version "2.5.6"
3944-
resolved "https://registry.yarnpkg.com/idx/-/idx-2.5.6.tgz#1f824595070100ae9ad585c86db08dc74f83a59d"
3945-
integrity sha512-WFXLF7JgPytbMgelpRY46nHz5tyDcedJ76pLV+RJWdb8h33bxFq4bdZau38DhNSzk5eVniBf1K3jwfK+Lb5nYA==
3942+
39463943

39473944
ieee754@^1.1.4:
39483945
version "1.2.1"
@@ -6164,7 +6161,6 @@ redux-query@^3.5.0-alpha.1:
61646161
integrity sha512-oqzScFf3/TaQI2p7h6t1IapcAZ+q59BHYVURwjFJQsoBpfdKK9a2JJRY3yw8SfYm9PeFTq4xg+3cM9+dBm2kiw==
61656162
dependencies:
61666163
backo "^1.1.0"
6167-
idx "^2.5.6"
61686164
invariant "^2.2.0"
61696165
json-stable-stringify "^1.0.0"
61706166
reselect "^4.0.0"

packages/redux-query-react/yarn.lock

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4134,10 +4134,7 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
41344134
dependencies:
41354135
safer-buffer ">= 2.1.2 < 3"
41364136

4137-
idx@^2.5.6:
4138-
version "2.5.6"
4139-
resolved "https://registry.yarnpkg.com/idx/-/idx-2.5.6.tgz#1f824595070100ae9ad585c86db08dc74f83a59d"
4140-
integrity sha512-WFXLF7JgPytbMgelpRY46nHz5tyDcedJ76pLV+RJWdb8h33bxFq4bdZau38DhNSzk5eVniBf1K3jwfK+Lb5nYA==
4137+
41414138

41424139
ieee754@^1.1.4:
41434140
version "1.2.1"
@@ -6508,7 +6505,6 @@ redux-query@^3.5.0-alpha.1:
65086505
integrity sha512-oqzScFf3/TaQI2p7h6t1IapcAZ+q59BHYVURwjFJQsoBpfdKK9a2JJRY3yw8SfYm9PeFTq4xg+3cM9+dBm2kiw==
65096506
dependencies:
65106507
backo "^1.1.0"
6511-
idx "^2.5.6"
65126508
invariant "^2.2.0"
65136509
json-stable-stringify "^1.0.0"
65146510
reselect "^4.0.0"

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
};
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: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1965,10 +1965,7 @@ 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==
1968+
19721969

19731970
babel-plugin-istanbul@^5.1.0:
19741971
version "5.2.0"
@@ -3927,10 +3924,7 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
39273924
dependencies:
39283925
safer-buffer ">= 2.1.2 < 3"
39293926

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==
3927+
39343928

39353929
ieee754@^1.1.4:
39363930
version "1.2.1"

0 commit comments

Comments
 (0)