aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2019-01-25 11:47:56 +0800
committerGitHub <noreply@github.com>2019-01-25 11:47:56 +0800
commite0022cd98c34fee5cb3adac38cf8920bbd30ac6c (patch)
tree29483973f864f3dc389d1ed872ed30e98e07c6d8
parent5b06595a6b6d459d53840d066fb204c0a9e3ed02 (diff)
parentbcff25c9968e693fd05e4c2754611fe22dafa3ab (diff)
downloaddexon-0x-contracts-e0022cd98c34fee5cb3adac38cf8920bbd30ac6c.tar.gz
dexon-0x-contracts-e0022cd98c34fee5cb3adac38cf8920bbd30ac6c.tar.zst
dexon-0x-contracts-e0022cd98c34fee5cb3adac38cf8920bbd30ac6c.zip
Merge pull request #1547 from 0xProject/feat/contracts/lock-dependencies
Lock versions of all dependencies that are contracts packages
-rw-r--r--contracts/asset-proxy/package.json6
-rw-r--r--contracts/erc20/package.json4
-rw-r--r--contracts/erc721/package.json2
-rw-r--r--contracts/exchange-forwarder/package.json12
-rw-r--r--contracts/exchange-libs/package.json2
-rw-r--r--contracts/exchange/package.json10
-rw-r--r--contracts/extensions/package.json12
-rw-r--r--contracts/multisig/package.json4
-rw-r--r--yarn.lock32
9 files changed, 28 insertions, 56 deletions
diff --git a/contracts/asset-proxy/package.json b/contracts/asset-proxy/package.json
index 6d4ba8b8b..360fdab75 100644
--- a/contracts/asset-proxy/package.json
+++ b/contracts/asset-proxy/package.json
@@ -65,9 +65,9 @@
"dependencies": {
"@0x/base-contract": "^3.0.13",
"@0x/contracts-test-utils": "^2.0.1",
- "@0x/contracts-erc20": "^1.0.0",
- "@0x/contracts-erc721": "^1.0.0",
- "@0x/contracts-utils": "^3.0.0",
+ "@0x/contracts-erc20": "1.0.0",
+ "@0x/contracts-erc721": "1.0.0",
+ "@0x/contracts-utils": "3.0.0",
"@0x/order-utils": "^3.1.2",
"@0x/types": "^1.5.2",
"@0x/typescript-typings": "^3.0.8",
diff --git a/contracts/erc20/package.json b/contracts/erc20/package.json
index 7616b9ccf..778b9257d 100644
--- a/contracts/erc20/package.json
+++ b/contracts/erc20/package.json
@@ -65,8 +65,8 @@
},
"dependencies": {
"@0x/base-contract": "^3.0.13",
- "@0x/contracts-exchange-libs": "^1.0.0",
- "@0x/contracts-utils": "^3.0.0",
+ "@0x/contracts-exchange-libs": "1.0.0",
+ "@0x/contracts-utils": "3.0.0",
"@0x/types": "^1.5.2",
"@0x/typescript-typings": "^3.0.8",
"@0x/utils": "^3.0.1",
diff --git a/contracts/erc721/package.json b/contracts/erc721/package.json
index 8e83ea4e4..096e1025e 100644
--- a/contracts/erc721/package.json
+++ b/contracts/erc721/package.json
@@ -65,7 +65,7 @@
},
"dependencies": {
"@0x/base-contract": "^3.0.13",
- "@0x/contracts-utils": "^3.0.0",
+ "@0x/contracts-utils": "3.0.0",
"@0x/types": "^1.5.2",
"@0x/typescript-typings": "^3.0.8",
"@0x/utils": "^3.0.1",
diff --git a/contracts/exchange-forwarder/package.json b/contracts/exchange-forwarder/package.json
index 7ec103746..73a30e851 100644
--- a/contracts/exchange-forwarder/package.json
+++ b/contracts/exchange-forwarder/package.json
@@ -66,12 +66,12 @@
},
"dependencies": {
"@0x/base-contract": "^3.0.13",
- "@0x/contracts-asset-proxy": "^1.0.0",
- "@0x/contracts-exchange-libs": "^1.0.0",
- "@0x/contracts-exchange": "^1.0.0",
- "@0x/contracts-erc20": "^1.0.0",
- "@0x/contracts-erc721": "^1.0.0",
- "@0x/contracts-utils": "^3.0.0",
+ "@0x/contracts-asset-proxy": "1.0.0",
+ "@0x/contracts-exchange-libs": "1.0.0",
+ "@0x/contracts-exchange": "1.0.0",
+ "@0x/contracts-erc20": "1.0.0",
+ "@0x/contracts-erc721": "1.0.0",
+ "@0x/contracts-utils": "3.0.0",
"@0x/order-utils": "^3.1.2",
"@0x/types": "^1.5.2",
"@0x/typescript-typings": "^3.0.8",
diff --git a/contracts/exchange-libs/package.json b/contracts/exchange-libs/package.json
index 9d35106cc..f3efdd00e 100644
--- a/contracts/exchange-libs/package.json
+++ b/contracts/exchange-libs/package.json
@@ -65,7 +65,7 @@
},
"dependencies": {
"@0x/base-contract": "^3.0.13",
- "@0x/contracts-utils": "^3.0.0",
+ "@0x/contracts-utils": "3.0.0",
"@0x/order-utils": "^3.1.2",
"@0x/types": "^1.5.2",
"@0x/typescript-typings": "^3.0.8",
diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json
index 9d7db1862..a11767626 100644
--- a/contracts/exchange/package.json
+++ b/contracts/exchange/package.json
@@ -64,12 +64,12 @@
},
"dependencies": {
"@0x/base-contract": "^3.0.13",
- "@0x/contracts-asset-proxy": "^1.0.0",
- "@0x/contracts-exchange-libs": "^1.0.0",
+ "@0x/contracts-asset-proxy": "1.0.0",
+ "@0x/contracts-exchange-libs": "1.0.0",
"@0x/contracts-test-utils": "^2.0.1",
- "@0x/contracts-erc20": "^1.0.0",
- "@0x/contracts-erc721": "^1.0.0",
- "@0x/contracts-utils": "^3.0.0",
+ "@0x/contracts-erc20": "1.0.0",
+ "@0x/contracts-erc721": "1.0.0",
+ "@0x/contracts-utils": "3.0.0",
"@0x/order-utils": "^3.1.2",
"@0x/types": "^1.5.2",
"@0x/typescript-typings": "^3.0.8",
diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json
index 780244f37..ad829033f 100644
--- a/contracts/extensions/package.json
+++ b/contracts/extensions/package.json
@@ -66,12 +66,12 @@
},
"dependencies": {
"@0x/base-contract": "^3.0.13",
- "@0x/contracts-asset-proxy": "^1.0.0",
- "@0x/contracts-exchange-libs": "^1.0.0",
- "@0x/contracts-exchange": "^1.0.0",
- "@0x/contracts-erc20": "^1.0.0",
- "@0x/contracts-erc721": "^1.0.0",
- "@0x/contracts-utils": "^3.0.0",
+ "@0x/contracts-asset-proxy": "1.0.0",
+ "@0x/contracts-exchange-libs": "1.0.0",
+ "@0x/contracts-exchange": "1.0.0",
+ "@0x/contracts-erc20": "1.0.0",
+ "@0x/contracts-erc721": "1.0.0",
+ "@0x/contracts-utils": "3.0.0",
"@0x/order-utils": "^3.1.2",
"@0x/types": "^1.5.2",
"@0x/typescript-typings": "^3.0.8",
diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json
index 3282e0ae5..cbdd96fd8 100644
--- a/contracts/multisig/package.json
+++ b/contracts/multisig/package.json
@@ -65,8 +65,8 @@
},
"dependencies": {
"@0x/base-contract": "^3.0.13",
- "@0x/contracts-asset-proxy": "^1.0.0",
- "@0x/contracts-erc20": "^1.0.0",
+ "@0x/contracts-asset-proxy": "1.0.0",
+ "@0x/contracts-erc20": "1.0.0",
"@0x/types": "^1.5.2",
"@0x/typescript-typings": "^3.0.8",
"@0x/utils": "^3.0.1",
diff --git a/yarn.lock b/yarn.lock
index 543ec9d5c..d83b4f31b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13395,16 +13395,6 @@ react-dom@^16.3.2:
object-assign "^4.1.1"
prop-types "^15.6.0"
-react-dom@^16.4.2:
- version "16.7.0"
- resolved "https://registry.npmjs.org/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"
- prop-types "^15.6.2"
- scheduler "^0.12.0"
-
react-dom@^16.5.2:
version "16.5.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7"
@@ -13462,8 +13452,8 @@ react-highlight@0xproject/react-highlight#fix/react-version:
dependencies:
highlight.js "^9.11.0"
highlightjs-solidity "^1.0.5"
- react "^16.5.2"
- react-dom "^16.5.2"
+ react "^16.4.2"
+ react-dom "^16.4.2"
react-hot-loader@^4.3.3:
version "4.3.4"
@@ -13731,16 +13721,6 @@ react@^16.3.2:
object-assign "^4.1.1"
prop-types "^15.6.0"
-react@^16.4.2:
- version "16.7.0"
- resolved "https://registry.npmjs.org/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"
- prop-types "^15.6.2"
- scheduler "^0.12.0"
-
react@^16.5.2:
version "16.5.2"
resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42"
@@ -14629,14 +14609,6 @@ schedule@^0.5.0:
dependencies:
object-assign "^4.1.1"
-scheduler@^0.12.0:
- version "0.12.0"
- resolved "https://registry.npmjs.org/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"
-
schema-utils@^0.4.4:
version "0.4.7"
resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"