crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cdn -> dischargeTarget, and report to heap

Browse Source
This commit is contained in:
Steve Klebanoff 2018-11-30 12:42:40 -08:00
parent e59d47eac8
commit ab631060a0
7 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/instant/.dogfood.discharge.json
View File

@ -1,6 +1,6 @@
{
"domain": "0x-instant-dogfood",
"build_command": "WEBPACK_OUTPUT_PATH=public yarn build:prod --env.cdn=staging",
"build_command": "WEBPACK_OUTPUT_PATH=public yarn build --env.discharge_target=dogfood",
"upload_directory": "public",
"index_key": "index.html",
"error_key": "index.html",

2
packages/instant/.production.discharge.json
View File

@ -1,6 +1,6 @@
{
"domain": "instant.0xproject.com",
"build_command": "yarn build --env.cdn=production",
"build_command": "yarn build --env.discharge_target=production",
"upload_directory": "umd",
"index_key": "instant.js",
"error_key": "404.html",

2
packages/instant/.staging.discharge.json
View File

@ -1,6 +1,6 @@
{
"domain": "0x-instant-staging",
"build_command": "WEBPACK_OUTPUT_PATH=public yarn build --env.cdn=staging",
"build_command": "WEBPACK_OUTPUT_PATH=public yarn build --env.discharge_target=staging",
"upload_directory": "public",
"index_key": "index.html",
"error_key": "index.html",

7
packages/instant/src/components/zero_ex_instant_provider.tsx
View File

@ -5,7 +5,11 @@ import * as _ from 'lodash';
import * as React from 'react';
import { Provider as ReduxProvider } from 'react-redux';
import { ACCOUNT_UPDATE_INTERVAL_TIME_MS, BUY_QUOTE_UPDATE_INTERVAL_TIME_MS } from '../constants';
import {
ACCOUNT_UPDATE_INTERVAL_TIME_MS,
BUY_QUOTE_UPDATE_INTERVAL_TIME_MS,
INSTANT_DISCHARGE_TARGET,
} from '../constants';
import { SelectedAssetThemeProvider } from '../containers/selected_asset_theme_provider';
import { asyncData } from '../redux/async_data';
import { DEFAULT_STATE, DefaultState, State } from '../redux/reducer';
@ -132,6 +136,7 @@ export class ZeroExInstantProvider extends React.Component<ZeroExInstantProvider
providerName: state.providerState.name,
gitSha: process.env.GIT_SHA,
npmVersion: process.env.NPM_PACKAGE_VERSION,
instantEnvironment: INSTANT_DISCHARGE_TARGET || `Local ${process.env.NODE_ENV}`,
});
analytics.trackInstantOpened();
}

6
packages/instant/src/constants.ts
View File

@ -20,7 +20,11 @@ export const HEAP_ANALYTICS_ID = process.env.HEAP_ANALYTICS_ID;
export const COINBASE_API_BASE_URL = 'https://api.coinbase.com/v2';
export const PROGRESS_STALL_AT_WIDTH = '95%';
export const PROGRESS_FINISH_ANIMATION_TIME_MS = 200;
export const INSTANT_CDN = process.env.INSTANT_CDN as 'production' | 'dogfood' | 'staging' | undefined;
export const INSTANT_DISCHARGE_TARGET = process.env.INSTANT_DISCHARGE_TARGET as
| 'production'
| 'dogfood'
| 'staging'
| undefined;
export const COINBASE_WALLET_IOS_APP_STORE_URL = 'https://itunes.apple.com/us/app/coinbase-wallet/id1278383455?mt=8';
export const COINBASE_WALLET_ANDROID_APP_STORE_URL = 'https://play.google.com/store/apps/details?id=org.toshi&hl=en';
export const COINBASE_WALLET_SITE_URL = 'https://wallet.coinbase.com/';

1
packages/instant/src/util/analytics.ts
View File

@ -47,6 +47,7 @@ export interface AnalyticsEventOptions {
providerName?: string;
gitSha?: string;
npmVersion?: string;
instantEnvironment?: string;
}
export const analytics = {

25
packages/instant/webpack.config.js
View File

@ -6,12 +6,14 @@ const webpack = require('webpack');
// The common js bundle (not this one) is built using tsc.
// The umd bundle (this one) has a different entrypoint.
const CDNS_THAT_REQUIRE_HEAP = ['production', 'staging', 'dogfood'];
const getConfigForCdn = cdnName => {
const DISCHARGE_TARGETS_THAT_REQUIRED_HEAP = ['production', 'staging', 'dogfood'];
const getConfigForDischargeTarget = dischargeTarget => {
return {
heapAnalyticsIdEnvName:
cdnName === 'production' ? 'INSTANT_HEAP_ANALYTICS_ID_PRODUCTION' : 'INSTANT_HEAP_ANALYTICS_ID_DEVELOPMENT',
heapAnalyticsIdRequired: CDNS_THAT_REQUIRE_HEAP.includes(cdnName),
dischargeTarget === 'production'
? 'INSTANT_HEAP_ANALYTICS_ID_PRODUCTION'
: 'INSTANT_HEAP_ANALYTICS_ID_DEVELOPMENT',
heapAnalyticsIdRequired: DISCHARGE_TARGETS_THAT_REQUIRED_HEAP.includes(dischargeTarget),
};
};
@ -19,14 +21,14 @@ const GIT_SHA = childProcess
.execSync('git rev-parse HEAD')
.toString()
.trim();
const generateConfig = (cdnName, configOptions) => {
const generateConfig = (dischargeTarget, configOptions) => {
const outputPath = process.env.WEBPACK_OUTPUT_PATH || 'umd';
const { heapAnalyticsIdEnvName, heapAnalyticsIdRequired } = configOptions;
const heapAnalyticsId = process.env[heapAnalyticsIdEnvName];
if (heapAnalyticsIdRequired && !heapAnalyticsId) {
throw new Error(
`Must define heap analytics id in ENV var ${heapAnalyticsIdEnvName} when building for ${cdnName}`,
`Must define heap analytics id in ENV var ${heapAnalyticsIdEnvName} when building for ${dischargeTarget}`,
);
}
@ -34,12 +36,13 @@ const generateConfig = (cdnName, configOptions) => {
GIT_SHA: JSON.stringify(GIT_SHA),
NPM_PACKAGE_VERSION: JSON.stringify(process.env.npm_package_version),
};
if (cdnName) {
envVars.INSTANT_CDN = JSON.stringify(cdnName);
if (dischargeTarget) {
envVars.INSTANT_DISCHARGE_TARGET = JSON.stringify(dischargeTarget);
}
if (heapAnalyticsId) {
envVars.HEAP_ANALYTICS_ID = JSON.stringify(heapAnalyticsId);
}
console.log(envVars);
const config = {
entry: {
@ -91,7 +94,7 @@ const generateConfig = (cdnName, configOptions) => {
};
module.exports = (env, _argv) => {
const cdnName = env ? env.cdn : undefined;
const configOptions = getConfigForCdn(cdnName);
return generateConfig(cdnName, configOptions);
const dischargeTarget = env ? env.discharge_target : undefined;
const configOptions = getConfigForDischargeTarget(dischargeTarget);
return generateConfig(dischargeTarget, configOptions);
};