From 16fa0fdda1751d675aa4fc0abf1c77ae4ff95550 Mon Sep 17 00:00:00 2001 From: fragosti Date: Fri, 2 Nov 2018 17:12:33 -0700 Subject: feat: break up deploy into deploy-dogfood and deploy-staging --- packages/instant/.discharge.json | 13 ------------- packages/instant/.dogfood.discharge.json | 13 +++++++++++++ packages/instant/.staging.discharge.json | 13 +++++++++++++ packages/instant/README.md | 10 +++++++++- packages/instant/package.json | 5 +++-- 5 files changed, 38 insertions(+), 16 deletions(-) delete mode 100644 packages/instant/.discharge.json create mode 100644 packages/instant/.dogfood.discharge.json create mode 100644 packages/instant/.staging.discharge.json (limited to 'packages') diff --git a/packages/instant/.discharge.json b/packages/instant/.discharge.json deleted file mode 100644 index 9ade97d01..000000000 --- a/packages/instant/.discharge.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "domain": "0x-instant-dogfood", - "build_command": "yarn build:umd:prod", - "upload_directory": "public", - "index_key": "index.html", - "error_key": "index.html", - "trailing_slashes": true, - "cache": 3600, - "aws_profile": "default", - "aws_region": "us-east-1", - "cdn": false, - "dns_configured": true -} diff --git a/packages/instant/.dogfood.discharge.json b/packages/instant/.dogfood.discharge.json new file mode 100644 index 000000000..9ade97d01 --- /dev/null +++ b/packages/instant/.dogfood.discharge.json @@ -0,0 +1,13 @@ +{ + "domain": "0x-instant-dogfood", + "build_command": "yarn build:umd:prod", + "upload_directory": "public", + "index_key": "index.html", + "error_key": "index.html", + "trailing_slashes": true, + "cache": 3600, + "aws_profile": "default", + "aws_region": "us-east-1", + "cdn": false, + "dns_configured": true +} diff --git a/packages/instant/.staging.discharge.json b/packages/instant/.staging.discharge.json new file mode 100644 index 000000000..e36d256de --- /dev/null +++ b/packages/instant/.staging.discharge.json @@ -0,0 +1,13 @@ +{ + "domain": "0x-instant-staging", + "build_command": "yarn build:umd:prod", + "upload_directory": "public", + "index_key": "index.html", + "error_key": "index.html", + "trailing_slashes": true, + "cache": 3600, + "aws_profile": "default", + "aws_region": "us-east-1", + "cdn": false, + "dns_configured": true +} diff --git a/packages/instant/README.md b/packages/instant/README.md index 07b01ac95..0638c1824 100644 --- a/packages/instant/README.md +++ b/packages/instant/README.md @@ -53,7 +53,15 @@ You can deploy a work-in-progress version of 0x Instant at http://0x-instant-dog To build and deploy the site run ``` -yarn deploy +yarn deploy-dogfood +``` + +We also have a staging bucket that is to be updated less frequently can be used to share instant externally: http://0x-instant-staging.s3-website-us-east-1.amazonaws.com/ + +To build and deploy to this bucket, rub + +``` +yarn deploy-staging ``` **NOTE: On deploying the site, it will say the site is available at a non-existent URL. Please ignore and use the (now updated) URL above.** diff --git a/packages/instant/package.json b/packages/instant/package.json index 81d2e4c7b..a7fc09805 100644 --- a/packages/instant/package.json +++ b/packages/instant/package.json @@ -22,7 +22,8 @@ "rebuild_and_test": "run-s clean build test", "test:circleci": "yarn test:coverage", "clean": "shx rm -rf lib coverage scripts", - "deploy": "discharge deploy", + "deploy-dogfood": "discharge deploy -c .dogfood.discharge.json", + "deploy-staging": "discharge deploy -c .staging.discharge.json", "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "config": { @@ -65,7 +66,7 @@ }, "devDependencies": { "@0x/tslint-config": "^1.0.9", - "@static/discharge": "^1.2.2", + "@static/discharge": "https://github.com/0xProject/discharge.git", "@types/enzyme": "^3.1.14", "@types/enzyme-adapter-react-16": "^1.0.3", "@types/jest": "^23.3.5", -- cgit v1.2.3 From 245fa954246e32c973a92e7474aacf74ab8940d8 Mon Sep 17 00:00:00 2001 From: fragosti Date: Fri, 2 Nov 2018 17:16:49 -0700 Subject: fix: typo in README --- packages/instant/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/instant/README.md b/packages/instant/README.md index 0638c1824..3fd6efbea 100644 --- a/packages/instant/README.md +++ b/packages/instant/README.md @@ -58,7 +58,7 @@ yarn deploy-dogfood We also have a staging bucket that is to be updated less frequently can be used to share instant externally: http://0x-instant-staging.s3-website-us-east-1.amazonaws.com/ -To build and deploy to this bucket, rub +To build and deploy to this bucket, run ``` yarn deploy-staging -- cgit v1.2.3 From bb9c21fb14a87b4d9eeed8b45815d22bee8be203 Mon Sep 17 00:00:00 2001 From: fragosti Date: Fri, 2 Nov 2018 17:26:04 -0700 Subject: chore: prettier and linter --- packages/instant/.staging.discharge.json | 22 +++++++++++----------- packages/instant/src/redux/reducer.ts | 1 - 2 files changed, 11 insertions(+), 12 deletions(-) (limited to 'packages') diff --git a/packages/instant/.staging.discharge.json b/packages/instant/.staging.discharge.json index e36d256de..1026b9986 100644 --- a/packages/instant/.staging.discharge.json +++ b/packages/instant/.staging.discharge.json @@ -1,13 +1,13 @@ { - "domain": "0x-instant-staging", - "build_command": "yarn build:umd:prod", - "upload_directory": "public", - "index_key": "index.html", - "error_key": "index.html", - "trailing_slashes": true, - "cache": 3600, - "aws_profile": "default", - "aws_region": "us-east-1", - "cdn": false, - "dns_configured": true + "domain": "0x-instant-staging", + "build_command": "yarn build:umd:prod", + "upload_directory": "public", + "index_key": "index.html", + "error_key": "index.html", + "trailing_slashes": true, + "cache": 3600, + "aws_profile": "default", + "aws_region": "us-east-1", + "cdn": false, + "dns_configured": true } diff --git a/packages/instant/src/redux/reducer.ts b/packages/instant/src/redux/reducer.ts index 8c1902bb8..bc435d069 100644 --- a/packages/instant/src/redux/reducer.ts +++ b/packages/instant/src/redux/reducer.ts @@ -15,7 +15,6 @@ import { OrderProcessState, OrderState, } from '../types'; -import { assetUtils } from '../util/asset'; import { Action, ActionTypes } from './actions'; -- cgit v1.2.3 From 18d24f8db19d0216044e2069cd67f1edce9b76a9 Mon Sep 17 00:00:00 2001 From: fragosti Date: Mon, 5 Nov 2018 16:47:52 -0800 Subject: chore: move to underscores --- packages/instant/README.md | 4 ++-- packages/instant/package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/instant/README.md b/packages/instant/README.md index 3fd6efbea..b83a10508 100644 --- a/packages/instant/README.md +++ b/packages/instant/README.md @@ -53,7 +53,7 @@ You can deploy a work-in-progress version of 0x Instant at http://0x-instant-dog To build and deploy the site run ``` -yarn deploy-dogfood +yarn deploy_dogfood ``` We also have a staging bucket that is to be updated less frequently can be used to share instant externally: http://0x-instant-staging.s3-website-us-east-1.amazonaws.com/ @@ -61,7 +61,7 @@ We also have a staging bucket that is to be updated less frequently can be used To build and deploy to this bucket, run ``` -yarn deploy-staging +yarn deploy_staging ``` **NOTE: On deploying the site, it will say the site is available at a non-existent URL. Please ignore and use the (now updated) URL above.** diff --git a/packages/instant/package.json b/packages/instant/package.json index a7fc09805..f90990649 100644 --- a/packages/instant/package.json +++ b/packages/instant/package.json @@ -22,8 +22,8 @@ "rebuild_and_test": "run-s clean build test", "test:circleci": "yarn test:coverage", "clean": "shx rm -rf lib coverage scripts", - "deploy-dogfood": "discharge deploy -c .dogfood.discharge.json", - "deploy-staging": "discharge deploy -c .staging.discharge.json", + "deploy_dogfood": "discharge deploy -c .dogfood.discharge.json", + "deploy_staging": "discharge deploy -c .staging.discharge.json", "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "config": { -- cgit v1.2.3