Skip to content

Commit 91bc52c

Browse files
committed
Use lodash-es instead of lodash
When ESLint is configured to prefer TypeScript modules over JavaScript (even in JavaScript files), attempting to import a named export from `lodash` fails the `import/named` rule with something like: capitalize not found in 'lodash' This seems to happen because `index.d.ts` links to other `.d.ts` files via `/// <reference ...>`, and either `eslint-plugin-import` or `eslint-import-resolver-typescript` does not know to follow those links. (I say "either" because I haven't quite been able to figure out where the exact issue is. The current maintainer of `eslint-import-resolver-typescript` hasn't provided any useful information; [here][1] is the closest issue on GitHub I've been able to find that could explain something.) However, `lodash-es` does not exhibit this issue, as its `index.d.ts` just imports types for individual functions from other files instead of using `/// <reference ...>`. [1]: import-js/eslint-import-resolver-typescript#31
1 parent 7a808ab commit 91bc52c

File tree

125 files changed

+125
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+125
-125
lines changed

app/scripts/controllers/incoming-transactions.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { strict as assert } from 'assert';
22
import sinon from 'sinon';
33
import proxyquire from 'proxyquire';
44
import nock from 'nock';
5-
import { cloneDeep } from 'lodash';
5+
import { cloneDeep } from 'lodash-es';
66

77
import waitUntilCalled from '../../../test/lib/wait-until-called';
88
import {

app/scripts/controllers/metametrics.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { merge, omit, omitBy } from 'lodash';
1+
import { merge, omit, omitBy } from 'lodash-es';
22
import { ObservableStore } from '@metamask/obs-store';
33
import { bufferToHex, keccak } from 'ethereumjs-util';
44
import { generateUUID } from 'pubnub';

app/scripts/controllers/permissions/selectors.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { cloneDeep } from 'lodash';
1+
import { cloneDeep } from 'lodash-es';
22
import { getChangedAccounts, getPermittedAccountsByOrigin } from './selectors';
33

44
describe('PermissionController selectors', () => {

app/scripts/controllers/swaps.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ethers } from 'ethers';
22
import log from 'loglevel';
33
import BigNumber from 'bignumber.js';
44
import { ObservableStore } from '@metamask/obs-store';
5-
import { mapValues, cloneDeep } from 'lodash';
5+
import { mapValues, cloneDeep } from 'lodash-es';
66
import abi from 'human-standard-token-abi';
77
import { calcTokenAmount } from '../../../ui/helpers/utils/token-util';
88
import { calcGasTotal } from '../../../ui/pages/send/send.utils';

app/scripts/controllers/swaps.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { strict as assert } from 'assert';
22
import sinon from 'sinon';
33

44
import { ethers } from 'ethers';
5-
import { mapValues } from 'lodash';
5+
import { mapValues } from 'lodash-es';
66
import BigNumber from 'bignumber.js';
77
import {
88
ROPSTEN_NETWORK_ID,

app/scripts/controllers/transactions/lib/tx-state-history-helpers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import jsonDiffer from 'fast-json-patch';
2-
import { cloneDeep } from 'lodash';
2+
import { cloneDeep } from 'lodash-es';
33

44
/**
55
* converts non-initial history entries into diffs

app/scripts/controllers/transactions/tx-gas-utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import EthQuery from 'ethjs-query';
22
import log from 'loglevel';
33
import { addHexPrefix } from 'ethereumjs-util';
4-
import { cloneDeep } from 'lodash';
4+
import { cloneDeep } from 'lodash-es';
55
import { hexToBn, BnMultiplyByFraction, bnToHex } from '../../lib/util';
66

77
/**

app/scripts/controllers/transactions/tx-state-manager.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import EventEmitter from 'safe-event-emitter';
22
import { ObservableStore } from '@metamask/obs-store';
33
import log from 'loglevel';
4-
import { keyBy, mapValues, omitBy, pickBy, sortBy } from 'lodash';
4+
import { keyBy, mapValues, omitBy, pickBy, sortBy } from 'lodash-es';
55
import createId from '../../../../shared/modules/random-id';
66
import { TRANSACTION_STATUSES } from '../../../../shared/constants/transaction';
77
import { METAMASK_CONTROLLER_EVENTS } from '../../metamask-controller';

app/scripts/lib/getObjStructure.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { cloneDeep } from 'lodash';
1+
import { cloneDeep } from 'lodash-es';
22

33
// This will create an object that represents the structure of the given object
44
// it replaces all values with the result of their type

app/scripts/lib/migrator/index.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable jest/no-conditional-expect */
22
import fs from 'fs';
3-
import { cloneDeep } from 'lodash';
3+
import { cloneDeep } from 'lodash-es';
44
import liveMigrations from '../../migrations';
55
import data from '../../first-time-state';
66
import Migrator from '.';

app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ethErrors, errorCodes } from 'eth-rpc-errors';
22
import validUrl from 'valid-url';
3-
import { omit } from 'lodash';
3+
import { omit } from 'lodash-es';
44
import { MESSAGE_TYPE } from '../../../../../shared/constants/app';
55
import {
66
isPrefixedFormattedHexString,

app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ethErrors } from 'eth-rpc-errors';
2-
import { omit } from 'lodash';
2+
import { omit } from 'lodash-es';
33
import { MESSAGE_TYPE } from '../../../../../shared/constants/app';
44
import {
55
ETH_SYMBOL,

app/scripts/lib/seed-phrase-verifier.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @jest-environment node
33
* https://github.com/facebook/jest/issues/7780
44
*/
5-
import { cloneDeep } from 'lodash';
5+
import { cloneDeep } from 'lodash-es';
66
import KeyringController from 'eth-keyring-controller';
77
import firstTimeState from '../first-time-state';
88
import mockEncryptor from '../../../test/lib/mock-encryptor';

app/scripts/lib/util.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import extension from 'extensionizer';
22
import { stripHexPrefix } from 'ethereumjs-util';
33
import BN from 'bn.js';
4-
import { memoize } from 'lodash';
4+
import { memoize } from 'lodash-es';
55
import {
66
MAINNET_CHAIN_ID,
77
TEST_CHAINS,

app/scripts/metamask-controller.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import pump from 'pump';
33
import { ObservableStore } from '@metamask/obs-store';
44
import { storeAsStream } from '@metamask/obs-store/dist/asStream';
55
import { JsonRpcEngine } from 'json-rpc-engine';
6-
import { debounce } from 'lodash';
6+
import { debounce } from 'lodash-es';
77
import createEngineStream from 'json-rpc-middleware-stream/engineStream';
88
import createFilterMiddleware from 'eth-json-rpc-filters';
99
import createSubscriptionManager from 'eth-json-rpc-filters/subscriptionManager';

app/scripts/metamask-controller.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { strict as assert } from 'assert';
22
import sinon from 'sinon';
3-
import { cloneDeep } from 'lodash';
3+
import { cloneDeep } from 'lodash-es';
44
import nock from 'nock';
55
import { pubToAddress, bufferToHex } from 'ethereumjs-util';
66
import { obj as createThoughStream } from 'through2';

app/scripts/migrations/002.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { cloneDeep } from 'lodash';
1+
import { cloneDeep } from 'lodash-es';
22

33
const version = 2;
44

app/scripts/migrations/003.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { cloneDeep } from 'lodash';
1+
import { cloneDeep } from 'lodash-es';
22

33
const version = 3;
44
const oldTestRpc = 'https://rawtestrpc.metamask.io/';

app/scripts/migrations/004.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { cloneDeep } from 'lodash';
1+
import { cloneDeep } from 'lodash-es';
22

33
const version = 4;
44

app/scripts/migrations/005.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This migration moves state from the flat state trie into KeyringController subst
44
55
*/
66

7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88

99
const version = 5;
1010

app/scripts/migrations/006.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This migration moves KeyringController.selectedAddress to PreferencesController.
44
55
*/
66

7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88

99
const version = 6;
1010

app/scripts/migrations/007.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This migration breaks out the TransactionManager substate
44
55
*/
66

7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88

99
const version = 7;
1010

app/scripts/migrations/008.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This migration breaks out the NoticeController substate
44
55
*/
66

7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88

99
const version = 8;
1010

app/scripts/migrations/009.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This migration breaks out the CurrencyController substate
44
55
*/
66

7-
import { cloneDeep, merge } from 'lodash';
7+
import { cloneDeep, merge } from 'lodash-es';
88

99
const version = 9;
1010

app/scripts/migrations/010.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This migration breaks out the ShapeShiftController substate
44
55
*/
66

7-
import { cloneDeep, merge } from 'lodash';
7+
import { cloneDeep, merge } from 'lodash-es';
88

99
const version = 10;
1010

app/scripts/migrations/011.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This migration removes the discaimer state from our app, which was integrated in
44
55
*/
66

7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88

99
const version = 11;
1010

app/scripts/migrations/012.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This migration modifies our notices to delete their body after being read.
44
55
*/
66

7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88

99
const version = 12;
1010

app/scripts/migrations/013.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This migration modifies the network config from ambiguous 'testnet' to explicit
44
55
*/
66

7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88

99
const version = 13;
1010

app/scripts/migrations/014.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This migration removes provider from config and moves it too NetworkController.
44
55
*/
66

7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88

99
const version = 14;
1010

app/scripts/migrations/015.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ to a 'failed' stated
55
66
*/
77

8-
import { cloneDeep } from 'lodash';
8+
import { cloneDeep } from 'lodash-es';
99
import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction';
1010

1111
const version = 15;

app/scripts/migrations/016.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ to a 'failed' stated
55
66
*/
77

8-
import { cloneDeep } from 'lodash';
8+
import { cloneDeep } from 'lodash-es';
99
import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction';
1010

1111
const version = 16;

app/scripts/migrations/017.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This migration sets transactions who were retried and marked as failed to submit
44
55
*/
66

7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88
import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction';
99

1010
const version = 17;

app/scripts/migrations/018.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This migration updates "transaction state history" to diffs style
44
55
*/
66

7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88
import {
99
snapshotFromTxMeta,
1010
migrateFromSnapshotsToDiffs,

app/scripts/migrations/019.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ whos nonce is too high
55
66
*/
77

8-
import { cloneDeep } from 'lodash';
8+
import { cloneDeep } from 'lodash-es';
99
import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction';
1010

1111
const version = 19;

app/scripts/migrations/020.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ so that we can version notices in the future.
66
77
*/
88

9-
import { cloneDeep } from 'lodash';
9+
import { cloneDeep } from 'lodash-es';
1010

1111
const version = 20;
1212

app/scripts/migrations/021.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This migration removes the BlackListController from disk state
44
55
*/
66

7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88

99
const version = 21;
1010

app/scripts/migrations/022.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This migration adds submittedTime to the txMeta if it is not their
44
55
*/
66

7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88
import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction';
99

1010
const version = 22;

app/scripts/migrations/023.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This migration removes transactions that are no longer usefull down to 40 total
44
55
*/
66

7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88
import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction';
99

1010
const version = 23;

app/scripts/migrations/024.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ all unapproved transactions
55
66
*/
77

8-
import { cloneDeep } from 'lodash';
8+
import { cloneDeep } from 'lodash-es';
99
import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction';
1010

1111
const version = 24;

app/scripts/migrations/025.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
normalizes txParams on unconfirmed txs
55
66
*/
7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88
import { addHexPrefix } from '../lib/util';
99
import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction';
1010

app/scripts/migrations/026.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This migration moves the identities stored in the KeyringController
55
66
*/
77

8-
import { cloneDeep } from 'lodash';
8+
import { cloneDeep } from 'lodash-es';
99

1010
const version = 26;
1111

app/scripts/migrations/027.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
normalizes txParams on unconfirmed txs
55
66
*/
7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88
import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction';
99

1010
const version = 27;

app/scripts/migrations/028.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
normalizes txParams on unconfirmed txs
55
66
*/
7-
import { cloneDeep } from 'lodash';
7+
import { cloneDeep } from 'lodash-es';
88

99
const version = 28;
1010

app/scripts/migrations/030.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ removes invalid chaids from preferences and networkController for custom rpcs
55
66
*/
77

8-
import { cloneDeep } from 'lodash';
8+
import { cloneDeep } from 'lodash-es';
99

1010
const version = 30;
1111

app/scripts/migrations/031.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// next version number
2-
import { cloneDeep } from 'lodash';
2+
import { cloneDeep } from 'lodash-es';
33

44
const version = 31;
55

app/scripts/migrations/032.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { cloneDeep } from 'lodash';
1+
import { cloneDeep } from 'lodash-es';
22

33
const version = 32;
44

app/scripts/migrations/033.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Cleans up notices and assocated notice controller code
55
66
*/
77

8-
import { cloneDeep } from 'lodash';
8+
import { cloneDeep } from 'lodash-es';
99

1010
const version = 33;
1111

app/scripts/migrations/034.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { cloneDeep } from 'lodash';
1+
import { cloneDeep } from 'lodash-es';
22

33
const version = 34;
44

0 commit comments

Comments
 (0)