Merge development

1 files changed, 34 insertions, 15 deletions

diff --git a/packages/website/package.json b/packages/website/package.json
index bb64b24db..bb97ea4e8 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/website",
-    "version": "0.0.59",
+    "version": "0.0.63",
     "engines": {
         "node": ">=6.12"
     },
@@ -13,29 +13,36 @@
         "clean": "shx rm -f public/bundle*",
         "lint": "tslint --format stylish --project . 'ts/**/*.ts' 'ts/**/*.tsx'",
         "dev": "webpack-dev-server --mode development --content-base public --https",
-        "deploy_dogfood": "npm run build:prod; aws s3 sync ./public/. s3://dogfood.0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
+        "deploy_dogfood": "npm run build:prod; aws s3 sync ./public/. s3://dogfood.0x.org --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
         "deploy_staging": "npm run build:prod; 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": "DEPLOY_ROLLBAR_SOURCEMAPS=true npm run build:prod; aws s3 sync ./public/. s3://0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --exclude *.map.js"
+        "deploy_live": "DEPLOY_ROLLBAR_SOURCEMAPS=true npm run build:prod; aws s3 sync ./public/. s3://0x.org --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --exclude *.map.js"
     },
     "author": "Fabio Berger",
     "license": "Apache-2.0",
     "dependencies": {
-        "@0x/contract-wrappers": "^4.0.2",
-        "@0x/json-schemas": "^2.1.1",
-        "@0x/order-utils": "^3.0.2",
-        "@0x/react-docs": "^1.0.18",
-        "@0x/react-shared": "^1.0.21",
-        "@0x/subproviders": "^2.1.4",
-        "@0x/types": "^1.2.1",
+        "@0x/asset-buyer": "^3.0.4",
+        "@0x/contract-addresses": "^2.0.0",
+        "@0x/contract-wrappers": "^4.1.1",
+        "@0x/json-schemas": "^2.1.2",
+        "@0x/order-utils": "^3.0.4",
+        "@0x/react-docs": "^1.0.20",
+        "@0x/react-shared": "^1.0.23",
+        "@0x/subproviders": "^2.1.6",
+        "@0x/types": "^1.3.0",
         "@0x/typescript-typings": "^3.0.4",
-        "@0x/utils": "^2.0.5",
-        "@0x/web3-wrapper": "^3.1.4",
+        "@0x/utils": "^2.0.6",
+        "@0x/web3-wrapper": "^3.1.6",
+        "@reach/dialog": "^0.1.2",
+        "@types/react-lazyload": "^2.3.1",
+        "@types/react-loadable": "^5.4.2",
+        "@types/react-syntax-highlighter": "^0.0.8",
+        "@types/styled-components": "^4.1.1",
         "accounting": "^0.4.1",
         "basscss": "^8.0.3",
         "blockies": "^0.0.2",
         "bowser": "^1.9.3",
         "deep-equal": "^1.0.1",
-        "ethereum-types": "^1.1.2",
+        "ethereum-types": "^1.1.4",
         "ethereumjs-util": "^5.1.1",
         "find-versions": "^2.0.0",
         "jsonschema": "^1.2.0",
@@ -46,21 +53,29 @@
         "numeral": "^2.0.6",
         "polished": "^1.9.2",
         "query-string": "^6.0.0",
+        "rc-slider": "^8.6.3",
         "react": "^16.4.2",
         "react-copy-to-clipboard": "^5.0.0",
         "react-document-title": "^2.0.3",
         "react-dom": "^16.4.2",
+        "react-flickity-component": "^3.1.0",
+        "react-headroom": "2.2.2",
         "react-helmet": "^5.2.0",
+        "react-lazyload": "^2.3.0",
+        "react-loadable": "^5.5.0",
         "react-popper": "^1.0.0-beta.6",
         "react-redux": "^5.0.3",
+        "react-responsive": "^6.0.1",
         "react-scroll": "0xproject/react-scroll#pr-330-and-replace-state",
+        "react-scrollable-anchor": "^0.6.1",
+        "react-syntax-highlighter": "^10.1.1",
         "react-tooltip": "^3.2.7",
         "react-typist": "^2.0.4",
         "redux": "^3.6.0",
         "redux-devtools-extension": "^2.13.2",
         "rollbar": "^2.4.7",
         "semver-sort": "0.0.4",
-        "styled-components": "^3.3.0",
+        "styled-components": "^4.1.1",
         "thenby": "^1.2.3",
         "truffle-contract": "2.0.1",
         "web3-provider-engine": "14.0.6",
@@ -77,12 +92,14 @@
         "@types/node": "*",
         "@types/numeral": "^0.0.22",
         "@types/query-string": "^5.1.0",
-        "@types/react": "^16.4.2",
+        "@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-helmet": "^5.0.6",
         "@types/react-redux": "^4.4.37",
         "@types/react-scroll": "1.5.3",
+        "@types/react-syntax-highlighter": "^0.0.8",
         "@types/react-tap-event-plugin": "0.0.30",
         "@types/redux": "^3.6.0",
         "@types/web3-provider-engine": "^14.0.0",
@@ -91,6 +108,7 @@
         "less-loader": "^4.1.0",
         "make-promises-safe": "^1.1.0",
         "raw-loader": "^0.5.1",
+        "react-svg-loader": "^2.1.0",
         "rollbar-sourcemap-webpack-plugin": "^2.4.0",
         "shx": "^0.2.2",
         "source-map-loader": "^0.2.4",
@@ -101,6 +119,7 @@
         "typescript": "3.0.1",
         "uglifyjs-webpack-plugin": "^2.0.1",
         "webpack": "^4.20.2",
+        "webpack-bundle-analyzer": "^3.0.3",
         "webpack-cli": "3.1.2",
         "webpack-dev-server": "^3.1.9"
     }