From 1d7642e1ded6b3d0e364032f299452d3b01fa648 Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Sat, 8 Aug 2020 13:39:43 -0600 Subject: [PATCH] Use specific lodash modules --- package-lock.json | 5 +++++ package.json | 2 +- src/lib/Network.js | 22 +++++++++------------- src/lib/PersistentStorage.js | 1 + src/store/Store.js | 3 ++- src/store/actions/SessionActions.js | 3 +-- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1c546c765a844..43f0eb5ff3927 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8753,6 +8753,11 @@ "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=" }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=" + }, "lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", diff --git a/package.json b/package.json index fad267e5afa93..b97da38637f5d 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "dependencies": { "@react-native-community/async-storage": "^1.11.0", "jquery": "^3.5.1", - "lodash": "^4.17.19", + "lodash.get": "^4.4.2", "moment": "^2.27.0", "react": "^16.13.1", "react-dom": "^16.13.1", diff --git a/src/lib/Network.js b/src/lib/Network.js index 1a04462208449..e90f2b65cd18e 100644 --- a/src/lib/Network.js +++ b/src/lib/Network.js @@ -1,4 +1,4 @@ -import * as $ from 'jquery'; +import _ from 'underscore'; import * as Store from '../store/Store'; import CONFIG from '../CONFIG'; import STOREKEYS from '../store/STOREKEYS'; @@ -18,20 +18,16 @@ function request(command, data, type = 'post') { .then((authToken) => { const formData = new FormData(); formData.append('authToken', authToken); - _.each(data, (val, key) => { - formData.append(key, val); - }); + _.each(data, (val, key) => formData.append(key, val)); return formData; }) - .then((formData) => { - return fetch( - `${CONFIG.EXPENSIFY.API_ROOT}command=${command}`, - { - method: type, - body: formData, - }, - ) - }) + .then(formData => fetch( + `${CONFIG.EXPENSIFY.API_ROOT}command=${command}`, + { + method: type, + body: formData, + }, + )) .then(response => response.json()) .catch(() => isAppOffline = true); } diff --git a/src/lib/PersistentStorage.js b/src/lib/PersistentStorage.js index f5df6a87a6944..c748ab6447109 100644 --- a/src/lib/PersistentStorage.js +++ b/src/lib/PersistentStorage.js @@ -3,6 +3,7 @@ * persistent storage method is desired. */ import AsyncStorage from '@react-native-community/async-storage'; +import _ from 'underscore'; /** * Get a key from storage diff --git a/src/store/Store.js b/src/store/Store.js index 3cfe83db3c7a5..8f85df6a90151 100644 --- a/src/store/Store.js +++ b/src/store/Store.js @@ -1,4 +1,5 @@ -import {get as lodashGet} from 'lodash'; +import lodashGet from 'lodash.get'; +import _ from 'underscore'; import * as PersistentStorage from '../lib/PersistentStorage'; // Holds all of the callbacks that have registered for a specific key pattern diff --git a/src/store/actions/SessionActions.js b/src/store/actions/SessionActions.js index 9c4dc718a1485..7fe586bf485c8 100644 --- a/src/store/actions/SessionActions.js +++ b/src/store/actions/SessionActions.js @@ -1,9 +1,8 @@ -import * as _ from 'lodash'; +import _ from 'underscore'; import * as Store from '../Store'; import {request} from '../../lib/Network'; import ROUTES from '../../ROUTES'; import STOREKEYS from '../STOREKEYS'; -import * as PersistentStorage from '../../lib/PersistentStorage'; import CONFIG from '../../CONFIG'; /**