From b3f996595f56e11515b84c573ff92a10692248e8 Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Tue, 22 Jan 2019 08:48:05 -0800 Subject: Update blog link to not be /latest, and use constant in mobile nav --- packages/website/ts/components/mobileNav.tsx | 3 ++- packages/website/ts/utils/constants.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/website/ts/components/mobileNav.tsx b/packages/website/ts/components/mobileNav.tsx index d43bbe50e..1aa826755 100644 --- a/packages/website/ts/components/mobileNav.tsx +++ b/packages/website/ts/components/mobileNav.tsx @@ -6,6 +6,7 @@ import { Link } from 'react-router-dom'; import { WrapGrid, WrapProps } from 'ts/components/newLayout'; import { WebsitePaths } from 'ts/types'; +import { constants } from 'ts/utils/constants'; interface Props { isToggled: boolean; @@ -41,7 +42,7 @@ export class MobileNav extends React.PureComponent { About
  • - + Blog
  • diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts index ada8de549..03c1a0b83 100644 --- a/packages/website/ts/utils/constants.ts +++ b/packages/website/ts/utils/constants.ts @@ -74,7 +74,7 @@ export const constants = { URL_ANGELLIST: 'https://angel.co/0xproject/jobs', URL_APACHE_LICENSE: 'http://www.apache.org/licenses/LICENSE-2.0', URL_BITLY_API: 'https://api-ssl.bitly.com', - URL_BLOG: 'https://blog.0xproject.com/latest', + URL_BLOG: 'https://blog.0xproject.com', URL_DISCOURSE_FORUM: 'https://forum.0x.org', URL_ECOSYSTEM_APPLY: 'https://0x.smapply.io/', URL_ECOSYSTEM_BLOG_POST: 'https://blog.0xproject.com/announcing-the-0x-ecosystem-acceleration-program-89d1cb89d565', -- cgit v1.2.3 From db900d180cf7a5b9affbe7ff486b6e3e1e038e84 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Mon, 4 Feb 2019 16:25:00 -0800 Subject: Decode NULL as false --- packages/utils/CHANGELOG.json | 9 +++++++++ packages/utils/src/abi_encoder/evm_data_types/bool.ts | 3 ++- packages/utils/test/abi_encoder/evm_data_types_test.ts | 18 ++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index 0fb199e58..d8c1bb9ce 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "4.0.1", + "changes": [ + { + "note": "ABI Decode NULL as False" + "pr": 1582 + } + ] + }, { "version": "4.0.0", "changes": [ diff --git a/packages/utils/src/abi_encoder/evm_data_types/bool.ts b/packages/utils/src/abi_encoder/evm_data_types/bool.ts index 23298bc88..ffccd6e53 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/bool.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/bool.ts @@ -36,7 +36,8 @@ export class BoolDataType extends AbstractBlobDataType { public decodeValue(calldata: RawCalldata): boolean { const valueBuf = calldata.popWord(); const valueHex = ethUtil.bufferToHex(valueBuf); - const valueNumber = new BigNumber(valueHex, constants.HEX_BASE); + // Hack @hysz: there are some cases where `false` is encoded as 0x instead of 0x0. + const valueNumber = valueHex === '0x' ? new BigNumber(0) : new BigNumber(valueHex, constants.HEX_BASE); if (!(valueNumber.isEqualTo(0) || valueNumber.isEqualTo(1))) { throw new Error(`Failed to decode boolean. Expected 0x0 or 0x1, got ${valueHex}`); } diff --git a/packages/utils/test/abi_encoder/evm_data_types_test.ts b/packages/utils/test/abi_encoder/evm_data_types_test.ts index 4814ce28b..c146890e0 100644 --- a/packages/utils/test/abi_encoder/evm_data_types_test.ts +++ b/packages/utils/test/abi_encoder/evm_data_types_test.ts @@ -489,6 +489,24 @@ describe('ABI Encoder: EVM Data Type Encoding/Decoding', () => { const argsEncodedFromSignature = dataTypeFromSignature.encode(args); expect(argsEncodedFromSignature).to.be.deep.equal(expectedEncodedArgs); }); + it('Null should decode as False', async () => { + // Hack @hysz: there are some cases where `false` is encoded as 0x instead of 0x0. + // Create DataType object + const testDataItem = { name: 'Boolean', type: 'bool' }; + const dataType = new AbiEncoder.Bool(testDataItem); + // Construct args to be encoded + const args = false; + // Encode Args and validate result + const encodedArgs = '0x'; + const expectedEncodedArgs = '0x0000000000000000000000000000000000000000000000000000000000000000'; + // Decode Encoded Args and validate result + const decodedArgs = dataType.decode(encodedArgs); + expect(decodedArgs).to.be.deep.equal(args); + // Validate signature + const dataTypeFromSignature = AbiEncoder.create(dataType.getSignature(true)); + const argsEncodedFromSignature = dataTypeFromSignature.encode(args); + expect(argsEncodedFromSignature).to.be.deep.equal(expectedEncodedArgs); + }); }); describe('Integer', () => { -- cgit v1.2.3 From a3198b7df8a563768d68414b4f01485f0694ac0a Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 5 Feb 2019 09:33:16 +0000 Subject: Add missing comma --- packages/utils/CHANGELOG.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index d8c1bb9ce..df415040b 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -3,7 +3,7 @@ "version": "4.0.1", "changes": [ { - "note": "ABI Decode NULL as False" + "note": "ABI Decode NULL as False", "pr": 1582 } ] -- cgit v1.2.3 From 703aa38a17dac2b1ff39cbee012956d36baa4e62 Mon Sep 17 00:00:00 2001 From: Xianny <8582774+xianny@users.noreply.github.com> Date: Tue, 5 Feb 2019 18:58:30 +0800 Subject: CI test for dependencies to have the same version (#1556) * add failing CI for dependencies with multiple versions * update dependencies * increase bundlewatch maxsize for 0x.js --- .circleci/config.yml | 1 + package.json | 7 +- packages/0x.js/package.json | 2 +- packages/abi-gen-wrappers/package.json | 2 +- packages/abi-gen/package.json | 10 +- packages/assert/package.json | 2 +- packages/asset-buyer/package.json | 4 +- packages/base-contract/package.json | 2 +- packages/connect/package.json | 6 +- packages/contract-addresses/package.json | 2 +- packages/contract-wrappers/package.json | 6 +- packages/dev-tools-pages/package.json | 2 +- packages/dev-utils/package.json | 2 +- packages/fill-scenarios/package.json | 2 +- packages/instant/package.json | 14 +- packages/metacoin/package.json | 4 +- packages/migrations/package.json | 4 +- packages/monorepo-scripts/package.json | 6 +- packages/monorepo-scripts/src/deps_versions.ts | 93 +++++-- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 2 +- packages/pipeline/package.json | 8 +- packages/react-docs/package.json | 6 +- packages/react-shared/package.json | 12 +- packages/sol-compiler/package.json | 4 +- packages/sol-coverage/package.json | 2 +- packages/sol-doc/package.json | 8 +- packages/sol-profiler/package.json | 2 +- packages/sol-resolver/package.json | 2 +- packages/sol-trace/package.json | 2 +- packages/sol-tracing-utils/package.json | 4 +- packages/sra-spec/package.json | 6 +- packages/subproviders/package.json | 2 +- packages/testnet-faucets/package.json | 4 +- packages/tslint-config/package.json | 2 +- packages/utils/package.json | 6 +- packages/web3-wrapper/package.json | 2 +- packages/website/package.json | 2 +- yarn.lock | 333 ++++--------------------- 39 files changed, 195 insertions(+), 387 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0aec168cf..f6e028ea0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -297,6 +297,7 @@ jobs: - repo-{{ .Environment.CIRCLE_SHA1 }} - run: yarn lerna run lint - run: yarn prettier:ci + - run: yarn deps_versions:ci - run: cd packages/0x.js && yarn build:umd:prod - run: yarn bundlewatch submit-coverage: diff --git a/package.json b/package.json index 62b4c1c36..dccfe6513 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "contracts/*" ], "scripts": { + "deps_versions:ci": "node ./packages/monorepo-scripts/lib/deps_versions.js", "ganache": "ganache-cli -p 8545 --gasLimit 10000000 --networkId 50 -m \"${npm_package_config_mnemonic}\"", "prettier": "prettier --write '**/*.{ts,tsx,json,md}' --config .prettierrc", "prettier:ci": "prettier --list-different '**/*.{ts,tsx,json,md}' --config .prettierrc", @@ -44,13 +45,15 @@ "config": { "contractsPackages": "@0x/contracts-asset-proxy @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-exchange-libs @0x/contracts-extensions @0x/contracts-multisig @0x/contracts-test-utils @0x/contracts-utils", "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic", - "packagesWithDocPages": "0x.js connect json-schemas subproviders web3-wrapper contract-wrappers order-utils order-watcher sol-compiler sol-coverage sol-profiler sol-trace ethereum-types asset-buyer migrations" + "packagesWithDocPages": "0x.js connect json-schemas subproviders web3-wrapper contract-wrappers order-utils order-watcher sol-compiler sol-coverage sol-profiler sol-trace ethereum-types asset-buyer migrations", + "ignoreDependencyVersions": "@types/styled-components", + "ignoreDependencyVersionsForPackage": "website instant dev-tools-pages" }, "bundlewatch": { "files": [ { "path": "packages/0x.js/_bundles/index.min.js", - "maxSize": "700kB" + "maxSize": "800kB" }, { "path": "packages/instant/umd/instant.js", diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 64054d288..d37988e26 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -85,7 +85,7 @@ "@types/web3-provider-engine": "^14.0.0", "ethereum-types": "^1.1.6", "ethers": "~4.0.4", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "web3-provider-engine": "14.0.6" }, "publishConfig": { diff --git a/packages/abi-gen-wrappers/package.json b/packages/abi-gen-wrappers/package.json index 842ac024a..d30bc291d 100644 --- a/packages/abi-gen-wrappers/package.json +++ b/packages/abi-gen-wrappers/package.json @@ -38,7 +38,7 @@ "@0x/web3-wrapper": "^3.2.4", "ethereum-types": "^1.1.6", "ethers": "~4.0.4", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "shx": "^0.2.2" }, "dependencies": { diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 7f968893c..229b16906 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -37,7 +37,7 @@ "ethereum-types": "^1.1.6", "glob": "^7.1.2", "handlebars": "^4.0.11", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "mkdirp": "^0.5.1", "sleep": "^5.1.1", "tmp": "^0.0.33", @@ -48,15 +48,15 @@ "@0x/tslint-config": "^2.0.2", "@types/glob": "5.0.35", "@types/handlebars": "^4.0.36", - "@types/mkdirp": "^0.5.1", + "@types/mkdirp": "^0.5.2", "@types/node": "*", "@types/sleep": "^0.0.7", "@types/tmp": "^0.0.33", - "@types/yargs": "^10.0.0", - "chai": "^4.1.2", + "@types/yargs": "^11.0.0", + "chai": "^4.0.1", "dirty-chai": "^2.0.1", "make-promises-safe": "^1.1.0", - "mocha": "^5.2.0", + "mocha": "^4.1.0", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.11.0", diff --git a/packages/assert/package.json b/packages/assert/package.json index 38481d6f0..aed39d736 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -47,7 +47,7 @@ "@0x/json-schemas": "^2.1.7", "@0x/typescript-typings": "^3.0.8", "@0x/utils": "^3.0.1", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "valid-url": "^1.0.9" }, "publishConfig": { diff --git a/packages/asset-buyer/package.json b/packages/asset-buyer/package.json index 0f79ac06a..05d28e3ee 100644 --- a/packages/asset-buyer/package.json +++ b/packages/asset-buyer/package.json @@ -47,11 +47,11 @@ "@0x/utils": "^3.0.1", "@0x/web3-wrapper": "^3.2.4", "ethereum-types": "^1.1.6", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "devDependencies": { "@0x/tslint-config": "^2.0.2", - "@types/lodash": "^4.14.116", + "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", "@types/node": "*", "chai": "^4.0.1", diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index db09b16a1..28c7aa2f4 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -45,7 +45,7 @@ "@0x/web3-wrapper": "^3.2.4", "ethereum-types": "^1.1.6", "ethers": "~4.0.4", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/packages/connect/package.json b/packages/connect/package.json index 15a4c12f1..4f00b2249 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -50,8 +50,8 @@ "@0x/types": "^1.5.2", "@0x/typescript-typings": "^3.0.8", "@0x/utils": "^3.0.1", - "lodash": "^4.17.5", - "query-string": "^5.0.1", + "lodash": "^4.17.11", + "query-string": "^6.0.0", "sinon": "^4.0.0", "uuid": "^3.3.2", "websocket": "^1.0.25" @@ -61,7 +61,7 @@ "@types/fetch-mock": "^6.0.3", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", - "@types/query-string": "^5.0.1", + "@types/query-string": "^5.1.0", "@types/sinon": "^2.2.2", "@types/uuid": "^3.4.3", "@types/websocket": "^0.0.39", diff --git a/packages/contract-addresses/package.json b/packages/contract-addresses/package.json index 260322081..77a1ffc56 100644 --- a/packages/contract-addresses/package.json +++ b/packages/contract-addresses/package.json @@ -29,7 +29,7 @@ "typescript": "3.0.1" }, "dependencies": { - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index cc7dc1a3e..9394c3c0e 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -45,7 +45,7 @@ "@types/mocha": "^2.2.42", "@types/node": "*", "@types/sinon": "^2.2.2", - "@types/uuid": "^3.4.2", + "@types/uuid": "^3.4.3", "@types/web3-provider-engine": "^14.0.0", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", @@ -83,8 +83,8 @@ "ethereumjs-util": "^5.1.1", "ethers": "~4.0.4", "js-sha3": "^0.7.0", - "lodash": "^4.17.5", - "uuid": "^3.1.0" + "lodash": "^4.17.11", + "uuid": "^3.3.2" }, "publishConfig": { "access": "public" diff --git a/packages/dev-tools-pages/package.json b/packages/dev-tools-pages/package.json index feab72856..b4e93d6c6 100644 --- a/packages/dev-tools-pages/package.json +++ b/packages/dev-tools-pages/package.json @@ -46,7 +46,7 @@ "@types/node": "*", "@types/react": "^16.4.2", "@types/react-dom": "^16.0.7", - "@types/react-loadable": "^5.4.1", + "@types/react-loadable": "^5.4.2", "@types/react-lottie": "^1.2.0", "@types/react-router-dom": "^4.0.4", "@types/react-tabs": "^2.3.0", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 4ab1d6439..f1f37f638 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -49,7 +49,7 @@ "@types/web3-provider-engine": "^14.0.0", "chai": "^4.0.1", "ethereum-types": "^1.1.6", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index d882aba76..d4afd2187 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -38,7 +38,7 @@ "@0x/web3-wrapper": "^3.2.4", "ethereum-types": "^1.1.6", "ethers": "~4.0.4", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/packages/instant/package.json b/packages/instant/package.json index f7e15a3e0..147a47da8 100644 --- a/packages/instant/package.json +++ b/packages/instant/package.json @@ -55,15 +55,15 @@ "bowser": "^1.9.4", "copy-to-clipboard": "^3.0.8", "ethereum-types": "^1.1.6", - "lodash": "^4.17.5", - "polished": "^2.2.0", + "lodash": "^4.17.11", + "polished": "^1.9.2", "react": "^16.5.2", "react-dom": "^16.5.2", "react-redux": "^5.0.7", "redux": "^4.0.0", "redux-devtools-extension": "^2.13.5", "rollbar": "^2.5.0", - "styled-components": "^4.0.2", + "styled-components": "^4.1.1", "ts-optchain": "^0.1.1" }, "devDependencies": { @@ -72,10 +72,10 @@ "@types/enzyme": "^3.1.14", "@types/enzyme-adapter-react-16": "^1.0.3", "@types/jest": "^23.3.5", - "@types/lodash": "^4.14.116", + "@types/lodash": "4.14.104", "@types/node": "*", - "@types/react": "^16.4.16", - "@types/react-dom": "^16.0.8", + "@types/react": "16.4.16", + "@types/react-dom": "16.0.6", "@types/react-redux": "^6.0.9", "@types/redux": "^3.6.0", "@types/styled-components": "4.0.1", @@ -103,7 +103,7 @@ "typedoc": "0.13.0", "typescript": "3.0.1", "webpack": "^4.20.2", - "webpack-cli": "^3.1.1", + "webpack-cli": "3.1.2", "webpack-dev-server": "^3.1.9" }, "publishConfig": { diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 3b082f075..d08946fef 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -41,11 +41,11 @@ "@0x/typescript-typings": "^3.0.8", "@0x/utils": "^3.0.1", "@0x/web3-wrapper": "^3.2.4", - "@types/mocha": "^5.2.2", + "@types/mocha": "^2.2.42", "copyfiles": "^2.0.0", "ethereum-types": "^1.1.6", "ethers": "~4.0.4", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "run-s": "^0.0.0" }, "devDependencies": { diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 3ca4e8d6b..4096aa913 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -38,7 +38,7 @@ "@0x/dev-utils": "^1.0.24", "@0x/tslint-config": "^2.0.2", "@0x/types": "^1.5.2", - "@types/yargs": "^10.0.0", + "@types/yargs": "^11.0.0", "make-promises-safe": "^1.1.0", "npm-run-all": "^4.1.2", "shx": "^0.2.2", @@ -61,7 +61,7 @@ "@ledgerhq/hw-app-eth": "^4.3.0", "ethereum-types": "^1.1.6", "ethers": "~4.0.4", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "optionalDependencies": { "@ledgerhq/hw-transport-node-hid": "^4.3.0" diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index 187a80c93..b1e1f3ca1 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -32,13 +32,13 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/monorepo-scripts/README.md", "devDependencies": { - "@types/glob": "^5.0.33", + "@types/glob": "5.0.35", "@types/mkdirp": "^0.5.2", "@types/node": "*", "@types/opn": "^5.1.0", "@types/rimraf": "^2.0.2", "@types/semver": "5.5.0", - "@types/yargs": "^10.0.0", + "@types/yargs": "^11.0.0", "depcheck": "^0.6.9", "make-promises-safe": "^1.1.0", "npm-run-all": "^4.1.2", @@ -55,7 +55,7 @@ "es6-promisify": "^5.0.0", "glob": "^7.1.2", "isomorphic-fetch": "2.2.1", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "mkdirp": "^0.5.1", "moment": "2.21.0", "opn": "^5.3.0", diff --git a/packages/monorepo-scripts/src/deps_versions.ts b/packages/monorepo-scripts/src/deps_versions.ts index 1053906b7..0bb255508 100644 --- a/packages/monorepo-scripts/src/deps_versions.ts +++ b/packages/monorepo-scripts/src/deps_versions.ts @@ -3,7 +3,7 @@ import chalk from 'chalk'; import * as fs from 'fs'; import { sync as globSync } from 'glob'; -import * as _ from 'lodash'; +import * as path from 'path'; import { utils } from './utils/utils'; @@ -17,11 +17,32 @@ interface VersionsByDependency { [depName: string]: Versions; } -const PACKAGE_JSON_GLOB = '../*/package.json'; +interface ParsedDependencies { + ignored: VersionsByDependency; + included: VersionsByDependency; +} + +const PACKAGE_JSON_GLOB = '../../*/package.json'; + +const config = JSON.parse(fs.readFileSync(path.join(__dirname, '../../../package.json')).toString()).config; +const dependenciesWithIgnoredVersions: string[] = config.ignoreDependencyVersions.split(' '); +const packagesWithIgnoredVersions: string[] = config.ignoreDependencyVersionsForPackage.split(' '); + +if (require.main === module) { + const dependencies = parseDependencies(); + const ignoredMultiples = getDependenciesWithMultipleVersions(dependencies.ignored); + const multiples = getDependenciesWithMultipleVersions(dependencies.included); + printVersionsByDependency(multiples); + utils.log(`├── ${chalk.bold('IGNORED')}`); + printVersionsByDependency(ignoredMultiples); + if (Object.keys(multiples).length !== 0) { + utils.log(`Add space-separated exceptions to root package.json config.ignoreDependencyVersions`); + process.exit(1); + } +} -// tslint:disable:no-unused-variable -function getDependencies(path: string): Dependencies { - const file = fs.readFileSync(path).toString(); +function getDependencies(_path: string): Dependencies { + const file = fs.readFileSync(_path).toString(); const parsed = JSON.parse(file); const dependencies = { ...parsed.dependencies, @@ -30,27 +51,49 @@ function getDependencies(path: string): Dependencies { return dependencies; } -const files = globSync(PACKAGE_JSON_GLOB); -const versionsByDependency: VersionsByDependency = {}; -files.map(path => { - const [_1, packageName, _2] = path.split('/'); - const dependencies = getDependencies(path); - _.map(dependencies, (version: string, depName: string) => { - if (_.isUndefined(versionsByDependency[depName])) { - versionsByDependency[depName] = {}; - } - versionsByDependency[depName][packageName] = version; +function parseDependencies(): ParsedDependencies { + const files = globSync(path.join(__dirname, PACKAGE_JSON_GLOB)); + const parsedDependencies: ParsedDependencies = { + ignored: {}, + included: {}, + }; + files.map(_path => { + const pathParts = _path.split('/'); + const packageName = pathParts[pathParts.length - 2]; + const packageCategory = packagesWithIgnoredVersions.includes(packageName) ? 'ignored' : 'included'; + const dependencies = getDependencies(_path); + Object.keys(dependencies).forEach((depName: string) => { + const category = dependenciesWithIgnoredVersions.includes(depName) ? 'ignored' : packageCategory; + if (parsedDependencies[category][depName] === undefined) { + parsedDependencies[category][depName] = {}; + } + const version = dependencies[depName]; + parsedDependencies[category][depName][packageName] = version; + }); }); -}); + return parsedDependencies; +} + +function getDependenciesWithMultipleVersions(versionsByDependency: VersionsByDependency): VersionsByDependency { + return Object.keys(versionsByDependency) + .filter((depName: string) => hasMultipleVersions(versionsByDependency[depName])) + .reduce((obj, depName: string) => { + obj[depName] = versionsByDependency[depName]; + return obj; + }, {}); +} -_.map(versionsByDependency, (versions: Versions, depName: string) => { - if (_.uniq(_.values(versions)).length === 1) { - delete versionsByDependency[depName]; - } else { +function printVersionsByDependency(versionsByDependency: VersionsByDependency): void { + Object.keys(versionsByDependency).forEach((depName: string) => { + const versions: Versions = versionsByDependency[depName]; utils.log(chalk.bold(depName)); - _.map(versions, (version: string, packageName: string) => { - utils.log(`├── ${packageName} -> ${version}`); + Object.keys(versions).forEach((packageName: string) => { + utils.log(`├── ${packageName} -> ${versions[packageName]}`); }); - } -}); -// tslint:disable:no-unused-variable + }); +} + +function hasMultipleVersions(versions: Versions): boolean { + const uniques = new Set(Object.values(versions)); + return uniques.size > 1; +} diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 7a4d4aa84..4fa49a58f 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -68,7 +68,7 @@ "ethereumjs-abi": "0.6.5", "ethereumjs-util": "^5.1.1", "ethers": "~4.0.4", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 895c64813..dad36b04f 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -80,7 +80,7 @@ "ethereum-types": "^1.1.6", "ethereumjs-blockstream": "6.0.0", "ethers": "~4.0.4", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "websocket": "^1.0.25" }, "publishConfig": { diff --git a/packages/pipeline/package.json b/packages/pipeline/package.json index 908734687..a8b89c7b5 100644 --- a/packages/pipeline/package.json +++ b/packages/pipeline/package.json @@ -30,11 +30,11 @@ "@0x/tslint-config": "^2.0.2", "@types/axios": "^0.14.0", "@types/ramda": "^0.25.38", - "chai": "^4.1.2", - "chai-as-promised": "^7.1.1", + "chai": "^4.0.1", + "chai-as-promised": "^7.1.0", "chai-bignumber": "^3.0.0", "dirty-chai": "^2.0.1", - "mocha": "^5.2.0", + "mocha": "^4.1.0", "tslint": "5.11.0", "typescript": "3.0.1" }, @@ -42,7 +42,7 @@ "@0x/connect": "^3.0.13", "@0x/contract-addresses": "^2.2.0", "@0x/contract-artifacts": "^1.3.0", - "@0x/contract-wrappers": "^3.0.0", + "@0x/contract-wrappers": "^5.0.1", "@0x/dev-utils": "^1.0.24", "@0x/order-utils": "^3.1.2", "@0x/subproviders": "^2.1.11", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index f8f2b6276..dc592f2a0 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -30,7 +30,7 @@ "@types/styled-components": "4.0.0", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", - "tslint": "^5.9.1", + "tslint": "5.11.0", "typescript": "3.0.1" }, "dependencies": { @@ -45,7 +45,7 @@ "@types/react-scroll": "1.5.3", "basscss": "^8.0.3", "compare-versions": "^3.0.1", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "material-ui": "^0.20.0", "react": "^16.5.2", "react-dom": "^16.5.2", @@ -53,7 +53,7 @@ "react-scroll": "0xproject/react-scroll#pr-330-and-replace-state", "react-tooltip": "^3.2.7", "semver": "5.5.0", - "styled-components": "^4.0.1" + "styled-components": "^4.1.1" }, "publishConfig": { "access": "public" diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 4be4742b0..b527e51a3 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -29,7 +29,7 @@ "@0x/tslint-config": "^2.0.2", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", - "tslint": "^5.9.1", + "tslint": "5.11.0", "typescript": "3.0.1" }, "dependencies": { @@ -37,7 +37,7 @@ "@material-ui/core": "^3.0.1", "@types/is-mobile": "0.3.0", "@types/lodash": "4.14.104", - "@types/material-ui": "0.18.0", + "@types/material-ui": "^0.20.0", "@types/node": "*", "@types/react": "*", "@types/react-dom": "*", @@ -48,15 +48,15 @@ "basscss": "^8.0.3", "change-case": "^3.0.2", "is-mobile": "^0.2.2", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "material-ui": "^0.20.0", "react": "^16.5.2", "react-dom": "^16.5.2", - "react-highlight": "0xproject/react-highlight#fix/react-version", + "react-highlight": "0xproject/react-highlight", "react-markdown": "^3.2.2", - "react-router-dom": "^4.1.1", + "react-router-dom": "^4.3.1", "react-scroll": "0xproject/react-scroll#pr-330-and-replace-state", - "styled-components": "^4.0.1", + "styled-components": "^4.1.1", "valid-url": "^1.0.9" }, "publishConfig": { diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 0b53cffd5..eab0e5a2b 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -48,7 +48,7 @@ "@types/mkdirp": "^0.5.2", "@types/pluralize": "^0.0.29", "@types/require-from-string": "^1.2.0", - "@types/semver": "^5.5.0", + "@types/semver": "5.5.0", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", "chai-bignumber": "^3.0.0", @@ -79,7 +79,7 @@ "chokidar": "^2.0.4", "ethereum-types": "^1.1.6", "ethereumjs-util": "^5.1.1", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "mkdirp": "^0.5.1", "pluralize": "^7.0.0", "require-from-string": "^2.0.1", diff --git a/packages/sol-coverage/package.json b/packages/sol-coverage/package.json index 805e2e670..259c20256 100644 --- a/packages/sol-coverage/package.json +++ b/packages/sol-coverage/package.json @@ -33,7 +33,7 @@ "@0x/subproviders": "^2.1.11", "@0x/typescript-typings": "^3.0.8", "ethereum-types": "^1.1.6", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "devDependencies": { "@0x/tslint-config": "^2.0.2", diff --git a/packages/sol-doc/package.json b/packages/sol-doc/package.json index 179f45e81..8dfe236e0 100644 --- a/packages/sol-doc/package.json +++ b/packages/sol-doc/package.json @@ -30,17 +30,17 @@ "@0x/utils": "^3.0.1", "ethereum-types": "^1.1.6", "ethereumjs-util": "^5.1.1", - "lodash": "^4.17.10", - "yargs": "^12.0.2" + "lodash": "^4.17.11", + "yargs": "^10.0.3" }, "devDependencies": { "@0x/tslint-config": "^2.0.2", - "chai": "^4.1.2", + "chai": "^4.0.1", "chai-as-promised": "^7.1.0", "chai-bignumber": "^3.0.0", "dirty-chai": "^2.0.1", "make-promises-safe": "^1.1.0", - "mocha": "^5.2.0", + "mocha": "^4.1.0", "shx": "^0.2.2", "source-map-support": "^0.5.0", "tslint": "5.11.0" diff --git a/packages/sol-profiler/package.json b/packages/sol-profiler/package.json index 4fe2928c7..57821795d 100644 --- a/packages/sol-profiler/package.json +++ b/packages/sol-profiler/package.json @@ -33,7 +33,7 @@ "@0x/subproviders": "^2.1.11", "@0x/typescript-typings": "^3.0.8", "ethereum-types": "^1.1.6", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "devDependencies": { "@0x/tslint-config": "^2.0.2", diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json index 0518cde95..a59ef9dca 100644 --- a/packages/sol-resolver/package.json +++ b/packages/sol-resolver/package.json @@ -32,7 +32,7 @@ "dependencies": { "@0x/types": "^1.5.2", "@0x/typescript-typings": "^3.0.8", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/packages/sol-trace/package.json b/packages/sol-trace/package.json index 25e81a82a..ba302daf7 100644 --- a/packages/sol-trace/package.json +++ b/packages/sol-trace/package.json @@ -35,7 +35,7 @@ "chalk": "^2.3.0", "ethereum-types": "^1.1.6", "ethereumjs-util": "^5.1.1", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "loglevel": "^1.6.1" }, "devDependencies": { diff --git a/packages/sol-tracing-utils/package.json b/packages/sol-tracing-utils/package.json index 929c73b84..df800976c 100644 --- a/packages/sol-tracing-utils/package.json +++ b/packages/sol-tracing-utils/package.json @@ -55,7 +55,7 @@ "glob": "^7.1.2", "chalk": "^2.3.0", "istanbul": "^0.4.5", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "loglevel": "^1.6.1", "mkdirp": "^0.5.1", "rimraf": "^2.6.2", @@ -66,7 +66,7 @@ "@0x/tslint-config": "^2.0.2", "@types/istanbul": "^0.4.30", "@types/loglevel": "^1.5.3", - "@types/mkdirp": "^0.5.1", + "@types/mkdirp": "^0.5.2", "@types/mocha": "^2.2.42", "@types/node": "*", "@types/rimraf": "^2.0.2", diff --git a/packages/sra-spec/package.json b/packages/sra-spec/package.json index 9c4c0a24f..1afe3d945 100644 --- a/packages/sra-spec/package.json +++ b/packages/sra-spec/package.json @@ -41,14 +41,14 @@ "devDependencies": { "@0x/tslint-config": "^2.0.2", "@types/mocha": "^2.2.42", - "@types/node": "^10.5.3", + "@types/node": "*", "chai": "^4.0.1", "chokidar-cli": "^1.2.0", "copyfiles": "^2.0.0", "dirty-chai": "^2.0.1", "discharge": "^0.7.1", - "mocha": "^4.0.1", - "npm-run-all": "^4.1.3", + "mocha": "^4.1.0", + "npm-run-all": "^4.1.2", "nyc": "^11.0.1", "redoc-cli": "^0.6.1", "shx": "^0.2.2", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index b54cc11db..4a7e36075 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -49,7 +49,7 @@ "ganache-core": "^2.3.3", "hdkey": "^0.7.1", "json-rpc-error": "2.0.0", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "semaphore-async-await": "^1.5.1", "web3-provider-engine": "14.0.6" }, diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index da7477be4..609f00b03 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -28,8 +28,8 @@ "ethereumjs-tx": "^1.3.5", "ethereumjs-util": "^5.1.1", "express": "^4.15.2", - "lodash": "^4.17.5", - "rollbar": "^0.6.5" + "lodash": "^4.17.11", + "rollbar": "^2.5.0" }, "devDependencies": { "@0x/tslint-config": "^2.0.2", diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json index f90321edb..6f738c8d8 100644 --- a/packages/tslint-config/package.json +++ b/packages/tslint-config/package.json @@ -40,7 +40,7 @@ "typescript": "3.0.1" }, "dependencies": { - "lodash": "^4.17.5", + "lodash": "^4.17.11", "tslint": "5.11.0", "tslint-eslint-rules": "5.4.0", "tslint-react": "^3.2.0", diff --git a/packages/utils/package.json b/packages/utils/package.json index b6be39210..e6364c77a 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -49,14 +49,14 @@ "@types/node": "*", "abortcontroller-polyfill": "^1.1.9", "bignumber.js": "~8.0.2", - "chalk": "^2.4.1", + "chalk": "^2.3.0", "detect-node": "2.0.3", "ethereum-types": "^1.1.6", "ethereumjs-util": "^5.1.1", "ethers": "~4.0.4", - "isomorphic-fetch": "^2.2.1", + "isomorphic-fetch": "2.2.1", "js-sha3": "^0.7.0", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index f28cc36ca..c31226499 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -61,7 +61,7 @@ "ethereum-types": "^1.1.6", "ethereumjs-util": "^5.1.1", "ethers": "~4.0.4", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/packages/website/package.json b/packages/website/package.json index ce7ed395f..7ce752622 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -97,7 +97,7 @@ "@types/rc-slider": "^8.6.0", "@types/react": "^16.7.7", "@types/react-copy-to-clipboard": "^4.2.0", - "@types/react-dom": "^16.0.7", + "@types/react-dom": "^16.0.6", "@types/react-helmet": "^5.0.6", "@types/react-redux": "^4.4.37", "@types/react-scroll": "1.5.3", diff --git a/yarn.lock b/yarn.lock index 3bc39a830..03b62f49b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -472,80 +472,6 @@ npmlog "^4.1.2" write-file-atomic "^2.3.0" -"@0x/abi-gen-wrappers@^1.0.2": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@0x/abi-gen-wrappers/-/abi-gen-wrappers-1.1.0.tgz#d4e4f10699b5da6bcfadc3842f165fc59f686e09" - dependencies: - "@0x/base-contract" "^3.0.7" - -"@0x/contract-addresses@^1.1.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@0x/contract-addresses/-/contract-addresses-1.2.0.tgz#aa5001d73adb1ec9cc58ab4f6e0cac0acc4ad0a8" - dependencies: - lodash "^4.17.5" - -"@0x/contract-wrappers@^3.0.0": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@0x/contract-wrappers/-/contract-wrappers-3.0.1.tgz#e25f5812595d994ff66e36aa2aa99eb53becfc7c" - dependencies: - "@0x/abi-gen-wrappers" "^1.0.2" - "@0x/assert" "^1.0.15" - "@0x/contract-addresses" "^1.1.0" - "@0x/contract-artifacts" "^1.1.0" - "@0x/fill-scenarios" "^1.0.9" - "@0x/json-schemas" "^2.0.1" - "@0x/order-utils" "^2.0.1" - "@0x/types" "^1.2.1" - "@0x/typescript-typings" "^3.0.4" - "@0x/utils" "^2.0.4" - "@0x/web3-wrapper" "^3.1.1" - ethereum-types "^1.1.2" - ethereumjs-blockstream "6.0.0" - ethereumjs-util "^5.1.1" - ethers "~4.0.4" - js-sha3 "^0.7.0" - lodash "^4.17.5" - uuid "^3.1.0" - -"@0x/order-utils@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@0x/order-utils/-/order-utils-2.0.1.tgz#8c46d7aeb9e2cce54a0822824c12427cbe5f7eb4" - dependencies: - "@0x/abi-gen-wrappers" "^1.0.2" - "@0x/assert" "^1.0.15" - "@0x/base-contract" "^3.0.3" - "@0x/contract-artifacts" "^1.1.0" - "@0x/json-schemas" "^2.0.1" - "@0x/types" "^1.2.1" - "@0x/typescript-typings" "^3.0.4" - "@0x/utils" "^2.0.4" - "@0x/web3-wrapper" "^3.1.1" - "@types/node" "*" - bn.js "^4.11.8" - ethereum-types "^1.1.2" - ethereumjs-abi "0.6.5" - ethereumjs-util "^5.1.1" - ethers "~4.0.4" - lodash "^4.17.5" - -"@0x/utils@^2.0.4": - version "2.1.1" - resolved "https://registry.npmjs.org/@0x/utils/-/utils-2.1.1.tgz#0a79f9ce6207a8a7ff0751366e618d0f6b9d903f" - dependencies: - "@0x/types" "^1.5.0" - "@0x/typescript-typings" "^3.0.6" - "@types/node" "*" - abortcontroller-polyfill "^1.1.9" - bignumber.js "~4.1.0" - chalk "^2.4.1" - detect-node "2.0.3" - ethereum-types "^1.1.4" - ethereumjs-util "^5.1.1" - ethers "~4.0.4" - isomorphic-fetch "^2.2.1" - js-sha3 "^0.7.0" - lodash "^4.17.5" - "@0xproject/npm-cli-login@^0.0.11": version "0.0.11" resolved "https://registry.yarnpkg.com/@0xproject/npm-cli-login/-/npm-cli-login-0.0.11.tgz#3f1ec06112ce62aad300ff0575358f68aeecde2e" @@ -564,12 +490,6 @@ dependencies: "@babel/types" "^7.0.0" -"@babel/helper-module-imports@^7.0.0": - version "7.0.0" - resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d" - dependencies: - "@babel/types" "^7.0.0" - "@babel/highlight@^7.0.0": version "7.0.0" resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4" @@ -610,16 +530,6 @@ dependencies: "@emotion/memoize" "^0.6.6" -"@emotion/is-prop-valid@^0.7.3": - version "0.7.3" - resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.7.3.tgz#a6bf4fa5387cbba59d44e698a4680f481a8da6cc" - dependencies: - "@emotion/memoize" "0.7.1" - -"@emotion/memoize@0.7.1": - version "0.7.1" - resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.1.tgz#e93c13942592cf5ef01aa8297444dc192beee52f" - "@emotion/memoize@^0.6.6": version "0.6.6" resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.6.6.tgz#004b98298d04c7ca3b4f50ca2035d4f60d2eed1b" @@ -1434,7 +1344,7 @@ dependencies: "@types/ethereum-protocol" "*" -"@types/glob@*", "@types/glob@5.0.35", "@types/glob@^5.0.33": +"@types/glob@*", "@types/glob@5.0.35": version "5.0.35" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.35.tgz#1ae151c802cece940443b5ac246925c85189f32a" dependencies: @@ -1513,7 +1423,7 @@ version "4.14.104" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.104.tgz#53ee2357fa2e6e68379341d92eb2ecea4b11bb80" -"@types/lodash@^4.14.110", "@types/lodash@^4.14.116": +"@types/lodash@^4.14.110": version "4.14.116" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.116.tgz#5ccf215653e3e8c786a58390751033a9adca0eb9" @@ -1525,13 +1435,6 @@ version "0.4.0" resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.4.0.tgz#057a6165703e7419217f8ffc6887747f980b6315" -"@types/material-ui@0.18.0": - version "0.18.0" - resolved "https://registry.yarnpkg.com/@types/material-ui/-/material-ui-0.18.0.tgz#f3abc5431df8faa4592233c6c5377f2843eb807f" - dependencies: - "@types/react" "*" - "@types/react-addons-linked-state-mixin" "*" - "@types/material-ui@^0.20.0": version "0.20.8" resolved "https://registry.npmjs.org/@types/material-ui/-/material-ui-0.20.8.tgz#76e46f9accc48944f532c3b1038a2b46214454fa" @@ -1547,7 +1450,7 @@ version "3.0.3" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" -"@types/mkdirp@^0.5.1", "@types/mkdirp@^0.5.2": +"@types/mkdirp@^0.5.2": version "0.5.2" resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.5.2.tgz#503aacfe5cc2703d5484326b1b27efa67a339c1f" dependencies: @@ -1557,10 +1460,6 @@ version "2.2.48" resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.48.tgz#3523b126a0b049482e1c3c11877460f76622ffab" -"@types/mocha@^5.2.2": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.3.tgz#11f3a5629d67cd444fa6c94536576244e6a52ea9" - "@types/node@*": version "9.6.5" resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.5.tgz#ee700810fdf49ac1c399fc5980b7559b3e5a381d" @@ -1569,10 +1468,6 @@ version "10.9.4" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897" -"@types/node@^10.5.3": - version "10.5.7" - resolved "https://registry.npmjs.org/@types/node/-/node-10.5.7.tgz#960d9feb3ade2233bcc9843c918d740b4f78a7cf" - "@types/numeral@^0.0.22": version "0.0.22" resolved "https://registry.yarnpkg.com/@types/numeral/-/numeral-0.0.22.tgz#86bef1f0a2d743afdc2ef3168d45f2905e1a0b93" @@ -1597,7 +1492,7 @@ dependencies: "@types/react" "*" -"@types/query-string@^5.0.1", "@types/query-string@^5.1.0": +"@types/query-string@^5.1.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@types/query-string/-/query-string-5.1.0.tgz#7f40cdea49ddafa0ea4f3db35fb6c24d3bfd4dcc" @@ -1630,23 +1525,23 @@ dependencies: "@types/react" "*" -"@types/react-dom@*": +"@types/react-dom@*", "@types/react-dom@16.0.6": version "16.0.6" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.6.tgz#f1a65a4e7be8ed5d123f8b3b9eacc913e35a1a3c" dependencies: "@types/node" "*" "@types/react" "*" -"@types/react-dom@^16.0.7": - version "16.0.7" - resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.0.7.tgz#54d0f867a76b90597e8432030d297982f25c20ba" +"@types/react-dom@^16.0.6": + version "16.0.11" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.11.tgz#bd10ccb0d9260343f4b9a49d4f7a8330a5c1f081" + integrity sha512-x6zUx9/42B5Kl2Vl9HlopV8JF64wLpX3c+Pst9kc1HgzrsH+mkehe/zmHMQTplIrR48H2gpU7ZqurQolYu8XBA== dependencies: - "@types/node" "*" "@types/react" "*" -"@types/react-dom@^16.0.8": - version "16.0.8" - resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.0.8.tgz#6e1366ed629cadf55860cbfcc25db533f5d2fa7d" +"@types/react-dom@^16.0.7": + version "16.0.7" + resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.0.7.tgz#54d0f867a76b90597e8432030d297982f25c20ba" dependencies: "@types/node" "*" "@types/react" "*" @@ -1663,13 +1558,6 @@ dependencies: "@types/react" "*" -"@types/react-loadable@^5.4.1": - version "5.4.1" - resolved "https://registry.yarnpkg.com/@types/react-loadable/-/react-loadable-5.4.1.tgz#bc76978c6d9039e5808797b5ee35f6ae18b7329f" - dependencies: - "@types/react" "*" - "@types/webpack" "*" - "@types/react-loadable@^5.4.2": version "5.4.3" resolved "https://registry.yarnpkg.com/@types/react-loadable/-/react-loadable-5.4.3.tgz#b3891da6609a869b021319494b27ba85aaa83634" @@ -1740,7 +1628,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^16.4.16": +"@types/react@*", "@types/react@16.4.16": version "16.4.16" resolved "https://registry.npmjs.org/@types/react/-/react-16.4.16.tgz#99f91b1200ae8c2062030402006d3b3c3a177043" dependencies: @@ -1778,7 +1666,7 @@ "@types/glob" "*" "@types/node" "*" -"@types/semver@5.5.0", "@types/semver@^5.5.0": +"@types/semver@5.5.0": version "5.5.0" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45" @@ -1844,7 +1732,7 @@ dependencies: source-map "^0.6.1" -"@types/uuid@^3.4.2", "@types/uuid@^3.4.3": +"@types/uuid@^3.4.3": version "3.4.3" resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.3.tgz#121ace265f5569ce40f4f6d0ff78a338c732a754" dependencies: @@ -1876,10 +1764,6 @@ "@types/events" "*" "@types/node" "*" -"@types/yargs@^10.0.0": - version "10.0.2" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-10.0.2.tgz#cc4ea921877874d1261e2c44b89807bc836e1b12" - "@types/yargs@^11.0.0": version "11.0.0" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.0.0.tgz#124b9ed9c65b7091cc36da59ae12cbd47d8745ea" @@ -3678,10 +3562,6 @@ browser-stdout@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f" -browser-stdout@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" - browserify-aes@^1.0.0, browserify-aes@^1.0.4, browserify-aes@^1.0.6: version "1.2.0" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" @@ -4070,7 +3950,7 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chai-as-promised@^7.1.0, chai-as-promised@^7.1.1: +chai-as-promised@^7.1.0: version "7.1.1" resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0" dependencies: @@ -4080,7 +3960,7 @@ chai-bignumber@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/chai-bignumber/-/chai-bignumber-3.0.0.tgz#e90cf1f468355bbb11a9acd051222586cd2648a9" -chai@^4.0.1, chai@^4.1.2: +chai@^4.0.1: version "4.1.2" resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.2.tgz#0f64584ba642f0f2ace2806279f4f06ca23ad73c" dependencies: @@ -4543,10 +4423,6 @@ commander@2.11.0: version "2.11.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" -commander@2.15.1, commander@^2.12.1, commander@^2.8.1: - version "2.15.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" - commander@2.17.x, commander@^2.7.1, commander@~2.17.1: version "2.17.1" resolved "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" @@ -4555,6 +4431,10 @@ commander@2.18.0: version "2.18.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970" +commander@^2.12.1, commander@^2.8.1: + version "2.15.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" + commander@^2.15.1, commander@^2.18.0: version "2.19.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" @@ -5292,12 +5172,6 @@ debug-log@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f" -debug@2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da" - dependencies: - ms "0.7.1" - debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -5630,7 +5504,7 @@ diff@3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75" -diff@3.5.0, diff@^3.1.0, diff@^3.2.0: +diff@^3.1.0, diff@^3.2.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" @@ -7930,10 +7804,6 @@ growl@1.10.3: version "1.10.3" resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f" -growl@1.10.5: - version "1.10.5" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" - growly@^1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -8246,14 +8116,14 @@ hoek@4.x.x: version "4.2.1" resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" -hoist-non-react-statics@^2.3.0, hoist-non-react-statics@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40" - hoist-non-react-statics@^2.3.1: version "2.5.5" resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47" +hoist-non-react-statics@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40" + home-or-tmp@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" @@ -9200,7 +9070,7 @@ isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" -isomorphic-fetch@2.2.1, isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1: +isomorphic-fetch@2.2.1, isomorphic-fetch@^2.1.1: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" dependencies: @@ -11115,7 +10985,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" -"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: +"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: @@ -11230,7 +11100,7 @@ mobx@^4.2.0: version "4.3.1" resolved "https://registry.npmjs.org/mobx/-/mobx-4.3.1.tgz#334e5aab4916b1d43f0faf3605a64b1b4b3ccb8d" -mocha@^4.0.1, mocha@^4.1.0: +mocha@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.1.0.tgz#7d86cfbcf35cb829e2754c32e17355ec05338794" dependencies: @@ -11245,22 +11115,6 @@ mocha@^4.0.1, mocha@^4.1.0: mkdirp "0.5.1" supports-color "4.4.0" -mocha@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" - dependencies: - browser-stdout "1.3.1" - commander "2.15.1" - debug "3.1.0" - diff "3.5.0" - escape-string-regexp "1.0.5" - glob "7.1.2" - growl "1.10.5" - he "1.1.1" - minimatch "3.0.4" - mkdirp "0.5.1" - supports-color "5.4.0" - mock-fs@^4.1.0: version "4.4.2" resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.4.2.tgz#09dec5313f97095a450be6aa2ad8ab6738d63d6b" @@ -11296,10 +11150,6 @@ move-concurrently@^1.0.1: rimraf "^2.5.4" run-queue "^1.0.3" -ms@0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098" - ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -11733,7 +11583,7 @@ npm-registry-fetch@^3.0.0, npm-registry-fetch@^3.8.0: make-fetch-happen "^4.0.1" npm-package-arg "^6.1.0" -npm-run-all@^4.1.2, npm-run-all@^4.1.3: +npm-run-all@^4.1.2: version "4.1.3" resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.3.tgz#49f15b55a66bb4101664ce270cb18e7103f8f185" dependencies: @@ -12603,12 +12453,6 @@ polished@^1.9.3: version "1.9.3" resolved "https://registry.npmjs.org/polished/-/polished-1.9.3.tgz#d61b8a0c4624efe31e2583ff24a358932b6b75e1" -polished@^2.2.0: - version "2.2.0" - resolved "https://registry.npmjs.org/polished/-/polished-2.2.0.tgz#5ca7e178cc5352bd7fd1efc45342f7c6d59cc982" - dependencies: - "@babel/runtime" "^7.0.0" - popper.js@1.14.3, popper.js@^1.14.1: version "1.14.3" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.3.tgz#1438f98d046acf7b4d78cd502bf418ac64d4f095" @@ -13497,7 +13341,8 @@ react-dom@^16.3.2: react-dom@^16.4.2: version "16.7.0" - resolved "https://registry.npmjs.org/react-dom/-/react-dom-16.7.0.tgz#a17b2a7ca89ee7390bc1ed5eb81783c7461748b8" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.7.0.tgz#a17b2a7ca89ee7390bc1ed5eb81783c7461748b8" + integrity sha512-D0Ufv1ExCAmF38P2Uh1lwpminZFRXEINJe53zRAbm4KPwSyd6DY/uDoS0Blj9jvPpn1+wivKpZYc8aAAN/nAkg== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -13555,9 +13400,9 @@ react-helmet@^5.2.0: prop-types "^15.5.4" react-side-effect "^1.1.0" -react-highlight@0xproject/react-highlight#fix/react-version: +react-highlight@0xproject/react-highlight: version "1.0.0" - resolved "https://codeload.github.com/0xproject/react-highlight/tar.gz/699ac4d9529e33520bff4b9bd9c624d21efbba75" + resolved "https://codeload.github.com/0xproject/react-highlight/tar.gz/a70c7631e09508dafc4719cbcc6f121074e1937d" dependencies: highlight.js "^9.11.0" highlightjs-solidity "^1.0.5" @@ -13670,17 +13515,6 @@ react-responsive@^6.0.1: matchmediaquery "^0.3.0" prop-types "^15.6.1" -react-router-dom@^4.1.1: - version "4.2.2" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.2.2.tgz#c8a81df3adc58bba8a76782e946cbd4eae649b8d" - dependencies: - history "^4.7.2" - invariant "^2.2.2" - loose-envify "^1.3.1" - prop-types "^15.5.4" - react-router "^4.2.0" - warning "^3.0.0" - react-router-dom@^4.3.1: version "4.3.1" resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6" @@ -13692,18 +13526,6 @@ react-router-dom@^4.3.1: react-router "^4.3.1" warning "^4.0.1" -react-router@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.2.0.tgz#61f7b3e3770daeb24062dae3eedef1b054155986" - dependencies: - history "^4.7.2" - hoist-non-react-statics "^2.3.0" - invariant "^2.2.2" - loose-envify "^1.3.1" - path-to-regexp "^1.7.0" - prop-types "^15.5.4" - warning "^3.0.0" - react-router@^4.3.1: version "4.3.1" resolved "https://registry.npmjs.org/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e" @@ -13832,7 +13654,8 @@ react@^16.3.2: react@^16.4.2: version "16.7.0" - resolved "https://registry.npmjs.org/react/-/react-16.7.0.tgz#b674ec396b0a5715873b350446f7ea0802ab6381" + resolved "https://registry.yarnpkg.com/react/-/react-16.7.0.tgz#b674ec396b0a5715873b350446f7ea0802ab6381" + integrity sha512-StCz3QY8lxTb5cl2HJxjwLFOXPIFQp+p+hxQfc8WE0QiLfCtIlKj8/+5tjjKm8uSTlAW+fCPaavGFS06V9Ar3A== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -14278,10 +14101,6 @@ replace-ext@1.0.0, replace-ext@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" -request-ip@~1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/request-ip/-/request-ip-1.2.3.tgz#66988f0e22406ec4af630d19b573fe4b447c3b49" - request-ip@~2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/request-ip/-/request-ip-2.0.2.tgz#deeae6d4af21768497db8cd05fa37143f8f1257e" @@ -14562,19 +14381,6 @@ rollbar-sourcemap-webpack-plugin@^2.4.0: request "^2.85.0" verror "^1.6.1" -rollbar@^0.6.5: - version "0.6.6" - resolved "https://registry.yarnpkg.com/rollbar/-/rollbar-0.6.6.tgz#8630cff4af967667d06b227f243635ea86dcc5ba" - dependencies: - async "~1.2.1" - debug "2.2.0" - json-stringify-safe "~5.0.0" - lru-cache "~2.2.1" - request-ip "~1.2.3" - uuid "~3.0.0" - optionalDependencies: - decache "^3.0.5" - rollbar@^2.4.7: version "2.4.7" resolved "https://registry.yarnpkg.com/rollbar/-/rollbar-2.4.7.tgz#9b1de1a0fab6b6e63fcfcd322c26081a1d8242e8" @@ -14729,7 +14535,8 @@ schedule@^0.5.0: scheduler@^0.12.0: version "0.12.0" - resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.12.0.tgz#8ab17699939c0aedc5a196a657743c496538647b" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.12.0.tgz#8ab17699939c0aedc5a196a657743c496538647b" + integrity sha512-t7MBR28Akcp4Jm+QoR63XgAi9YgCUmgvDHqf5otgAj4QvdoBE4ImCX0ffehefePPG+aitiYHp0g/mW6s4Tp+dw== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -15767,35 +15574,6 @@ styled-components@^3.3.3: stylis-rule-sheet "^0.0.10" supports-color "^3.2.3" -styled-components@^4.0.1: - version "4.1.3" - resolved "https://registry.npmjs.org/styled-components/-/styled-components-4.1.3.tgz#4472447208e618b57e84deaaeb6acd34a5e0fe9b" - dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@emotion/is-prop-valid" "^0.7.3" - "@emotion/unitless" "^0.7.0" - babel-plugin-styled-components ">= 1" - css-to-react-native "^2.2.2" - memoize-one "^4.0.0" - prop-types "^15.5.4" - react-is "^16.6.0" - stylis "^3.5.0" - stylis-rule-sheet "^0.0.10" - supports-color "^5.5.0" - -styled-components@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-4.0.2.tgz#7d4409ada019cdd34c25ba68c4577ea95dbcf0c5" - dependencies: - "@emotion/is-prop-valid" "^0.6.8" - babel-plugin-styled-components ">= 1" - css-to-react-native "^2.2.2" - memoize-one "^4.0.0" - prop-types "^15.5.4" - react-is "^16.3.1" - stylis "^3.5.0" - stylis-rule-sheet "^0.0.10" - styled-components@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-4.1.1.tgz#943922048fae556e286bcbfdd29da4f1399446bc" @@ -15829,12 +15607,6 @@ supports-color@4.4.0: dependencies: has-flag "^2.0.0" -supports-color@5.4.0, supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" - dependencies: - has-flag "^3.0.0" - supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -15845,6 +15617,12 @@ supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3: dependencies: has-flag "^1.0.0" +supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0: + version "5.4.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" + dependencies: + has-flag "^3.0.0" + supports-color@^5.5.0: version "5.5.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -16488,30 +16266,13 @@ tslint@5.11.0: tslib "^1.8.0" tsutils "^2.27.2" -tslint@^5.9.1: - version "5.9.1" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.9.1.tgz#1255f87a3ff57eb0b0e1f0e610a8b4748046c9ae" - dependencies: - babel-code-frame "^6.22.0" - builtin-modules "^1.1.1" - chalk "^2.3.0" - commander "^2.12.1" - diff "^3.2.0" - glob "^7.1.1" - js-yaml "^3.7.0" - minimatch "^3.0.4" - resolve "^1.3.2" - semver "^5.3.0" - tslib "^1.8.0" - tsutils "^2.12.1" - tsutils@3.0.0, tsutils@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.0.0.tgz#0c5070a17a0503e056da038c48b5a1870a50a9ad" dependencies: tslib "^1.8.1" -tsutils@^2.12.1, tsutils@^2.13.1, tsutils@^2.27.2: +tsutils@^2.13.1, tsutils@^2.27.2: version "2.29.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" dependencies: @@ -17031,7 +16792,7 @@ uuid@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.1.tgz#c2a30dedb3e535d72ccf82e343941a50ba8533ac" -uuid@3.0.x, uuid@~3.0.0: +uuid@3.0.x: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" @@ -17612,7 +17373,7 @@ webpack-bundle-analyzer@^3.0.3: opener "^1.5.1" ws "^6.0.0" -webpack-cli@3.1.2, webpack-cli@^3.1.1: +webpack-cli@3.1.2: version "3.1.2" resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.1.2.tgz#17d7e01b77f89f884a2bbf9db545f0f6a648e746" dependencies: -- cgit v1.2.3 From 09a5b6e7a3cc595249d8dac83b5a7e3fed9d7667 Mon Sep 17 00:00:00 2001 From: xianny Date: Tue, 5 Feb 2019 19:05:45 +0800 Subject: update error msg for dependency version check --- packages/monorepo-scripts/src/deps_versions.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/monorepo-scripts/src/deps_versions.ts b/packages/monorepo-scripts/src/deps_versions.ts index 0bb255508..0d01a2e3c 100644 --- a/packages/monorepo-scripts/src/deps_versions.ts +++ b/packages/monorepo-scripts/src/deps_versions.ts @@ -36,7 +36,9 @@ if (require.main === module) { utils.log(`├── ${chalk.bold('IGNORED')}`); printVersionsByDependency(ignoredMultiples); if (Object.keys(multiples).length !== 0) { - utils.log(`Add space-separated exceptions to root package.json config.ignoreDependencyVersions`); + utils.log( + `Some dependencies have multiple versions. Please fix by trying to find compatible versions. As a last resort, you can add space-separated exceptions to root package.json config.ignoreDependencyVersions`, + ); process.exit(1); } } -- cgit v1.2.3