Destructure Lodash requires

app/attachments.js

@@ -1,9 +1,9 @@
 const crypto = require('crypto');
-const fse = require('fs-extra');
-const isArrayBuffer = require('lodash/isArrayBuffer');
-const isString = require('lodash/isString');
 const path = require('path');
+
+const fse = require('fs-extra');
 const toArrayBuffer = require('to-arraybuffer');
+const { isArrayBuffer, isString } = require('lodash');
 
 
 const PATH = 'attachments.noindex';

app/menu.js

@@ -1,4 +1,4 @@
-const isString = require('lodash/isString');
+const { isString } = require('lodash');
 
 
 exports.createTemplate = (options, messages) => {

js/modules/database.js

@@ -4,7 +4,7 @@
 // and using promises. Revisit use of `idb` dependency as it might cover
 // this functionality.
 
-const isObject = require('lodash/isObject');
+const { isObject } = require('lodash');
 
 
 exports.open = (name, version) => {

js/modules/debug.js

@@ -1,10 +1,12 @@
-const isFunction = require('lodash/isFunction');
+const {
-const isNumber = require('lodash/isNumber');
+  isFunction,
-const isObject = require('lodash/isObject');
+  isNumber,
-const isString = require('lodash/isString');
+  isObject,
-const random = require('lodash/random');
+  isString,
-const range = require('lodash/range');
+  random,
-const sample = require('lodash/sample');
+  range,
+  sample,
+} = require('lodash');
 
 const Message = require('./types/message');
 const { deferredToPromise } = require('./deferred_to_promise');

js/modules/messages_data_migrator.js

@@ -6,11 +6,13 @@
 
 /* global IDBKeyRange */
 
-const isFunction = require('lodash/isFunction');
+const {
-const isNumber = require('lodash/isNumber');
+  isFunction,
-const isObject = require('lodash/isObject');
+  isNumber,
-const isString = require('lodash/isString');
+  isObject,
-const last = require('lodash/last');
+  isString,
+  last,
+} = require('lodash');
 
 const database = require('./database');
 const Message = require('./types/message');

js/modules/migrations/migrations_0_database_with_attachment_data.js

@@ -1,4 +1,4 @@
-const last = require('lodash/last');
+const { last } = require('lodash');
 
 const { runMigrations } = require('./run_migrations');
 

js/modules/migrations/run_migrations.js

@@ -1,10 +1,13 @@
 /* eslint-env browser */
 
-const isFunction = require('lodash/isFunction');
+const {
-const isObject = require('lodash/isObject');
+  head,
-const isString = require('lodash/isString');
+  isFunction,
-const head = require('lodash/head');
+  isObject,
-const last = require('lodash/last');
+  isString,
+  last,
+} = require('lodash');
+
 
 const db = require('../database');
 const { deferredToPromise } = require('../deferred_to_promise');

js/modules/privacy.js

@@ -2,10 +2,12 @@
 
 const Path = require('path');
 
-const compose = require('lodash/fp/compose');
+const {
-const escapeRegExp = require('lodash/escapeRegExp');
+  escapeRegExp,
-const isRegExp = require('lodash/isRegExp');
+  isRegExp,
-const isString = require('lodash/isString');
+  isString,
+} = require('lodash');
+const { compose } = require('lodash/fp');
 
 
 const PHONE_NUMBER_PATTERN = /\+\d{7,12}(\d{3})/g;

js/modules/settings.js

@@ -1,5 +1,4 @@
-const isObject = require('lodash/isObject');
+const { isObject, isString } = require('lodash');
-const isString = require('lodash/isString');
 
 
 const ITEMS_STORE_NAME = 'items';

js/modules/types/attachment.js

@@ -1,5 +1,4 @@
-const isFunction = require('lodash/isFunction');
+const { isFunction, isString } = require('lodash');
-const isString = require('lodash/isString');
 
 const MIME = require('./mime');
 const { arrayBufferToBlob, blobToArrayBuffer, dataURLToBlob } = require('blob-util');

js/modules/types/attachment/migrate_data_to_file_system.js

@@ -1,7 +1,9 @@
-const isArrayBuffer = require('lodash/isArrayBuffer');
+const {
-const isFunction = require('lodash/isFunction');
+  isArrayBuffer,
-const isUndefined = require('lodash/isUndefined');
+  isFunction,
-const omit = require('lodash/omit');
+  isUndefined,
+  omit,
+} = require('lodash');
 
 
 // type Context :: {

js/modules/types/message.js

@@ -1,4 +1,4 @@
-const isFunction = require('lodash/isFunction');
+const { isFunction } = require('lodash');
 
 const Attachment = require('./attachment');
 const Errors = require('./errors');

js/modules/types/schema_version.js

@@ -1,4 +1,4 @@
-const isNumber = require('lodash/isNumber');
+const { isNumber } = require('lodash');
 
 
 exports.isValid = value =>