aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website
diff options
context:
space:
mode:
authorLeonid <logvinov.leon@gmail.com>2018-02-05 19:00:05 +0800
committerGitHub <noreply@github.com>2018-02-05 19:00:05 +0800
commitf18fa8e9477b5a6e17216b292b70b3bd60a792ef (patch)
tree6c35f5a813f6bcba9559a7f78186a13c4f40bfbe /packages/website
parent03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778 (diff)
parent44cd185c66b08a5a9b081c972e7cb6764c066506 (diff)
downloaddexon-0x-contracts-f18fa8e9477b5a6e17216b292b70b3bd60a792ef.tar
dexon-0x-contracts-f18fa8e9477b5a6e17216b292b70b3bd60a792ef.tar.gz
dexon-0x-contracts-f18fa8e9477b5a6e17216b292b70b3bd60a792ef.tar.bz2
dexon-0x-contracts-f18fa8e9477b5a6e17216b292b70b3bd60a792ef.tar.lz
dexon-0x-contracts-f18fa8e9477b5a6e17216b292b70b3bd60a792ef.tar.xz
dexon-0x-contracts-f18fa8e9477b5a6e17216b292b70b3bd60a792ef.tar.zst
dexon-0x-contracts-f18fa8e9477b5a6e17216b292b70b3bd60a792ef.zip
Merge branch 'development' into feature/build_watch
Diffstat (limited to 'packages/website')
-rw-r--r--packages/website/package.json19
-rw-r--r--packages/website/ts/containers/zero_ex_js_documentation.tsx1
2 files changed, 9 insertions, 11 deletions
diff --git a/packages/website/package.json b/packages/website/package.json
index a3573b40f..295675fa3 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/website",
- "version": "0.0.10",
+ "version": "0.0.11",
"private": true,
"description": "Website and 0x portal dapp",
"scripts": {
@@ -8,12 +8,9 @@
"clean": "shx rm -f public/bundle*",
"lint": "tslint --project . 'ts/**/*.ts' 'ts/**/*.tsx'",
"dev": "webpack-dev-server --content-base public --https",
- "update_contracts":
- "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ../contracts/build/contracts/$i.json ../website/contracts; done;",
- "deploy_staging":
- "npm run build; aws s3 sync ./public/. s3://staging-0xproject --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
- "deploy_live":
- "npm run build; aws s3 sync ./public/. s3://0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers"
+ "update_contracts": "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ../contracts/build/contracts/$i.json ../website/contracts; done;",
+ "deploy_staging": "npm run build; aws s3 sync ./public/. s3://staging-0xproject --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
+ "deploy_live": "npm run build; aws s3 sync ./public/. s3://0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers"
},
"config": {
"artifacts": "Mintable"
@@ -21,9 +18,9 @@
"author": "Fabio Berger",
"license": "Apache-2.0",
"dependencies": {
- "0x.js": "^0.31.0",
- "@0xproject/subproviders": "^0.3.4",
- "@0xproject/utils": "^0.2.3",
+ "0x.js": "^0.31.1",
+ "@0xproject/subproviders": "^0.3.5",
+ "@0xproject/utils": "^0.2.4",
"accounting": "^0.4.1",
"basscss": "^8.0.3",
"blockies": "^0.0.2",
@@ -100,7 +97,7 @@
"style-loader": "0.13.x",
"tslint": "5.8.0",
"typescript": "2.7.1",
- "web3-typescript-typings": "^0.9.7",
+ "web3-typescript-typings": "^0.9.8",
"webpack": "^3.1.0",
"webpack-dev-middleware": "^1.10.0",
"webpack-dev-server": "^2.5.0"
diff --git a/packages/website/ts/containers/zero_ex_js_documentation.tsx b/packages/website/ts/containers/zero_ex_js_documentation.tsx
index 8ae6a7b73..96c8c257d 100644
--- a/packages/website/ts/containers/zero_ex_js_documentation.tsx
+++ b/packages/website/ts/containers/zero_ex_js_documentation.tsx
@@ -119,6 +119,7 @@ const docsInfoConfig: DocsInfoConfig = {
'OrderStateValid',
'OrderStateInvalid',
'OrderState',
+ 'OrderStateWatcherConfig',
'FilterObject',
],
sectionNameToModulePath: {