diff --git a/package-lock.json b/package-lock.json index a7865ac7dee0..60aa5ae48ebc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17039,11 +17039,6 @@ "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=" }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" - }, "lodash.orderby": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.orderby/-/lodash.orderby-4.6.0.tgz", @@ -21171,29 +21166,29 @@ } }, "react-native-onyx": { - "version": "git+https://github.com/Expensify/react-native-onyx.git#9c965c8bc7dd7c080cdcb79f54409e8cd8ee2d44", - "from": "git+https://github.com/Expensify/react-native-onyx.git#9c965c8bc7dd7c080cdcb79f54409e8cd8ee2d44", + "version": "git+https://github.com/Expensify/react-native-onyx.git#bd59626781393c93226fb80cb45569408e97b67c", + "from": "git+https://github.com/Expensify/react-native-onyx.git#bd59626781393c93226fb80cb45569408e97b67c", "requires": { "@react-native-community/async-storage": "^1.12.1", - "expensify-common": "git+https://github.com/Expensify/expensify-common.git#485113217cd319cd3b2185e14a5fd03d36b8d3e7", - "lodash.merge": "^4.6.2", + "expensify-common": "git+https://github.com/Expensify/expensify-common.git#c7becaa79e10c10da521261ebb83dd3871847e84", + "lodash": "4.17.21", "react": "^16.13.1", "underscore": "^1.11.0" }, "dependencies": { "expensify-common": { - "version": "git+https://github.com/Expensify/expensify-common.git#485113217cd319cd3b2185e14a5fd03d36b8d3e7", - "from": "git+https://github.com/Expensify/expensify-common.git#485113217cd319cd3b2185e14a5fd03d36b8d3e7", + "version": "git+https://github.com/Expensify/expensify-common.git#c7becaa79e10c10da521261ebb83dd3871847e84", + "from": "git+https://github.com/Expensify/expensify-common.git#c7becaa79e10c10da521261ebb83dd3871847e84", "requires": { "classnames": "2.2.5", "clipboard": "2.0.4", "html-entities": "^1.3.1", "jquery": "3.3.1", - "lodash.get": "4.4.2", - "lodash.has": "4.5.2", + "lodash": "4.17.21", "prop-types": "15.7.2", "react": "16.12.0", "react-dom": "16.12.0", + "semver": "^7.3.4", "simply-deferred": "git+https://github.com/Expensify/simply-deferred.git#77a08a95754660c7bd6e0b6979fdf84e8e831bf5", "underscore": "1.9.1" }, @@ -21215,6 +21210,11 @@ } } }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, "react-dom": { "version": "16.12.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.12.0.tgz", diff --git a/package.json b/package.json index 8ddf09c8bd8d..1f29a93d18e2 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "react-native-image-picker": "^2.3.3", "react-native-keyboard-spacer": "^0.4.1", "react-native-modal": "^11.5.6", - "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#9c965c8bc7dd7c080cdcb79f54409e8cd8ee2d44", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#bd59626781393c93226fb80cb45569408e97b67c", "react-native-pdf": "^6.2.2", "react-native-reanimated": "1.13.2", "react-native-picker-select": "8.0.4",