From 578e4f27702d66dcbc23292950a221ea00b008c8 Mon Sep 17 00:00:00 2001 From: Igor Yalovoy Date: Wed, 5 Feb 2020 04:07:08 +0800 Subject: [PATCH] Unify Lodash (#1420) * Unify lodash at CLI * Unify lodash at Lib * Unify lodash at CLI * Unify lodash at tests --- packages/cli/package.json | 78 --- packages/cli/src/bin/program.ts | 2 +- packages/cli/src/commands/call.ts | 4 +- packages/cli/src/commands/compile.ts | 4 +- packages/cli/src/commands/create.ts | 2 +- packages/cli/src/commands/create2.ts | 2 +- packages/cli/src/commands/push.ts | 3 +- packages/cli/src/commands/send-tx.ts | 2 +- packages/cli/src/commands/set-admin.ts | 2 +- packages/cli/src/commands/update.ts | 2 +- .../cli/src/interface/ValidationLogger.ts | 2 +- packages/cli/src/models/compiler/Compiler.ts | 2 +- .../compiler/solidity/CompilerProvider.ts | 5 +- .../solidity/SolidityContractsCompiler.ts | 2 +- .../solidity/SolidityProjectCompiler.ts | 6 +- .../cli/src/models/config/ConfigManager.ts | 4 +- .../cli/src/models/config/NetworkConfig.ts | 4 +- .../cli/src/models/config/TruffleConfig.ts | 3 +- .../cli/src/models/dependency/Dependency.ts | 6 +- .../cli/src/models/files/ManifestVersion.ts | 3 +- packages/cli/src/models/files/NetworkFile.ts | 9 +- packages/cli/src/models/files/ProjectFile.ts | 4 +- .../cli/src/models/local/LocalController.ts | 3 +- .../src/models/network/NetworkController.ts | 11 +- .../cli/src/models/network/ProjectDeployer.ts | 2 +- packages/cli/src/models/network/Session.ts | 5 +- .../models/network/TransactionController.ts | 4 +- packages/cli/src/prompts/choices.ts | 3 +- packages/cli/src/prompts/method-params.ts | 4 +- packages/cli/src/prompts/prompt.ts | 6 +- packages/cli/src/telemetry/index.ts | 2 +- packages/cli/src/utils/async.ts | 3 +- packages/cli/src/utils/input.ts | 4 +- packages/cli/src/utils/naming.ts | 2 +- packages/cli/test/scripts/create.test.js | 2 +- .../cli/test/scripts/query-deployment.test.js | 2 +- .../scripts/query-signed-deployment.test.js | 2 +- packages/cli/test/scripts/update.test.js | 3 +- packages/lib/package.json | 49 +- packages/lib/src/application/App.ts | 2 +- packages/lib/src/artifacts/BuildArtifacts.ts | 4 +- packages/lib/src/project/AppProject.ts | 4 +- packages/lib/src/project/BaseSimpleProject.ts | 2 +- packages/lib/src/proxy/ProxyAdmin.ts | 2 +- packages/lib/src/utils/Addresses.ts | 3 +- packages/lib/src/utils/ContractAST.ts | 7 +- packages/lib/src/utils/Logger.ts | 2 +- packages/lib/src/utils/Semver.ts | 2 +- packages/lib/src/utils/Transactions.ts | 2 +- packages/lib/src/validations/InitialValues.ts | 2 +- packages/lib/src/validations/Storage.ts | 4 +- packages/lib/src/validations/index.ts | 9 +- ...tializableAdminUpgradeabilityProxy.test.js | 2 +- .../UpgradeabilityProxy.behaviour.js | 2 +- .../lib/test/src/helpers/encodeCall.test.js | 2 +- .../test/src/project/AdminProxy.behaviour.js | 1 - .../src/project/ProxyAdminProject.test.js | 2 +- .../src/project/ProxyProject.behaviour.js | 2 +- .../test/src/project/SimpleProject.test.js | 2 +- .../lib/test/src/utils/Transactions.test.js | 2 +- .../lib/test/src/validations/Storage.test.js | 3 +- yarn.lock | 511 +----------------- 62 files changed, 68 insertions(+), 764 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 9289a2661..7f66e111a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -78,45 +78,6 @@ "inquirer": "^6.4.1", "is-url": "^1.2.4", "lockfile": "^1.0.4", - "lodash.castarray": "^4.4.0", - "lodash.compact": "^3.0.1", - "lodash.concat": "^4.5.0", - "lodash.difference": "^4.5.0", - "lodash.every": "^4.6.0", - "lodash.filter": "^4.6.0", - "lodash.find": "^4.6.0", - "lodash.findindex": "^4.6.0", - "lodash.flatmap": "^4.5.0", - "lodash.flatten": "^4.4.0", - "lodash.flattendeep": "^4.4.0", - "lodash.foreach": "^4.5.0", - "lodash.frompairs": "^4.0.1", - "lodash.groupby": "^4.6.0", - "lodash.intersection": "^4.4.0", - "lodash.isempty": "^4.4.0", - "lodash.isequal": "^4.5.0", - "lodash.isnil": "^4.0.0", - "lodash.isnull": "^3.0.0", - "lodash.isstring": "^4.0.1", - "lodash.isundefined": "^3.0.1", - "lodash.map": "^4.6.0", - "lodash.mapvalues": "^4.6.0", - "lodash.max": "^4.0.1", - "lodash.maxby": "^4.6.0", - "lodash.merge": "^4.6.1", - "lodash.negate": "^3.0.2", - "lodash.omit": "^4.5.0", - "lodash.omitby": "^4.6.0", - "lodash.partition": "^4.6.0", - "lodash.pick": "^4.4.0", - "lodash.pickby": "^4.6.0", - "lodash.reverse": "^4.0.1", - "lodash.sortby": "^4.7.0", - "lodash.topairs": "^4.3.0", - "lodash.uniq": "^4.5.0", - "lodash.uniqby": "^4.7.0", - "lodash.uniqwith": "^4.5.0", - "lodash.zipwith": "^4.2.0", "npm-programmatic": "0.0.12", "rlp": "^2.2.3", "semver": "^5.5.0", @@ -139,44 +100,6 @@ "devDependencies": { "@types/chai-as-promised": "^7.1.2", "@types/lodash": "^4.14.119", - "@types/lodash.castarray": "^4.4.6", - "@types/lodash.compact": "^3.0.6", - "@types/lodash.concat": "^4.5.6", - "@types/lodash.difference": "^4.5.6", - "@types/lodash.every": "^4.6.6", - "@types/lodash.filter": "^4.6.6", - "@types/lodash.find": "^4.6.6", - "@types/lodash.findindex": "^4.6.6", - "@types/lodash.flatmap": "^4.5.6", - "@types/lodash.flatten": "^4.4.6", - "@types/lodash.flattendeep": "^4.4.6", - "@types/lodash.foreach": "^4.5.6", - "@types/lodash.frompairs": "^4.0.6", - "@types/lodash.groupby": "^4.6.6", - "@types/lodash.intersection": "^4.4.6", - "@types/lodash.isempty": "^4.4.6", - "@types/lodash.isequal": "^4.5.5", - "@types/lodash.isnil": "^4.0.6", - "@types/lodash.isstring": "^4.0.6", - "@types/lodash.isundefined": "^3.0.6", - "@types/lodash.map": "^4.6.13", - "@types/lodash.mapvalues": "^4.6.6", - "@types/lodash.max": "^4.0.6", - "@types/lodash.maxby": "^4.6.6", - "@types/lodash.merge": "^4.6.6", - "@types/lodash.negate": "^3.0.6", - "@types/lodash.omit": "^4.5.6", - "@types/lodash.omitby": "^4.6.6", - "@types/lodash.partition": "^4.6.6", - "@types/lodash.pick": "^4.4.6", - "@types/lodash.pickby": "^4.6.6", - "@types/lodash.reverse": "^4.0.6", - "@types/lodash.sortby": "^4.7.6", - "@types/lodash.topairs": "^4.3.6", - "@types/lodash.uniq": "^4.5.6", - "@types/lodash.uniqby": "^4.7.6", - "@types/lodash.uniqwith": "^4.5.6", - "@types/lodash.zipwith": "^4.2.6", "@types/mocha": "^5.2.5", "@types/node": "^10.12.12", "@typescript-eslint/eslint-plugin": "^2.12.0", @@ -189,7 +112,6 @@ "eslint-config-prettier": "^4.3.0", "eslint-plugin-prettier": "^3.1.0", "ganache-cli": "^6.3.0", - "lodash.isnil": "^4.0.0", "lodash.mapkeys": "^4.6.0", "lodash.random": "^3.2.0", "mocha": "^6.2.2", diff --git a/packages/cli/src/bin/program.ts b/packages/cli/src/bin/program.ts index a96091ef3..3301cccda 100644 --- a/packages/cli/src/bin/program.ts +++ b/packages/cli/src/bin/program.ts @@ -2,7 +2,7 @@ import chalk from 'chalk'; import program from 'commander'; import { Loggy } from '@openzeppelin/upgrades'; import commands from '../commands'; -import sortBy from 'lodash.sortby'; +import { sortBy } from 'lodash'; // Do not use import here or Typescript will create wrong build folder // eslint-disable-next-line @typescript-eslint/no-var-requires diff --git a/packages/cli/src/commands/call.ts b/packages/cli/src/commands/call.ts index ee1d85fc9..81026e681 100644 --- a/packages/cli/src/commands/call.ts +++ b/packages/cli/src/commands/call.ts @@ -1,4 +1,4 @@ -import pickBy from 'lodash.pickby'; +import { pickBy } from 'lodash'; import { ContractMethodMutability as Mutability } from '@openzeppelin/upgrades'; import call from '../scripts/call'; @@ -12,7 +12,7 @@ import { InquirerQuestions, } from '../prompts/prompt'; import ConfigManager from '../models/config/ConfigManager'; -import { SendTxPropsParams, SendTxSelectionParams } from './interfaces'; +import { SendTxSelectionParams } from './interfaces'; import promptForMethodParams from '../prompts/method-params'; import Telemetry from '../telemetry'; diff --git a/packages/cli/src/commands/compile.ts b/packages/cli/src/commands/compile.ts index a0be31efd..1b2288304 100644 --- a/packages/cli/src/commands/compile.ts +++ b/packages/cli/src/commands/compile.ts @@ -3,7 +3,7 @@ import { CompileParams } from '../scripts/interfaces'; import { ProjectCompilerOptions } from '../models/compiler/ProjectCompilerOptions'; import Telemetry from '../telemetry'; import ProjectFile from '../models/files/ProjectFile'; -import isundefined from 'lodash.isundefined'; +import { isUndefined } from 'lodash'; import { promptIfNeeded } from '../prompts/prompt'; import { TypechainQuestions } from '../prompts/typechain'; @@ -66,7 +66,7 @@ async function action(options: CompileParams & { interactive: boolean }): Promis if ( !projectFile.compilerOptions || !projectFile.compilerOptions.typechain || - isundefined(projectFile.compilerOptions.typechain.enabled) + isUndefined(projectFile.compilerOptions.typechain.enabled) ) { const { typechainEnabled, typechainTarget, typechainOutdir } = await promptIfNeeded( { diff --git a/packages/cli/src/commands/create.ts b/packages/cli/src/commands/create.ts index 2104b89da..1cccff8e7 100644 --- a/packages/cli/src/commands/create.ts +++ b/packages/cli/src/commands/create.ts @@ -1,4 +1,4 @@ -import pickBy from 'lodash.pickby'; +import { pickBy } from 'lodash'; import { Loggy } from '@openzeppelin/upgrades'; import link from './link'; diff --git a/packages/cli/src/commands/create2.ts b/packages/cli/src/commands/create2.ts index 64e527e2f..63d5f5120 100644 --- a/packages/cli/src/commands/create2.ts +++ b/packages/cli/src/commands/create2.ts @@ -1,4 +1,4 @@ -import pickBy from 'lodash.pickby'; +import { pickBy } from 'lodash'; import { TxParams } from '@openzeppelin/upgrades'; diff --git a/packages/cli/src/commands/push.ts b/packages/cli/src/commands/push.ts index 5bbde7b99..ade2b2268 100644 --- a/packages/cli/src/commands/push.ts +++ b/packages/cli/src/commands/push.ts @@ -1,5 +1,4 @@ -import omit from 'lodash.omit'; -import isString from 'lodash.isstring'; +import { omit, isString } from 'lodash'; import { ZWeb3 } from '@openzeppelin/upgrades'; import add from './add'; diff --git a/packages/cli/src/commands/send-tx.ts b/packages/cli/src/commands/send-tx.ts index edc94f225..4b42dd7c8 100644 --- a/packages/cli/src/commands/send-tx.ts +++ b/packages/cli/src/commands/send-tx.ts @@ -1,4 +1,4 @@ -import pickBy from 'lodash.pickby'; +import { pickBy } from 'lodash'; import sendTx from '../scripts/send-tx'; import { SendTxParams } from '../scripts/interfaces'; diff --git a/packages/cli/src/commands/set-admin.ts b/packages/cli/src/commands/set-admin.ts index d2121a6fa..88d40b25f 100644 --- a/packages/cli/src/commands/set-admin.ts +++ b/packages/cli/src/commands/set-admin.ts @@ -1,4 +1,4 @@ -import pickBy from 'lodash.pickby'; +import { pickBy } from 'lodash'; import { ZWeb3 } from '@openzeppelin/upgrades'; import { parseContractReference } from '../utils/contract'; diff --git a/packages/cli/src/commands/update.ts b/packages/cli/src/commands/update.ts index 8cf8c20b2..bd2a3391e 100644 --- a/packages/cli/src/commands/update.ts +++ b/packages/cli/src/commands/update.ts @@ -1,4 +1,4 @@ -import pickBy from 'lodash.pickby'; +import { pickBy } from 'lodash'; import push from './push'; import update from '../scripts/update'; diff --git a/packages/cli/src/interface/ValidationLogger.ts b/packages/cli/src/interface/ValidationLogger.ts index 8be681523..dd052219a 100644 --- a/packages/cli/src/interface/ValidationLogger.ts +++ b/packages/cli/src/interface/ValidationLogger.ts @@ -1,5 +1,5 @@ import fs from 'fs'; -import isEmpty from 'lodash.isempty'; +import { isEmpty } from 'lodash'; import { Loggy, getStorageLayout, diff --git a/packages/cli/src/models/compiler/Compiler.ts b/packages/cli/src/models/compiler/Compiler.ts index 161d1f53b..f40a3eb75 100644 --- a/packages/cli/src/models/compiler/Compiler.ts +++ b/packages/cli/src/models/compiler/Compiler.ts @@ -6,7 +6,7 @@ import { ProjectCompilerOptions } from './ProjectCompilerOptions'; import findUp from 'find-up'; import ProjectFile from '../files/ProjectFile'; import { promisify } from 'util'; -import merge from 'lodash.merge'; +import { merge } from 'lodash'; import typechain from './Typechain'; const state = { alreadyCompiled: false }; diff --git a/packages/cli/src/models/compiler/solidity/CompilerProvider.ts b/packages/cli/src/models/compiler/solidity/CompilerProvider.ts index a0237a582..bd065a77c 100644 --- a/packages/cli/src/models/compiler/solidity/CompilerProvider.ts +++ b/packages/cli/src/models/compiler/solidity/CompilerProvider.ts @@ -3,10 +3,7 @@ import { mkdirp, readJson, writeJson } from 'fs-extra'; import axios from 'axios'; import solc, { CompilerOutput, Compiler, CompilerInput } from 'solc-wrapper'; import semver from 'semver'; -import reverse from 'lodash.reverse'; -import uniq from 'lodash.uniq'; -import compact from 'lodash.compact'; -import castArray from 'lodash.castarray'; +import { compact, castArray, reverse, uniq } from 'lodash'; import { Loggy } from '@openzeppelin/upgrades'; import { homedir } from 'os'; import path from 'path'; diff --git a/packages/cli/src/models/compiler/solidity/SolidityContractsCompiler.ts b/packages/cli/src/models/compiler/solidity/SolidityContractsCompiler.ts index 4bf445c6a..e4bad414b 100644 --- a/packages/cli/src/models/compiler/solidity/SolidityContractsCompiler.ts +++ b/packages/cli/src/models/compiler/solidity/SolidityContractsCompiler.ts @@ -1,5 +1,5 @@ import path from 'path'; -import flatMap from 'lodash.flatmap'; +import { flatMap } from 'lodash'; import semver from 'semver'; import { Loggy } from '@openzeppelin/upgrades'; import solc, { diff --git a/packages/cli/src/models/compiler/solidity/SolidityProjectCompiler.ts b/packages/cli/src/models/compiler/solidity/SolidityProjectCompiler.ts index d762998d8..3c12147d4 100644 --- a/packages/cli/src/models/compiler/solidity/SolidityProjectCompiler.ts +++ b/packages/cli/src/models/compiler/solidity/SolidityProjectCompiler.ts @@ -1,9 +1,5 @@ import path from 'path'; -import max from 'lodash.max'; -import maxBy from 'lodash.maxby'; -import pick from 'lodash.pick'; -import omitBy from 'lodash.omitby'; -import isUndefined from 'lodash.isundefined'; +import { max, maxBy, pick, omitBy, isUndefined } from 'lodash'; import { readJsonSync, ensureDirSync, readJSON, writeJson, unlink } from 'fs-extra'; import { statSync, existsSync, readdirSync, lstatSync } from 'fs'; import { Loggy, Contracts } from '@openzeppelin/upgrades'; diff --git a/packages/cli/src/models/config/ConfigManager.ts b/packages/cli/src/models/config/ConfigManager.ts index 86ff8a05d..d0453ac6b 100644 --- a/packages/cli/src/models/config/ConfigManager.ts +++ b/packages/cli/src/models/config/ConfigManager.ts @@ -3,9 +3,7 @@ import TruffleConfig from './TruffleConfig'; import { default as Session, SessionOptions } from '../network/Session'; import NetworkConfig from './NetworkConfig'; -import pick from 'lodash.pick'; -import pickBy from 'lodash.pickby'; -import isNil from 'lodash.isnil'; +import { pick, pickBy, isNil } from 'lodash'; const ConfigManager = { config: undefined, diff --git a/packages/cli/src/models/config/NetworkConfig.ts b/packages/cli/src/models/config/NetworkConfig.ts index 2d5294011..dbcba5ae3 100644 --- a/packages/cli/src/models/config/NetworkConfig.ts +++ b/packages/cli/src/models/config/NetworkConfig.ts @@ -1,8 +1,6 @@ import fs from 'fs'; import path from 'path'; -import pick from 'lodash.pick'; -import omitBy from 'lodash.omitby'; -import isUndefined from 'lodash.isundefined'; +import { pick, omitBy, isUndefined } from 'lodash'; interface NetworkConfigInterface extends ConfigInterface { artifactDefaults: ArtifactDefaults; diff --git a/packages/cli/src/models/config/TruffleConfig.ts b/packages/cli/src/models/config/TruffleConfig.ts index f277ba32a..fabb218b9 100644 --- a/packages/cli/src/models/config/TruffleConfig.ts +++ b/packages/cli/src/models/config/TruffleConfig.ts @@ -1,6 +1,5 @@ import fs from 'fs'; -import pickBy from 'lodash.pickby'; -import pick from 'lodash.pick'; +import { pickBy, pick } from 'lodash'; import npm from 'npm-programmatic'; import semver from 'semver'; import { Loggy } from '@openzeppelin/upgrades'; diff --git a/packages/cli/src/models/dependency/Dependency.ts b/packages/cli/src/models/dependency/Dependency.ts index bf0e98555..05f52721c 100644 --- a/packages/cli/src/models/dependency/Dependency.ts +++ b/packages/cli/src/models/dependency/Dependency.ts @@ -1,9 +1,5 @@ import fs from 'fs'; -import map from 'lodash.map'; -import uniq from 'lodash.uniq'; -import flatten from 'lodash.flatten'; -import fromPairs from 'lodash.frompairs'; -import toPairs from 'lodash.topairs'; +import { map, uniq, flatten, fromPairs, toPairs } from 'lodash'; import semver from 'semver'; import npm from 'npm-programmatic'; import { exec } from 'child_process'; diff --git a/packages/cli/src/models/files/ManifestVersion.ts b/packages/cli/src/models/files/ManifestVersion.ts index e2d1820c6..dab3763ca 100644 --- a/packages/cli/src/models/files/ManifestVersion.ts +++ b/packages/cli/src/models/files/ManifestVersion.ts @@ -1,5 +1,4 @@ -import isNull from 'lodash.isnull'; -import isUndefined from 'lodash.isundefined'; +import { isNull, isUndefined } from 'lodash'; const OPEN_ZEPPELIN = 'openzeppelin'; const CURRENT_MANIFEST_VERSION = ['2', '2']; diff --git a/packages/cli/src/models/files/NetworkFile.ts b/packages/cli/src/models/files/NetworkFile.ts index 9849dbb2e..60b6502d9 100644 --- a/packages/cli/src/models/files/NetworkFile.ts +++ b/packages/cli/src/models/files/NetworkFile.ts @@ -1,13 +1,6 @@ import fs from 'fs-extra'; import path from 'path'; -import findIndex from 'lodash.findindex'; -import isEmpty from 'lodash.isempty'; -import isEqual from 'lodash.isequal'; -import difference from 'lodash.difference'; -import flatMap from 'lodash.flatmap'; -import map from 'lodash.map'; -import filter from 'lodash.filter'; -import find from 'lodash.find'; +import { findIndex, isEmpty, isEqual, difference, flatMap, map, filter, find } from 'lodash'; import { Loggy, diff --git a/packages/cli/src/models/files/ProjectFile.ts b/packages/cli/src/models/files/ProjectFile.ts index d224604bc..41b79485b 100644 --- a/packages/cli/src/models/files/ProjectFile.ts +++ b/packages/cli/src/models/files/ProjectFile.ts @@ -1,8 +1,6 @@ import fs from 'fs-extra'; import path from 'path'; -import pickBy from 'lodash.pickby'; -import isEqual from 'lodash.isequal'; -import isEmpty from 'lodash.isempty'; +import { pickBy, isEqual, isEmpty } from 'lodash'; import { Loggy } from '@openzeppelin/upgrades'; import Dependency from '../dependency/Dependency'; diff --git a/packages/cli/src/models/local/LocalController.ts b/packages/cli/src/models/local/LocalController.ts index 378424cac..9bec7f550 100644 --- a/packages/cli/src/models/local/LocalController.ts +++ b/packages/cli/src/models/local/LocalController.ts @@ -1,6 +1,5 @@ import fs from 'fs-extra'; -import every from 'lodash.every'; -import map from 'lodash.map'; +import { every, map } from 'lodash'; import { Contracts, Loggy, diff --git a/packages/cli/src/models/network/NetworkController.ts b/packages/cli/src/models/network/NetworkController.ts index 3d821122a..007283d27 100644 --- a/packages/cli/src/models/network/NetworkController.ts +++ b/packages/cli/src/models/network/NetworkController.ts @@ -1,14 +1,5 @@ import fs from 'fs-extra'; -import isEmpty from 'lodash.isempty'; -import intersection from 'lodash.intersection'; -import difference from 'lodash.difference'; -import uniq from 'lodash.uniq'; -import filter from 'lodash.filter'; -import every from 'lodash.every'; -import partition from 'lodash.partition'; -import map from 'lodash.map'; -import concat from 'lodash.concat'; -import toPairs from 'lodash.topairs'; +import { isEmpty, intersection, difference, uniq, filter, every, partition, map, concat, toPairs } from 'lodash'; import toposort from 'toposort'; import { diff --git a/packages/cli/src/models/network/ProjectDeployer.ts b/packages/cli/src/models/network/ProjectDeployer.ts index a96eb2aa6..cefac4b77 100644 --- a/packages/cli/src/models/network/ProjectDeployer.ts +++ b/packages/cli/src/models/network/ProjectDeployer.ts @@ -1,4 +1,4 @@ -import forEach from 'lodash.foreach'; +import { forEach } from 'lodash'; import { AppProject, PackageProject, diff --git a/packages/cli/src/models/network/Session.ts b/packages/cli/src/models/network/Session.ts index 06c250b7c..b4d59edc5 100644 --- a/packages/cli/src/models/network/Session.ts +++ b/packages/cli/src/models/network/Session.ts @@ -1,8 +1,5 @@ import fs from 'fs-extra'; -import omitBy from 'lodash.omitby'; -import isEmpty from 'lodash.isempty'; -import pick from 'lodash.pick'; -import compact from 'lodash.compact'; +import { omitBy, isEmpty, pick, compact } from 'lodash'; import path from 'path'; import { Loggy } from '@openzeppelin/upgrades'; diff --git a/packages/cli/src/models/network/TransactionController.ts b/packages/cli/src/models/network/TransactionController.ts index 3547b2f77..488290cf8 100644 --- a/packages/cli/src/models/network/TransactionController.ts +++ b/packages/cli/src/models/network/TransactionController.ts @@ -1,6 +1,4 @@ -import isEmpty from 'lodash.isempty'; -import isUndefined from 'lodash.isundefined'; -import isNull from 'lodash.isnull'; +import { isEmpty, isUndefined, isNull } from 'lodash'; import { Contract, Transactions, Loggy, ZWeb3, TxParams, ABI } from '@openzeppelin/upgrades'; import { isValidUnit, prettifyTokenAmount, toWei, fromWei } from '../../utils/units'; diff --git a/packages/cli/src/prompts/choices.ts b/packages/cli/src/prompts/choices.ts index 81d546464..6af96af6c 100644 --- a/packages/cli/src/prompts/choices.ts +++ b/packages/cli/src/prompts/choices.ts @@ -1,7 +1,6 @@ import { Separator } from 'inquirer'; -import difference from 'lodash.difference'; -import flatten from 'lodash.flatten'; +import { difference, flatten } from 'lodash'; import ProjectFile from '../models/files/ProjectFile'; import ContractManager from '../models/local/ContractManager'; import Dependency from '../models/dependency/Dependency'; diff --git a/packages/cli/src/prompts/method-params.ts b/packages/cli/src/prompts/method-params.ts index 85418ab4f..ad4ef2ae2 100644 --- a/packages/cli/src/prompts/method-params.ts +++ b/packages/cli/src/prompts/method-params.ts @@ -1,7 +1,5 @@ import { ContractMethodMutability as Mutability } from '@openzeppelin/upgrades'; -import pickBy from 'lodash.pickby'; -import isUndefined from 'lodash.isundefined'; -import negate from 'lodash.negate'; +import { pickBy, isUndefined, negate } from 'lodash'; import { parseMethodParams, parseArg, getSampleInput } from '../utils/input'; import { promptIfNeeded, argsList, methodsList, InquirerQuestions, argLabel } from './prompt'; diff --git a/packages/cli/src/prompts/prompt.ts b/packages/cli/src/prompts/prompt.ts index 9308be1e0..daf37020a 100644 --- a/packages/cli/src/prompts/prompt.ts +++ b/packages/cli/src/prompts/prompt.ts @@ -1,8 +1,4 @@ -import uniqBy from 'lodash.uniqby'; -import flatten from 'lodash.flatten'; -import isEmpty from 'lodash.isempty'; -import groupBy from 'lodash.groupby'; -import difference from 'lodash.difference'; +import { uniqBy, flatten, isEmpty, groupBy } from 'lodash'; import inquirer from 'inquirer'; import { contractMethodsFromAbi, ContractMethodMutability as Mutability, ABI } from '@openzeppelin/upgrades'; diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts index c146ac57b..b5ed761f6 100644 --- a/packages/cli/src/telemetry/index.ts +++ b/packages/cli/src/telemetry/index.ts @@ -3,7 +3,7 @@ import uuid from 'uuid/v4'; import path from 'path'; import crypto from 'crypto'; import envPaths from 'env-paths'; -import mapValues from 'lodash.mapvalues'; +import { mapValues } from 'lodash'; import inquirer from 'inquirer'; import proc from 'child_process'; import process from 'process'; diff --git a/packages/cli/src/utils/async.ts b/packages/cli/src/utils/async.ts index 9a0eae376..7b1f83090 100644 --- a/packages/cli/src/utils/async.ts +++ b/packages/cli/src/utils/async.ts @@ -1,5 +1,4 @@ -import map from 'lodash.map'; -import isEmpty from 'lodash.isempty'; +import { map, isEmpty } from 'lodash'; export async function allPromisesOrError( promisesWithObjects: any[], diff --git a/packages/cli/src/utils/input.ts b/packages/cli/src/utils/input.ts index 7aafcc5cc..c8ec1c5d7 100644 --- a/packages/cli/src/utils/input.ts +++ b/packages/cli/src/utils/input.ts @@ -1,8 +1,8 @@ import BN from 'bignumber.js'; -import flattenDeep from 'lodash.flattendeep'; +import { flattenDeep } from 'lodash'; import { encodeParams, Loggy, ZWeb3 } from '@openzeppelin/upgrades'; import { MethodArgType } from '../prompts/prompt'; -import zipWith from 'lodash.zipwith'; +import { zipWith } from 'lodash'; import { isAddress, isHex } from 'web3-utils'; // TODO: Deprecate in favor of a combination of parseArg and parseArray diff --git a/packages/cli/src/utils/naming.ts b/packages/cli/src/utils/naming.ts index 08d7a43f8..faf46c6d7 100644 --- a/packages/cli/src/utils/naming.ts +++ b/packages/cli/src/utils/naming.ts @@ -1,4 +1,4 @@ -import pickBy from 'lodash.pickby'; +import { pickBy } from 'lodash'; export function toContractFullName(packageName: string, contractName: string): string { if (!packageName) return contractName; diff --git a/packages/cli/test/scripts/create.test.js b/packages/cli/test/scripts/create.test.js index 0cac97154..cdad14f32 100644 --- a/packages/cli/test/scripts/create.test.js +++ b/packages/cli/test/scripts/create.test.js @@ -1,7 +1,7 @@ 'use strict'; require('../setup'); -import random from 'lodash.random'; +import { random } from 'lodash'; import { accounts } from '@openzeppelin/test-environment'; import CaptureLogs from '../helpers/captureLogs'; diff --git a/packages/cli/test/scripts/query-deployment.test.js b/packages/cli/test/scripts/query-deployment.test.js index f942cdd62..5af78470c 100644 --- a/packages/cli/test/scripts/query-deployment.test.js +++ b/packages/cli/test/scripts/query-deployment.test.js @@ -1,7 +1,7 @@ 'use strict'; require('../setup'); -import random from 'lodash.random'; +import { random } from 'lodash'; import { accounts } from '@openzeppelin/test-environment'; import queryDeployment from '../../src/scripts/query-deployment'; diff --git a/packages/cli/test/scripts/query-signed-deployment.test.js b/packages/cli/test/scripts/query-signed-deployment.test.js index 2a94382ce..01031bcd3 100644 --- a/packages/cli/test/scripts/query-signed-deployment.test.js +++ b/packages/cli/test/scripts/query-signed-deployment.test.js @@ -1,7 +1,7 @@ 'use strict'; require('../setup'); -import random from 'lodash.random'; +import { random } from 'lodash'; import { accounts } from '@openzeppelin/test-environment'; import querySignedDeployment from '../../src/scripts/query-signed-deployment'; diff --git a/packages/cli/test/scripts/update.test.js b/packages/cli/test/scripts/update.test.js index 9278d28d9..f43446aa9 100644 --- a/packages/cli/test/scripts/update.test.js +++ b/packages/cli/test/scripts/update.test.js @@ -1,8 +1,7 @@ 'use strict'; require('../setup'); -import mapKeys from 'lodash.mapkeys'; -import omit from 'lodash.omit'; +import { mapKeys, omit } from 'lodash'; import { Contracts, Proxy } from '@openzeppelin/upgrades'; import { accounts } from '@openzeppelin/test-environment'; diff --git a/packages/lib/package.json b/packages/lib/package.json index d3a090fb3..96e384d6e 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -62,27 +62,7 @@ "chalk": "^2.4.1", "ethers": "^4.0.20", "glob": "^7.1.3", - "lodash.concat": "^4.5.0", - "lodash.difference": "^4.5.0", - "lodash.every": "^4.6.0", - "lodash.findlast": "^4.6.0", - "lodash.flatten": "^4.4.0", - "lodash.includes": "^4.3.0", - "lodash.invertby": "^4.7.0", - "lodash.isempty": "^4.4.0", - "lodash.isequal": "^4.5.0", - "lodash.isstring": "^4.0.1", - "lodash.keys": "^4.2.0", - "lodash.map": "^4.6.0", - "lodash.omit": "^4.5.0", - "lodash.pick": "^4.4.0", - "lodash.pickby": "^4.6.0", - "lodash.random": "^3.2.0", - "lodash.reverse": "^4.0.1", - "lodash.some": "^4.6.0", - "lodash.uniq": "^4.5.0", - "lodash.values": "^4.3.0", - "lodash.without": "^4.4.0", + "lodash": "^4.17.15", "semver": "^5.5.1", "solidity-docgen": "^0.3.5", "spinnies": "^0.4.2", @@ -95,27 +75,7 @@ "devDependencies": { "@openzeppelin/test-environment": "^0.1.0", "@openzeppelin/test-helpers": "^0.5.4", - "@types/lodash.concat": "^4.5.6", - "@types/lodash.difference": "^4.5.6", - "@types/lodash.every": "^4.6.6", - "@types/lodash.findlast": "^4.6.6", - "@types/lodash.flatten": "^4.4.6", - "@types/lodash.includes": "^4.3.6", - "@types/lodash.invertby": "^4.7.6", - "@types/lodash.isempty": "^4.4.6", - "@types/lodash.isequal": "^4.5.5", - "@types/lodash.isstring": "^4.0.6", - "@types/lodash.keys": "^4.2.6", - "@types/lodash.map": "^4.6.13", - "@types/lodash.omit": "^4.5.6", - "@types/lodash.pick": "^4.4.6", - "@types/lodash.pickby": "^4.6.6", - "@types/lodash.random": "^3.2.6", - "@types/lodash.reverse": "^4.0.6", - "@types/lodash.some": "^4.6.6", - "@types/lodash.uniq": "^4.5.6", - "@types/lodash.values": "^4.3.6", - "@types/lodash.without": "^4.4.6", + "@types/lodash": "^4.14.149", "@types/mocha": "^5.2.5", "@types/node": "^10.12.12", "@typescript-eslint/eslint-plugin": "^2.12.0", @@ -128,11 +88,6 @@ "eslint-config-prettier": "^4.3.0", "eslint-plugin-prettier": "^3.1.0", "ganache-core": "^2.5.1", - "lodash.foreach": "^4.5.0", - "lodash.mapkeys": "^4.6.0", - "lodash.noop": "^3.0.1", - "lodash.times": "^4.3.2", - "lodash.zipwith": "^4.2.0", "mocha": "^6.2.2", "mock-dependency": "file:test/mocks/mock-dependency", "mock-solc-0.6": "file:test/mocks/mock-solc-0.6", diff --git a/packages/lib/src/application/App.ts b/packages/lib/src/application/App.ts index 090420d86..79f141942 100644 --- a/packages/lib/src/application/App.ts +++ b/packages/lib/src/application/App.ts @@ -1,4 +1,4 @@ -import isEmpty from 'lodash.isempty'; +import { isEmpty } from 'lodash'; import { Loggy } from '../utils/Logger'; import Proxy from '../proxy/Proxy'; diff --git a/packages/lib/src/artifacts/BuildArtifacts.ts b/packages/lib/src/artifacts/BuildArtifacts.ts index e7af72fa0..4751d3c5d 100644 --- a/packages/lib/src/artifacts/BuildArtifacts.ts +++ b/packages/lib/src/artifacts/BuildArtifacts.ts @@ -1,7 +1,5 @@ import fs from 'fs-extra'; -import keys from 'lodash.keys'; -import flatten from 'lodash.flatten'; -import values from 'lodash.values'; +import { keys, flatten, values } from 'lodash'; import Contracts from './Contracts'; diff --git a/packages/lib/src/project/AppProject.ts b/packages/lib/src/project/AppProject.ts index 845b32a0c..79c065b19 100644 --- a/packages/lib/src/project/AppProject.ts +++ b/packages/lib/src/project/AppProject.ts @@ -1,6 +1,4 @@ -import concat from 'lodash.concat'; -import map from 'lodash.map'; -import isEmpty from 'lodash.isempty'; +import { concat, map, isEmpty } from 'lodash'; import App from '../application/App'; import Package from '../application/Package'; diff --git a/packages/lib/src/project/BaseSimpleProject.ts b/packages/lib/src/project/BaseSimpleProject.ts index 08c1f00c4..57e53012d 100644 --- a/packages/lib/src/project/BaseSimpleProject.ts +++ b/packages/lib/src/project/BaseSimpleProject.ts @@ -1,4 +1,4 @@ -import isEmpty from 'lodash.isempty'; +import { isEmpty } from 'lodash'; import Proxy from '../proxy/Proxy'; import { Loggy } from '../utils/Logger'; diff --git a/packages/lib/src/proxy/ProxyAdmin.ts b/packages/lib/src/proxy/ProxyAdmin.ts index 9a88e8433..183794443 100644 --- a/packages/lib/src/proxy/ProxyAdmin.ts +++ b/packages/lib/src/proxy/ProxyAdmin.ts @@ -1,4 +1,4 @@ -import isEmpty from 'lodash.isempty'; +import { isEmpty } from 'lodash'; import { Loggy } from '../utils/Logger'; import Contracts from '../artifacts/Contracts'; diff --git a/packages/lib/src/utils/Addresses.ts b/packages/lib/src/utils/Addresses.ts index 65f436a2c..77618f9e0 100644 --- a/packages/lib/src/utils/Addresses.ts +++ b/packages/lib/src/utils/Addresses.ts @@ -1,5 +1,4 @@ -import isEmpty from 'lodash.isempty'; -import isString from 'lodash.isstring'; +import { isEmpty, isString } from 'lodash'; import utils from 'web3-utils'; export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; diff --git a/packages/lib/src/utils/ContractAST.ts b/packages/lib/src/utils/ContractAST.ts index d580360af..e02043670 100644 --- a/packages/lib/src/utils/ContractAST.ts +++ b/packages/lib/src/utils/ContractAST.ts @@ -1,9 +1,4 @@ -import some from 'lodash.some'; -import reverse from 'lodash.reverse'; -import includes from 'lodash.includes'; -import isEqual from 'lodash.isequal'; -import pick from 'lodash.pick'; -import flatten from 'lodash.flatten'; +import { some, reverse, includes, isEqual, pick, flatten } from 'lodash'; import { getBuildArtifacts, BuildArtifacts } from '../artifacts/BuildArtifacts'; import Contract from '../artifacts/Contract'; diff --git a/packages/lib/src/utils/Logger.ts b/packages/lib/src/utils/Logger.ts index 6ac22d852..7ded6d68b 100644 --- a/packages/lib/src/utils/Logger.ts +++ b/packages/lib/src/utils/Logger.ts @@ -1,5 +1,5 @@ import path from 'path'; -import pickBy from 'lodash.pickby'; +import { pickBy } from 'lodash'; import chalk from 'chalk'; import Spinnies from 'spinnies'; diff --git a/packages/lib/src/utils/Semver.ts b/packages/lib/src/utils/Semver.ts index a1cb552d4..2aadf0104 100644 --- a/packages/lib/src/utils/Semver.ts +++ b/packages/lib/src/utils/Semver.ts @@ -1,5 +1,5 @@ import semver from 'semver'; -import isString from 'lodash.isstring'; +import { isString } from 'lodash'; import util from 'util'; // TS-TODO: use typed SemVer dependency, some of these methods may actually diff --git a/packages/lib/src/utils/Transactions.ts b/packages/lib/src/utils/Transactions.ts index bbc7ea6cd..443945aac 100644 --- a/packages/lib/src/utils/Transactions.ts +++ b/packages/lib/src/utils/Transactions.ts @@ -5,7 +5,7 @@ // (see https://github.com/trufflesuite/truffle-contract/pull/95/files#diff-26bcc3534c5a2e62e22643287a7d3295R145) import axios from 'axios'; -import omit from 'lodash.omit'; +import { omit } from 'lodash'; import BN from 'bignumber.js'; import sleep from '../helpers/sleep'; import ZWeb3 from '../artifacts/ZWeb3'; diff --git a/packages/lib/src/validations/InitialValues.ts b/packages/lib/src/validations/InitialValues.ts index 6e12a49c2..aa1af747a 100644 --- a/packages/lib/src/validations/InitialValues.ts +++ b/packages/lib/src/validations/InitialValues.ts @@ -1,4 +1,4 @@ -import isEmpty from 'lodash.isempty'; +import { isEmpty } from 'lodash'; import Contracts from '../artifacts/Contracts'; import Contract from '../artifacts/Contract.js'; import { Node } from '../utils/ContractAST'; diff --git a/packages/lib/src/validations/Storage.ts b/packages/lib/src/validations/Storage.ts index 2f5d8aa19..54bf954d7 100644 --- a/packages/lib/src/validations/Storage.ts +++ b/packages/lib/src/validations/Storage.ts @@ -1,6 +1,4 @@ -import some from 'lodash.some'; -import isEqual from 'lodash.isequal'; -import reverse from 'lodash.reverse'; +import { some, isEqual, reverse } from 'lodash'; import path from 'path'; import process from 'process'; import { getBuildArtifacts } from '../artifacts/BuildArtifacts'; diff --git a/packages/lib/src/validations/index.ts b/packages/lib/src/validations/index.ts index 14dc1fd9e..fbc713e8e 100644 --- a/packages/lib/src/validations/index.ts +++ b/packages/lib/src/validations/index.ts @@ -1,12 +1,5 @@ -import difference from 'lodash.difference'; -import every from 'lodash.every'; -import isEmpty from 'lodash.isempty'; -import pick from 'lodash.pick'; -import values from 'lodash.values'; -import flatten from 'lodash.flatten'; -import uniq from 'lodash.uniq'; +import { difference, every, isEmpty, pick, values, flatten, uniq } from 'lodash'; -import { Loggy, SpinnerAction, LogType } from '../utils/Logger'; import { hasConstructor } from './Constructors'; import { hasSelfDestruct, hasDelegateCall } from './Instructions'; import { getStorageLayout, getStructsOrEnums } from './Storage'; diff --git a/packages/lib/test/contracts/upgradeability/InitializableAdminUpgradeabilityProxy.test.js b/packages/lib/test/contracts/upgradeability/InitializableAdminUpgradeabilityProxy.test.js index aa1ffb008..376fb819b 100644 --- a/packages/lib/test/contracts/upgradeability/InitializableAdminUpgradeabilityProxy.test.js +++ b/packages/lib/test/contracts/upgradeability/InitializableAdminUpgradeabilityProxy.test.js @@ -4,7 +4,7 @@ require('../../setup'); import { accounts } from '@openzeppelin/test-environment'; -import omit from 'lodash.omit'; +import { omit } from 'lodash'; import assertRevert from '../../../src/test/helpers/assertRevert'; import Contracts from '../../../src/artifacts/Contracts'; diff --git a/packages/lib/test/contracts/upgradeability/UpgradeabilityProxy.behaviour.js b/packages/lib/test/contracts/upgradeability/UpgradeabilityProxy.behaviour.js index 6cbfbe603..1852c0673 100644 --- a/packages/lib/test/contracts/upgradeability/UpgradeabilityProxy.behaviour.js +++ b/packages/lib/test/contracts/upgradeability/UpgradeabilityProxy.behaviour.js @@ -2,7 +2,7 @@ require('../../setup'); -import without from 'lodash.without'; +import { without } from 'lodash'; import Proxy from '../../../src/proxy/Proxy'; import ZWeb3 from '../../../src/artifacts/ZWeb3'; diff --git a/packages/lib/test/src/helpers/encodeCall.test.js b/packages/lib/test/src/helpers/encodeCall.test.js index 2d7f0fe25..6eb90e7df 100644 --- a/packages/lib/test/src/helpers/encodeCall.test.js +++ b/packages/lib/test/src/helpers/encodeCall.test.js @@ -1,7 +1,7 @@ require('../../setup'); import BN from 'bignumber.js'; -import zipWith from 'lodash.zipwith'; +import { zipWith } from 'lodash'; import encodeCall, { decodeCall } from '../../../src/helpers/encodeCall'; import { expect } from 'chai'; diff --git a/packages/lib/test/src/project/AdminProxy.behaviour.js b/packages/lib/test/src/project/AdminProxy.behaviour.js index e61bd580f..02af2301e 100644 --- a/packages/lib/test/src/project/AdminProxy.behaviour.js +++ b/packages/lib/test/src/project/AdminProxy.behaviour.js @@ -4,7 +4,6 @@ require('../../setup'); import Proxy from '../../../src/proxy/Proxy'; import Contracts from '../../../src/artifacts/Contracts'; import { toAddress } from '../../../src/utils/Addresses'; -import random from 'lodash.random'; const Impl = Contracts.getFromLocal('Impl'); const DummyImplementation = Contracts.getFromLocal('DummyImplementation'); diff --git a/packages/lib/test/src/project/ProxyAdminProject.test.js b/packages/lib/test/src/project/ProxyAdminProject.test.js index 63dc3ba6c..f20ecbfe3 100644 --- a/packages/lib/test/src/project/ProxyAdminProject.test.js +++ b/packages/lib/test/src/project/ProxyAdminProject.test.js @@ -10,7 +10,7 @@ import shouldManageDependencies from './DependenciesProject.behaviour'; import shouldManageImplementations from './Implementations.behaviour'; import shouldManageAdminProxy from './AdminProxy.behaviour'; import Contracts from '../../../src/artifacts/Contracts'; -import noop from 'lodash.noop'; +import { noop } from 'lodash'; const ImplV1 = Contracts.getFromLocal('DummyImplementation'); const ImplV2 = Contracts.getFromLocal('DummyImplementationV2'); diff --git a/packages/lib/test/src/project/ProxyProject.behaviour.js b/packages/lib/test/src/project/ProxyProject.behaviour.js index 3689736c5..891102645 100644 --- a/packages/lib/test/src/project/ProxyProject.behaviour.js +++ b/packages/lib/test/src/project/ProxyProject.behaviour.js @@ -5,7 +5,7 @@ import Proxy from '../../../src/proxy/Proxy'; import Contracts from '../../../src/artifacts/Contracts'; import { toAddress } from '../../../src/utils/Addresses'; import { signDeploy, signer } from '../../../src/test/helpers/signing'; -import random from 'lodash.random'; +import { random } from 'lodash'; import MinimalProxy from '../../../src/proxy/MinimalProxy'; const Impl = Contracts.getFromLocal('Impl'); diff --git a/packages/lib/test/src/project/SimpleProject.test.js b/packages/lib/test/src/project/SimpleProject.test.js index 618396c61..603fc1af3 100644 --- a/packages/lib/test/src/project/SimpleProject.test.js +++ b/packages/lib/test/src/project/SimpleProject.test.js @@ -7,7 +7,7 @@ import SimpleProject from '../../../src/project/SimpleProject'; import shouldManageProxies from './ProxyProject.behaviour'; import shouldManageDependencies from './DependenciesProject.behaviour'; import shouldManageImplementations from './Implementations.behaviour'; -import noop from 'lodash.noop'; +import { noop } from 'lodash'; import Contracts from '../../../src/artifacts/Contracts'; const ImplV1 = Contracts.getFromLocal('DummyImplementation'); diff --git a/packages/lib/test/src/utils/Transactions.test.js b/packages/lib/test/src/utils/Transactions.test.js index 10927feda..3ee44bc8f 100644 --- a/packages/lib/test/src/utils/Transactions.test.js +++ b/packages/lib/test/src/utils/Transactions.test.js @@ -3,7 +3,7 @@ require('../../setup'); import { accounts } from '@openzeppelin/test-environment'; -import times from 'lodash.times'; +import { times } from 'lodash'; import sinon from 'sinon'; import axios from 'axios'; import { setInterval } from 'timers'; diff --git a/packages/lib/test/src/validations/Storage.test.js b/packages/lib/test/src/validations/Storage.test.js index 6548839dc..e2837720c 100644 --- a/packages/lib/test/src/validations/Storage.test.js +++ b/packages/lib/test/src/validations/Storage.test.js @@ -3,8 +3,7 @@ require('../../setup'); import util from 'util'; -import forEach from 'lodash.foreach'; -import mapKeys from 'lodash.mapkeys'; +import { forEach, mapKeys } from 'lodash'; import Contracts from '../../../src/artifacts/Contracts'; import { getStorageLayout, getStructsOrEnums } from '../../../src/validations/Storage'; diff --git a/yarn.lock b/yarn.lock index 7cddc998c..c92ac79ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1348,337 +1348,15 @@ version "7.0.3" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636" -"@types/lodash.castarray@^4.4.6": - version "4.4.6" - resolved "https://registry.yarnpkg.com/@types/lodash.castarray/-/lodash.castarray-4.4.6.tgz#cf0e1bf49b5a3338bcc267f82d793d77a33f4bec" - integrity sha512-GtyMY4tqdRn6Mv/70+XGiVSdfgDkGzZ78hHhugNQl5ek+4z1PosFYwo0VH3nQgQzUgEUdad+W0CFm7Wbd75G+A== - dependencies: - "@types/lodash" "*" - -"@types/lodash.compact@^3.0.6": - version "3.0.6" - resolved "https://registry.yarnpkg.com/@types/lodash.compact/-/lodash.compact-3.0.6.tgz#a4c356372f51fb39ff48eb4f014a19f39f674ab5" - integrity sha512-0pDKTX4alTyxH85Y5Al4YzS8oriqBQykADW6zLAHkZwNBMPXFIhdE2ctg0Z2GVcZsABxo5CI/J3vmHrFkdQBfA== - dependencies: - "@types/lodash" "*" - -"@types/lodash.concat@^4.5.6": - version "4.5.6" - resolved "https://registry.yarnpkg.com/@types/lodash.concat/-/lodash.concat-4.5.6.tgz#16c73478a594a64dae69e9d6ce226c6b247718b3" - integrity sha512-+lqeeYa0dMF4i69hl34QaqIkRqmHKQwiYrWSKX/WhoHg672dN8fykAkNDTgl3xDEFPT435T4dp9YTG4Mi/UqBQ== - dependencies: - "@types/lodash" "*" - -"@types/lodash.difference@^4.5.6": - version "4.5.6" - resolved "https://registry.yarnpkg.com/@types/lodash.difference/-/lodash.difference-4.5.6.tgz#41ec5c4e684eeacf543848a9a1b2a4856ccf9853" - integrity sha512-wXH53r+uoUCrKhmh7S5Gf6zo3vpsx/zH2R4pvkmDlmopmMTCROAUXDpPMXATGCWkCjE6ik3VZzZUxBgMjZho9Q== - dependencies: - "@types/lodash" "*" - -"@types/lodash.every@^4.6.6": - version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.every/-/lodash.every-4.6.6.tgz#90d4d5394b8d8ec9b066f58d62fe12ac36b8627d" - integrity sha512-eZC30bvV8GtmVUcMMhdAS+C2VgmkLMhnLyjTlf2lsPxhiquHfr/f0EnlX20l4xQWXG3B7H+OTSoWPqONyCeD2Q== - dependencies: - "@types/lodash" "*" - -"@types/lodash.filter@^4.6.6": - version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.filter/-/lodash.filter-4.6.6.tgz#34d93d3d40b2585384a12093eb4bdf2a26cbb829" - integrity sha512-K9oEglaInmu7pnQnZYdciNePpKe0W7O9yssnCza9mLjpq5N5Ju8RIMwTvp9tovb8V5yemxFTJqHzG+tIkAl1xw== - dependencies: - "@types/lodash" "*" - -"@types/lodash.find@^4.6.6": - version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.find/-/lodash.find-4.6.6.tgz#9b298092ff15642ddf0c6b04d9e0a2f3c49ac845" - integrity sha512-rpfXWzKWaw12XMcdQYA7f0xVmkXwJkhPPON69pGVFNYF6/66CduGyLiYnoZk1xBOvGwMnmyrCZ/yJewPO4OMeg== - dependencies: - "@types/lodash" "*" - -"@types/lodash.findindex@^4.6.6": - version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.findindex/-/lodash.findindex-4.6.6.tgz#36079decaaab8bcdcfb86cd5f3c0f20aca908691" - integrity sha512-quPh7tw70yhryaubH6wBvgIQgeU1PFjdoT4eaW6WCKzjIlxgImLKIv4bvJhMTUlRkMgf5VAfECKKXKuB8cexgw== - dependencies: - "@types/lodash" "*" - -"@types/lodash.findlast@^4.6.6": - version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.findlast/-/lodash.findlast-4.6.6.tgz#7c2ad85abb4623ca0a287d4c10b06d9150f73a8f" - integrity sha512-HsEybos8Y6zVK+Okj821O4WTmUtgVzPeZOYNgDCt+vqF8NopjdXXhk8ksLiR8vZUzmU7CBoKeBmxqybLmpPXDw== - dependencies: - "@types/lodash" "*" - -"@types/lodash.flatmap@^4.5.6": - version "4.5.6" - resolved "https://registry.yarnpkg.com/@types/lodash.flatmap/-/lodash.flatmap-4.5.6.tgz#5f1ea80cebe403f0fbfcc1b5ad75cd09dd8b5785" - integrity sha512-ELNrUL9q+MB7AACaHivWIsKDFDgYhHE3/svXhqvDJgONtn2c467Cy87nEb7CEDvfaGCPv91lPaW596I8s5oiNQ== - dependencies: - "@types/lodash" "*" - -"@types/lodash.flatten@^4.4.6": - version "4.4.6" - resolved "https://registry.yarnpkg.com/@types/lodash.flatten/-/lodash.flatten-4.4.6.tgz#b74c3267c87e44e603137d4621e8a9396b6551f5" - integrity sha512-omCBl4M8EJSmf2DZqh4/zwjgXQpzC7YO/PXTcG8rI9r7xun8CohrHeNx8HZRkqWc61uJfIaZop9MwJEXPVssHw== - dependencies: - "@types/lodash" "*" - -"@types/lodash.flattendeep@^4.4.6": - version "4.4.6" - resolved "https://registry.yarnpkg.com/@types/lodash.flattendeep/-/lodash.flattendeep-4.4.6.tgz#2686d9161ae6c3d56d6745fa118308d88562ae53" - integrity sha512-uLm2MaRVlqJSGsMK0RZpP5T3KqReq+9WbYDHCUhBhp98v56hMG/Yht52bsoTSui9xz2mUvQ9NfG3LrNGDL92Ng== - dependencies: - "@types/lodash" "*" - -"@types/lodash.foreach@^4.5.6": - version "4.5.6" - resolved "https://registry.yarnpkg.com/@types/lodash.foreach/-/lodash.foreach-4.5.6.tgz#24735299139a739e436ab4fb8a6a31ca3d54bbb3" - integrity sha512-A8+157A+27zwJSstmW/eWPc9lHLJNEer4jiMlsyxWieBxEx0arwB9vgQm+iai6DEDYYQuufHrzVhQOiapCalQQ== - dependencies: - "@types/lodash" "*" - -"@types/lodash.frompairs@^4.0.6": - version "4.0.6" - resolved "https://registry.yarnpkg.com/@types/lodash.frompairs/-/lodash.frompairs-4.0.6.tgz#09b082c10fa753dc2001302b75ac79ca1e0a9ea3" - integrity sha512-rwCUf4NMKhXpiVjL/RXP8YOk+rd02/J4tACADEgaMXRVnzDbSSlBMKFZoX/ARmHVLg3Qc98Um4PErGv8FbxU7w== - dependencies: - "@types/lodash" "*" - -"@types/lodash.groupby@^4.6.6": - version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.groupby/-/lodash.groupby-4.6.6.tgz#4d9b61a4d8b0d83d384975cabfed4c1769d6792e" - integrity sha512-kwg3T7Ia63KtDNoQQR8hKrLHCAgrH4I44l5uEMuA6JCbj7DiSccaV4tNV1vbjtAOpX990SolVthJCmBVtRVRgw== - dependencies: - "@types/lodash" "*" - -"@types/lodash.includes@^4.3.6": - version "4.3.6" - resolved "https://registry.yarnpkg.com/@types/lodash.includes/-/lodash.includes-4.3.6.tgz#47a806f9dd6ad5ebe35cfd46096db348420c3fb0" - integrity sha512-YzujoN0s409VTzdsQc7JYa7jHGV9YuYhGWIhzuEaZNSCKFuJD636tghbjq7R9xdjjbTnmiDeV/DnCurVSxVVxQ== - dependencies: - "@types/lodash" "*" - -"@types/lodash.intersection@^4.4.6": - version "4.4.6" - resolved "https://registry.yarnpkg.com/@types/lodash.intersection/-/lodash.intersection-4.4.6.tgz#0fb241badf6edbb2a7d194a70c50e950e2486e68" - integrity sha512-6ewsKax7+HgT+7mEhzXT6tIyIHc/mjCwZJnarvLbCrtW21qmDQHWbaJj4Ht4DQDBmMdnvZe8APuVlsMpZ5E5mQ== - dependencies: - "@types/lodash" "*" - -"@types/lodash.invertby@^4.7.6": - version "4.7.6" - resolved "https://registry.yarnpkg.com/@types/lodash.invertby/-/lodash.invertby-4.7.6.tgz#63fdd2f9b95ba7abc987863d891c0b50ad917156" - integrity sha512-E01+2RqtQMIJffUtYTv1S+ErIvcnSHAk0h781I5RJcA+1UE/3Q5nA7JgD3L7pgu4H/F/bz8wtYubpCo1/d/nQg== - dependencies: - "@types/lodash" "*" - -"@types/lodash.isempty@^4.4.6": - version "4.4.6" - resolved "https://registry.yarnpkg.com/@types/lodash.isempty/-/lodash.isempty-4.4.6.tgz#48a5576985727d9b85d59a60199d6b11ac756a3e" - integrity sha512-AauKrFlA4z3Usog5HLGDupKzkCP7h5KXGlfAcRGUfvTmL7guVuEzDSNI6lYJ7syO7J2RE2F47179pSLr26UHIw== - dependencies: - "@types/lodash" "*" - -"@types/lodash.isequal@^4.5.5": - version "4.5.5" - resolved "https://registry.yarnpkg.com/@types/lodash.isequal/-/lodash.isequal-4.5.5.tgz#4fed1b1b00bef79e305de0352d797e9bb816c8ff" - integrity sha512-4IKbinG7MGP131wRfceK6W4E/Qt3qssEFLF30LnJbjYiSfHGGRU/Io8YxXrZX109ir+iDETC8hw8QsDijukUVg== - dependencies: - "@types/lodash" "*" - -"@types/lodash.isnil@^4.0.6": - version "4.0.6" - resolved "https://registry.yarnpkg.com/@types/lodash.isnil/-/lodash.isnil-4.0.6.tgz#ff6f07010a69a969c32d5981832cdb4d990ccabf" - integrity sha512-K+9ZVqwWUFKxijX7rPGnrubfTtCQ5VwW0xgPCL5iLBBLg5sUFFXdPG3QxkpGNJil8mgttRqNLSWNweEsUrBXTg== - dependencies: - "@types/lodash" "*" - -"@types/lodash.isstring@^4.0.6": - version "4.0.6" - resolved "https://registry.yarnpkg.com/@types/lodash.isstring/-/lodash.isstring-4.0.6.tgz#1534d0c19a2ad79caa17558a298e366893ffd08c" - integrity sha512-uUGvF9G1G7jQ5H42Y38GA9rZmUoY8wI/OMSwnW0BZA+Ra0uxzpuQf4CixXl3yG3TvF6LjuduMyt1WvKl+je8QA== - dependencies: - "@types/lodash" "*" - -"@types/lodash.isundefined@^3.0.6": - version "3.0.6" - resolved "https://registry.yarnpkg.com/@types/lodash.isundefined/-/lodash.isundefined-3.0.6.tgz#e8c9c4d81795671f6d8e734f649b9b7ad295d76d" - integrity sha512-gXRrZ9MahWtxusjjUAbWaxUA4vU/NxXfI9kkfsjXYnBA0YjXVtl71toGBZ0X4+L023XS8NlO3BokLXFFuLtG/Q== - dependencies: - "@types/lodash" "*" - -"@types/lodash.keys@^4.2.6": - version "4.2.6" - resolved "https://registry.yarnpkg.com/@types/lodash.keys/-/lodash.keys-4.2.6.tgz#9fb27c91b9d13c523e1d83dc7e20e48f0ce6c087" - integrity sha512-FCtZsHapyH/Xu0New7jTLiNwbDfirIgpmii+vndMxM9Guz+kU+uYgKvSaVN4H+CReT6Ht+sfZTrquq0hnSjgxg== - dependencies: - "@types/lodash" "*" - -"@types/lodash.map@^4.6.13": - version "4.6.13" - resolved "https://registry.yarnpkg.com/@types/lodash.map/-/lodash.map-4.6.13.tgz#7d776611d4c0345e48cfdfe466d7b291b31d1d13" - integrity sha512-kppRBzlpuvQQsr7R2nv/DDDZds8fglRFNAK70WUOkOC18KOcuQ22oQF9Kgy5Z2v/eDNkBm0ltrT6FThSkuWwow== - dependencies: - "@types/lodash" "*" - -"@types/lodash.mapvalues@^4.6.6": - version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.mapvalues/-/lodash.mapvalues-4.6.6.tgz#899b6e1d3b9b4e313bc332ec18182f9fce7aec7c" - integrity sha512-Mt9eg3AqwAt5HShuOu8taiIYg0sLl4w3vDi0++E0VtiOtj9DqQHaxVr3wicVop0eDEqr5ENbht7vsLJlkMHL+w== - dependencies: - "@types/lodash" "*" - -"@types/lodash.max@^4.0.6": - version "4.0.6" - resolved "https://registry.yarnpkg.com/@types/lodash.max/-/lodash.max-4.0.6.tgz#3e47d27d9fc6f47b14ba7c16b77b60916f2dfde4" - integrity sha512-zl9Z4eoGcsvziXLCxPV9AcKRn2xhM2BVTl/TiPWh1M7ek3TSjMx8QRBi3IZuVuJZzxIfbuI5lFoteba7qsZ0jA== - dependencies: - "@types/lodash" "*" - -"@types/lodash.maxby@^4.6.6": - version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.maxby/-/lodash.maxby-4.6.6.tgz#504b8d2d8e9366039dfe2b2b0bf77c64c433e3f1" - integrity sha512-bHlAUse1H1oi2D4AWwP04bJsofzWfXcEBr1Jin8/xSvI0Z/CGE2pcTgHg2oFm/pDXFtAOCDjurhaOynK6NYsZA== - dependencies: - "@types/lodash" "*" - -"@types/lodash.merge@^4.6.6": - version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.merge/-/lodash.merge-4.6.6.tgz#b84b403c1d31bc42d51772d1cd5557fa008cd3d6" - integrity sha512-IB90krzMf7YpfgP3u/EvZEdXVvm4e3gJbUvh5ieuI+o+XqiNEt6fCzqNRaiLlPVScLI59RxIGZMQ3+Ko/DJ8vQ== - dependencies: - "@types/lodash" "*" - -"@types/lodash.negate@^3.0.6": - version "3.0.6" - resolved "https://registry.yarnpkg.com/@types/lodash.negate/-/lodash.negate-3.0.6.tgz#808cc3af9761ecf0dc3a9cb292e39c341ee32669" - integrity sha512-CzLOjizSCgk7X5k5dKGWG8AlDLz8839XRVhGvDCopA3blRG2tTFYXdeQuvvPuDObHl36WQ2GQMfpVdeuW/bbdw== - dependencies: - "@types/lodash" "*" - -"@types/lodash.omit@^4.5.6": - version "4.5.6" - resolved "https://registry.yarnpkg.com/@types/lodash.omit/-/lodash.omit-4.5.6.tgz#f2a9518259e481a48ff7ec423420fa8fd58933e2" - integrity sha512-KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ== - dependencies: - "@types/lodash" "*" - -"@types/lodash.omitby@^4.6.6": - version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.omitby/-/lodash.omitby-4.6.6.tgz#d9b392d5f236983d2597b9e977d337faa00af8aa" - integrity sha512-bHkWp4YyTlqPtHgUwEhExcMQNb8V+HjTUzhxgdnw0UhuT0i61aff6RuSlXt4MbQVPJhB/24tb4WBZJQ+LYIQgw== - dependencies: - "@types/lodash" "*" - -"@types/lodash.partition@^4.6.6": - version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.partition/-/lodash.partition-4.6.6.tgz#fdc23c9809b64b1d2e2f07faef045c035f0cd2c7" - integrity sha512-s8ZNNFWhBgTKI4uNxVrTs3Aa7UQoi7Fesw55bfpBBMCLda+uSuwDyuax8ka9aBy8Ccsjp2SiS034DkSZa+CzVA== - dependencies: - "@types/lodash" "*" - -"@types/lodash.pick@^4.4.6": - version "4.4.6" - resolved "https://registry.yarnpkg.com/@types/lodash.pick/-/lodash.pick-4.4.6.tgz#ae4e8f109e982786313bb6aac4b1a73aefa6e9be" - integrity sha512-u8bzA16qQ+8dY280z3aK7PoWb3fzX5ATJ0rJB6F+uqchOX2VYF02Aqa+8aYiHiHgPzQiITqCgeimlyKFy4OA6g== - dependencies: - "@types/lodash" "*" - -"@types/lodash.pickby@^4.6.6": - version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.pickby/-/lodash.pickby-4.6.6.tgz#3dc39c2b38432f7a0c5e5627b0d5c0e3878b4f35" - integrity sha512-NFa13XxlMd9eFi0UFZFWIztpMpXhozbijrx3Yb1viYZphT7jyopIFVoIRF4eYMjruWNEG1rnyrRmg/8ej9T8Iw== - dependencies: - "@types/lodash" "*" - -"@types/lodash.random@^3.2.6": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@types/lodash.random/-/lodash.random-3.2.6.tgz#64b08abad168dca39c778ed40cce75b2f9e168eb" - integrity sha512-RRr0pKm+3USvG/HTkuRKA8v2EqXu19VXC09j4VL2UQec8Yx8Fn6wYTPGjYdmX4UFd23ykS7SLFkiULS/rv8kTA== - dependencies: - "@types/lodash" "*" - -"@types/lodash.reverse@^4.0.6": - version "4.0.6" - resolved "https://registry.yarnpkg.com/@types/lodash.reverse/-/lodash.reverse-4.0.6.tgz#488584f377099df28df74c572057e6f9e5130c6d" - integrity sha512-g6MFdNJ70jG0i6JNaYqQe5QwcZXri3dMmCkP2oxQ983bMvAk9vK9ys6bkPYoO/0ck5Uvi4Qdt2NSor1Zk+WdmQ== - dependencies: - "@types/lodash" "*" - -"@types/lodash.some@^4.6.6": - version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.some/-/lodash.some-4.6.6.tgz#6b79f350f7031aee8d93edde3e5b5e8147d9b74b" - integrity sha512-7MNJlK+WU2udp6QhxWDp3e05cjYq1v34JMpVVucal7XcZSlC1mZS3Gvdo/z/rL9CZgXXhoGvXerkfT+B8AfZEg== - dependencies: - "@types/lodash" "*" - -"@types/lodash.sortby@^4.7.6": - version "4.7.6" - resolved "https://registry.yarnpkg.com/@types/lodash.sortby/-/lodash.sortby-4.7.6.tgz#eed689835f274b553db4ae16a4a23f58b79618a1" - integrity sha512-EnvAOmKvEg7gdYpYrS6+fVFPw5dL9rBnJi3vcKI7wqWQcLJVF/KRXK9dH29HjGNVvFUj0s9prRP3J8jEGnGKDw== - dependencies: - "@types/lodash" "*" - -"@types/lodash.topairs@^4.3.6": - version "4.3.6" - resolved "https://registry.yarnpkg.com/@types/lodash.topairs/-/lodash.topairs-4.3.6.tgz#6b972d1dfda3646166f1cd659ba085bd3e3770a3" - integrity sha512-0nrOtPvP6BUEUpCqPKdtnaPK6z4rcBOIf3rBBPnWhxuYujAToErBiakFKWWWWdosdqI/W/kpaiegxpeheXTNxA== - dependencies: - "@types/lodash" "*" - -"@types/lodash.uniq@^4.5.6": - version "4.5.6" - resolved "https://registry.yarnpkg.com/@types/lodash.uniq/-/lodash.uniq-4.5.6.tgz#adb052f6c7eeb38b920c13166e7a972dd960b4c5" - integrity sha512-XHNMXBtiwsWZstZMyxOYjr0e8YYWv0RgPlzIHblTuwBBiWo2MzWVaTBihtBpslb5BglgAWIeBv69qt1+RTRW1A== - dependencies: - "@types/lodash" "*" - -"@types/lodash.uniqby@^4.7.6": - version "4.7.6" - resolved "https://registry.yarnpkg.com/@types/lodash.uniqby/-/lodash.uniqby-4.7.6.tgz#672827a701403f07904fe37f0721ae92abfa80e8" - integrity sha512-9wBhrm1y6asW50Joj6tsySCNUgzK2tCqL7vtKIej0E9RyeBFdcte7fxUosmFuMoOU0eHqOMK76kCCrK99jxHgg== - dependencies: - "@types/lodash" "*" - -"@types/lodash.uniqwith@^4.5.6": - version "4.5.6" - resolved "https://registry.yarnpkg.com/@types/lodash.uniqwith/-/lodash.uniqwith-4.5.6.tgz#b03b0155c740263bf0249d3ccebd6ff006878ec5" - integrity sha512-0xx5IqFuDdAeghWRRoCSXk8Nrhxv5RsZS51Nt/TyRPp05pvZKu2ioD+AVGFF6vWh9fPd/In9fB96k/Y3KCGnlA== - dependencies: - "@types/lodash" "*" - -"@types/lodash.values@^4.3.6": - version "4.3.6" - resolved "https://registry.yarnpkg.com/@types/lodash.values/-/lodash.values-4.3.6.tgz#ee9c954dee27f3188cf178b5668bbaf3db33b4c7" - integrity sha512-iCudwRNYIRO1ERA58WauveyaWFrO3/fisVQZts+acdLZmJTJABLxCG+NeEUqo+/o45LthyAw/gC5wMjssaGpbQ== - dependencies: - "@types/lodash" "*" - -"@types/lodash.without@^4.4.6": - version "4.4.6" - resolved "https://registry.yarnpkg.com/@types/lodash.without/-/lodash.without-4.4.6.tgz#6ff0f344d03266791fb2ce19ea830945d28ecc59" - integrity sha512-JkPlFMcerd1ZcPtVXTi9NZsFhRk7g/rlctGYxR+Bdp/5FxqFTeTa68eJuoeuifpcLCj9ASFSHuNf7kaq5Mu9iA== - dependencies: - "@types/lodash" "*" - -"@types/lodash.zipwith@^4.2.6": - version "4.2.6" - resolved "https://registry.yarnpkg.com/@types/lodash.zipwith/-/lodash.zipwith-4.2.6.tgz#1daea9f0d48f4e94913fefb37264bcc3c39235ab" - integrity sha512-QBRqyQL3otHcq2WB4GkEX3Oheu6Mo9Na+MCjMcU4ah1v7HNa65TnpP9rfLSg0z6HT3U5RwkVPQlbx/orHat0XA== - dependencies: - "@types/lodash" "*" +"@types/lodash@^4.14.119": + version "4.14.144" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.144.tgz#12e57fc99064bce45e5ab3c8bc4783feb75eab8e" -"@types/lodash@*": +"@types/lodash@^4.14.149": version "4.14.149" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.149.tgz#1342d63d948c6062838fbf961012f74d4e638440" integrity sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ== -"@types/lodash@^4.14.119": - version "4.14.144" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.144.tgz#12e57fc99064bce45e5ab3c8bc4783feb75eab8e" - "@types/long@*", "@types/long@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.0.tgz#719551d2352d301ac8b81db732acb6bdc28dbdef" @@ -7145,10 +6823,6 @@ lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" -lodash.castarray@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" - lodash.clone@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" @@ -7157,179 +6831,34 @@ lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" -lodash.compact@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash.compact/-/lodash.compact-3.0.1.tgz#540ce3837745975807471e16b4a2ba21e7256ca5" - -lodash.concat@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.concat/-/lodash.concat-4.5.0.tgz#b053ae02e4a8008582e7256b9d02bda6d0380395" - -lodash.difference@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" - -lodash.every@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.every/-/lodash.every-4.6.0.tgz#eb89984bebc4364279bb3aefbbd1ca19bfa6c6a7" - -lodash.filter@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" - -lodash.find@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1" - -lodash.findindex@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.findindex/-/lodash.findindex-4.6.0.tgz#a3245dee61fb9b6e0624b535125624bb69c11106" - -lodash.findlast@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.findlast/-/lodash.findlast-4.6.0.tgz#ea8bb78cf2e7e7804fc8aeb7d1953e07fe31fbc8" - -lodash.flatmap@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz#ef8cbf408f6e48268663345305c6acc0b778702e" - lodash.flatten@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" -lodash.flattendeep@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" - -lodash.foreach@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" - -lodash.frompairs@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.frompairs/-/lodash.frompairs-4.0.1.tgz#bc4e5207fa2757c136e573614e9664506b2b1bd2" - lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" -lodash.groupby@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.groupby/-/lodash.groupby-4.6.0.tgz#0b08a1dcf68397c397855c3239783832df7403d1" - -lodash.includes@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" - -lodash.intersection@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.intersection/-/lodash.intersection-4.4.0.tgz#0a11ba631d0e95c23c7f2f4cbb9a692ed178e705" - -lodash.invertby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.invertby/-/lodash.invertby-4.7.0.tgz#cdebb6cd4942aa6b8df2c74be1c5d948682718b0" - -lodash.isempty@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" - -lodash.isequal@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - lodash.ismatch@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37" -lodash.isnil@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/lodash.isnil/-/lodash.isnil-4.0.0.tgz#49e28cd559013458c814c5479d3c663a21bfaa6c" - integrity sha1-SeKM1VkBNFjIFMVHnTxmOiG/qmw= - -lodash.isnull@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash.isnull/-/lodash.isnull-3.0.0.tgz#fafbe59ea1dca27eed786534039dd84c2e07c56e" - -lodash.isstring@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" - -lodash.isundefined@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48" - -lodash.keys@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205" - -lodash.map@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" - lodash.mapkeys@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.mapkeys/-/lodash.mapkeys-4.6.0.tgz#df2cfa231d7c57c7a8ad003abdad5d73d3ea5195" -lodash.mapvalues@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c" - -lodash.max@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.max/-/lodash.max-4.0.1.tgz#8735566c618b35a9f760520b487ae79658af136a" - -lodash.maxby@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.maxby/-/lodash.maxby-4.6.0.tgz#082240068f3c7a227aa00a8380e4f38cf0786e3d" - -lodash.merge@^4.6.1, lodash.merge@^4.6.2: +lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" -lodash.negate@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash.negate/-/lodash.negate-3.0.2.tgz#9c897b0bf610019e0b43b8ff3f0afef3d7b66f34" - -lodash.noop@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash.noop/-/lodash.noop-3.0.1.tgz#38188f4d650a3a474258439b96ec45b32617133c" - -lodash.omit@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60" - -lodash.omitby@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.omitby/-/lodash.omitby-4.6.0.tgz#5c15ff4754ad555016b53c041311e8f079204791" - -lodash.partition@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.partition/-/lodash.partition-4.6.0.tgz#a38e46b73469e0420b0da1212e66d414be364ba4" - -lodash.pick@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" - -lodash.pickby@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff" - lodash.random@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/lodash.random/-/lodash.random-3.2.0.tgz#96e24e763333199130d2c9e2fd57f91703cc262d" -lodash.reverse@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.reverse/-/lodash.reverse-4.0.1.tgz#1f2afedace2e16e660f3aa7c59d3300a6f25d13c" - lodash.set@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" -lodash.some@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" - lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -7352,14 +6881,6 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "^3.0.0" -lodash.times@^4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/lodash.times/-/lodash.times-4.3.2.tgz#3e1f2565c431754d54ab57f2ed1741939285ca1d" - -lodash.topairs@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.topairs/-/lodash.topairs-4.3.0.tgz#3b6deaa37d60fb116713c46c5f17ea190ec48d64" - lodash.unescape@4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c" @@ -7368,28 +6889,6 @@ lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" -lodash.uniqby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302" - integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI= - -lodash.uniqwith@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniqwith/-/lodash.uniqwith-4.5.0.tgz#7a0cbf65f43b5928625a9d4d0dc54b18cadc7ef3" - -lodash.values@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" - -lodash.without@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac" - -lodash.zipwith@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.zipwith/-/lodash.zipwith-4.2.0.tgz#afacf03fd2f384af29e263c3c6bda3b80e3f51fd" - integrity sha1-r6zwP9LzhK8p4mPDxr2juA4/Uf0= - lodash@4.17.14: version "4.17.14" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"