From ac1ffe53df90df9ecf4aca972a5625568f0b2a3a Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Tue, 20 Nov 2018 11:21:16 -0800
Subject: Send in rollbar environment

---
 packages/instant/webpack.config.js | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index 41276809c..161e7d1b0 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -11,21 +11,31 @@ const GIT_SHA = childProcess
     .toString()
     .trim();
 
-const HEAP_PRODUCTION_ENV_VAR_NAME = 'INSTANT_HEAP_ANALYTICS_ID_PRODUCTION';
-const HEAP_DEVELOPMENT_ENV_VAR_NAME = 'INSTANT_HEAP_ANALYTICS_ID_DEVELOPMENT';
-const getHeapAnalyticsId = modeName => {
-    if (modeName === 'production') {
-        return process.env[HEAP_PRODUCTION_ENV_VAR_NAME];
+const getEnvironmentName = (env, argv) => {
+    if (env && env.dogfood) {
+        return 'dogfood';
+    } else if (env && env.staging) {
+        return 'staging';
     }
 
-    if (modeName === 'development') {
-        return process.env[HEAP_DEVELOPMENT_ENV_VAR_NAME];
+    // argv.mode should be 'development' or 'production'
+    return argv.mode;
+};
+
+const getHeapAnalyticsId = environmentName => {
+    if (environmentName === 'production') {
+        return process.env['INSTANT_HEAP_ANALYTICS_ID_PRODUCTION'];
+    }
+
+    if (environmentName === 'development' || environmentName === 'dogfood' || environmentName === 'staging') {
+        return process.env['INSTANT_HEAP_ANALYTICS_ID_DEVELOPMENT'];
     }
 
     return undefined;
 };
 
 module.exports = (env, argv) => {
+    const environmentName = getEnvironmentName(env, argv);
     const outputPath = process.env.WEBPACK_OUTPUT_PATH || 'umd';
     const config = {
         entry: {
@@ -41,8 +51,10 @@ module.exports = (env, argv) => {
             new webpack.DefinePlugin({
                 'process.env': {
                     GIT_SHA: JSON.stringify(GIT_SHA),
-                    HEAP_ANALYTICS_ID: getHeapAnalyticsId(argv.mode),
                     NPM_PACKAGE_VERSION: JSON.stringify(process.env.npm_package_version),
+                    HEAP_ANALYTICS_ID: getHeapAnalyticsId(environmentName),
+                    ROLLBAR_ENVIRONMENT: JSON.stringify(environmentName),
+                    ROLLBAR_CLIENT_TOKEN: JSON.stringify(process.env.INSTANT_ROLLBAR_CLIENT_TOKEN),
                 },
             }),
         ],
-- 
cgit v1.2.3


From d2dd5f93d21404ee5424792a4e29e843140a7fa1 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Tue, 20 Nov 2018 11:39:31 -0800
Subject: Introduce rollbar plugin

---
 packages/instant/webpack.config.js | 63 +++++++++++++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 11 deletions(-)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index 161e7d1b0..2375bbd31 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -1,6 +1,7 @@
 const childProcess = require('child_process');
 const ip = require('ip');
 const path = require('path');
+const RollbarSourceMapPlugin = require('rollbar-sourcemap-webpack-plugin');
 const webpack = require('webpack');
 
 // The common js bundle (not this one) is built using tsc.
@@ -34,9 +35,59 @@ const getHeapAnalyticsId = environmentName => {
     return undefined;
 };
 
+const getRollbarPlugin = environmentName => {
+    if (!environmentName) {
+        return undefined;
+    }
+
+    const publishToken = process.env.INSTANT_ROLLBAR_PUBLISH_TOKEN;
+    if (!publishToken) {
+        return undefined;
+    }
+
+    let rollbarPublicPath;
+    if (environmentName === 'dogfood') {
+        rollbarPublicPath = 'http://0x-instant-dogfood.s3-website-us-east-1.amazonaws.com';
+    } else if (environmentName === 'staging') {
+        rollbarPublicPath = 'http://0x-instant-staging.s3-website-us-east-1.amazonaws.com';
+    }
+
+    if (!rollbarPublicPath) {
+        console.log('No rollbar public path');
+        return undefined;
+    }
+
+    const rollbarPluginOptions = {
+        accessToken: publishToken,
+        version: GIT_SHA,
+        publicPath: rollbarPublicPath,
+    };
+    return new RollbarSourceMapPlugin(rollbarPluginOptions);
+};
+
 module.exports = (env, argv) => {
     const environmentName = getEnvironmentName(env, argv);
     const outputPath = process.env.WEBPACK_OUTPUT_PATH || 'umd';
+
+    let plugins = [
+        new webpack.DefinePlugin({
+            'process.env': {
+                GIT_SHA: JSON.stringify(GIT_SHA),
+                NPM_PACKAGE_VERSION: JSON.stringify(process.env.npm_package_version),
+                HEAP_ANALYTICS_ID: getHeapAnalyticsId(environmentName),
+                ROLLBAR_ENVIRONMENT: JSON.stringify(environmentName),
+                ROLLBAR_CLIENT_TOKEN: JSON.stringify(process.env.INSTANT_ROLLBAR_CLIENT_TOKEN),
+            },
+        }),
+    ];
+    const rollbarPlugin = getRollbarPlugin(environmentName);
+    if (rollbarPlugin) {
+        console.log('Using rollbar plugin');
+        plugins = plugins.concat(rollbarPlugin);
+    } else {
+        console.log('Not using rollbar plugin');
+    }
+
     const config = {
         entry: {
             instant: './src/index.umd.ts',
@@ -47,17 +98,7 @@ module.exports = (env, argv) => {
             library: 'zeroExInstant',
             libraryTarget: 'umd',
         },
-        plugins: [
-            new webpack.DefinePlugin({
-                'process.env': {
-                    GIT_SHA: JSON.stringify(GIT_SHA),
-                    NPM_PACKAGE_VERSION: JSON.stringify(process.env.npm_package_version),
-                    HEAP_ANALYTICS_ID: getHeapAnalyticsId(environmentName),
-                    ROLLBAR_ENVIRONMENT: JSON.stringify(environmentName),
-                    ROLLBAR_CLIENT_TOKEN: JSON.stringify(process.env.INSTANT_ROLLBAR_CLIENT_TOKEN),
-                },
-            }),
-        ],
+        plugins,
         devtool: 'source-map',
         resolve: {
             extensions: ['.js', '.json', '.ts', '.tsx'],
-- 
cgit v1.2.3


From 05d45e7146ce862ebf7318db636b1a1652348243 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Tue, 20 Nov 2018 12:05:48 -0800
Subject: Use sourcemap loader

---
 packages/instant/webpack.config.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index 2375bbd31..e472824f5 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -77,6 +77,7 @@ module.exports = (env, argv) => {
                 HEAP_ANALYTICS_ID: getHeapAnalyticsId(environmentName),
                 ROLLBAR_ENVIRONMENT: JSON.stringify(environmentName),
                 ROLLBAR_CLIENT_TOKEN: JSON.stringify(process.env.INSTANT_ROLLBAR_CLIENT_TOKEN),
+                ROLLBAR_FORCE_DEVELOPMENT_REPORT: JSON.stringify(process.env.INSTANT_ROLLBAR_FORCE_DEVELOPMENT_REPORT),
             },
         }),
     ];
@@ -113,6 +114,15 @@ module.exports = (env, argv) => {
                     test: /\.svg$/,
                     loader: 'svg-react-loader',
                 },
+                {
+                    test: /\.js$/,
+                    loader: 'source-map-loader',
+                    exclude: [
+                        // instead of /\/node_modules\//
+                        path.join(process.cwd(), 'node_modules'),
+                        path.join(process.cwd(), '../..', 'node_modules'),
+                    ],
+                },
             ],
         },
         devServer: {
-- 
cgit v1.2.3


From 748e3c0c5358b99f15baf4bf95da027c9b83eb89 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Tue, 20 Nov 2018 13:14:20 -0800
Subject: Force source maps on staging and dogfood

---
 packages/instant/webpack.config.js | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index e472824f5..e3ba59eb3 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -35,12 +35,14 @@ const getHeapAnalyticsId = environmentName => {
     return undefined;
 };
 
+const ROLLBAR_PUBLISH_TOKEN_ENV_NAME = 'INSTANT_ROLLBAR_PUBLISH_TOKEN';
+const ROLLBAR_CLIENT_TOKEN_ENV_NAME = 'INSTANT_ROLLBAR_CLIENT_TOKEN';
 const getRollbarPlugin = environmentName => {
     if (!environmentName) {
         return undefined;
     }
 
-    const publishToken = process.env.INSTANT_ROLLBAR_PUBLISH_TOKEN;
+    const publishToken = process.env[ROLLBAR_PUBLISH_TOKEN_ENV_NAME];
     if (!publishToken) {
         return undefined;
     }
@@ -65,6 +67,26 @@ const getRollbarPlugin = environmentName => {
     return new RollbarSourceMapPlugin(rollbarPluginOptions);
 };
 
+const validateRollbar = (environmentName, rollbarPlugin) => {
+    const requiresRollbar = environmentName === 'dogfood' || environmentName === 'staging';
+
+    if (!requiresRollbar) {
+        return;
+    }
+
+    if (!process.env[ROLLBAR_CLIENT_TOKEN_ENV_NAME]) {
+        throw new Error(`${ROLLBAR_CLIENT_TOKEN_ENV_NAME} must be set for ${environmentName}`);
+    }
+
+    if (!rollbarPlugin) {
+        if (environmentName === 'dogfood' || environmentName === 'staging') {
+            throw new Error(
+                `Please set rollbar env var ${ROLLBAR_PUBLISH_TOKEN_ENV_NAME} to a Rollbar project access token with post_server_item permissions to deploy source maps to ${environmentName}`,
+            );
+        }
+    }
+};
+
 module.exports = (env, argv) => {
     const environmentName = getEnvironmentName(env, argv);
     const outputPath = process.env.WEBPACK_OUTPUT_PATH || 'umd';
@@ -76,11 +98,12 @@ module.exports = (env, argv) => {
                 NPM_PACKAGE_VERSION: JSON.stringify(process.env.npm_package_version),
                 HEAP_ANALYTICS_ID: getHeapAnalyticsId(environmentName),
                 ROLLBAR_ENVIRONMENT: JSON.stringify(environmentName),
-                ROLLBAR_CLIENT_TOKEN: JSON.stringify(process.env.INSTANT_ROLLBAR_CLIENT_TOKEN),
+                ROLLBAR_CLIENT_TOKEN: JSON.stringify(process.env[ROLLBAR_CLIENT_TOKEN_ENV_NAME]),
                 ROLLBAR_FORCE_DEVELOPMENT_REPORT: JSON.stringify(process.env.INSTANT_ROLLBAR_FORCE_DEVELOPMENT_REPORT),
             },
         }),
     ];
+
     const rollbarPlugin = getRollbarPlugin(environmentName);
     if (rollbarPlugin) {
         console.log('Using rollbar plugin');
@@ -88,6 +111,7 @@ module.exports = (env, argv) => {
     } else {
         console.log('Not using rollbar plugin');
     }
+    validateRollbar(environmentName, rollbarPlugin);
 
     const config = {
         entry: {
-- 
cgit v1.2.3


From d79c754a5bbc911856909b5d20079423e5e9c13f Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Tue, 20 Nov 2018 13:18:53 -0800
Subject: TODO note

---
 packages/instant/webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index e3ba59eb3..466385db9 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -52,7 +52,7 @@ const getRollbarPlugin = environmentName => {
         rollbarPublicPath = 'http://0x-instant-dogfood.s3-website-us-east-1.amazonaws.com';
     } else if (environmentName === 'staging') {
         rollbarPublicPath = 'http://0x-instant-staging.s3-website-us-east-1.amazonaws.com';
-    }
+    } // TODO(sk): When we decide on JS cdn, add public path here
 
     if (!rollbarPublicPath) {
         console.log('No rollbar public path');
-- 
cgit v1.2.3


From ffa2f4554b959b9af67d385d85fe9a4c822ad482 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Wed, 21 Nov 2018 09:41:44 -0800
Subject: Takeout redundant check, and make function name more clear

---
 packages/instant/webpack.config.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index 466385db9..b08fabedf 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -67,7 +67,7 @@ const getRollbarPlugin = environmentName => {
     return new RollbarSourceMapPlugin(rollbarPluginOptions);
 };
 
-const validateRollbar = (environmentName, rollbarPlugin) => {
+const validateRollbarPresence = (environmentName, rollbarPlugin) => {
     const requiresRollbar = environmentName === 'dogfood' || environmentName === 'staging';
 
     if (!requiresRollbar) {
@@ -79,11 +79,9 @@ const validateRollbar = (environmentName, rollbarPlugin) => {
     }
 
     if (!rollbarPlugin) {
-        if (environmentName === 'dogfood' || environmentName === 'staging') {
-            throw new Error(
-                `Please set rollbar env var ${ROLLBAR_PUBLISH_TOKEN_ENV_NAME} to a Rollbar project access token with post_server_item permissions to deploy source maps to ${environmentName}`,
-            );
-        }
+        throw new Error(
+            `Please set rollbar env var ${ROLLBAR_PUBLISH_TOKEN_ENV_NAME} to a Rollbar project access token with post_server_item permissions to deploy source maps to ${environmentName}`,
+        );
     }
 };
 
@@ -111,7 +109,7 @@ module.exports = (env, argv) => {
     } else {
         console.log('Not using rollbar plugin');
     }
-    validateRollbar(environmentName, rollbarPlugin);
+    validateRollbarPresence(environmentName, rollbarPlugin);
 
     const config = {
         entry: {
-- 
cgit v1.2.3


From e2a16f3f336c6787501c6a2366e7793a135009f8 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Wed, 21 Nov 2018 10:25:10 -0800
Subject: Use ROLLBAR_ENABLED constant, and change ROLLBAR_ENVIRONMENT to
 INSTANT_ENVIRONMENT

---
 packages/instant/webpack.config.js | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index b08fabedf..defdde250 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -89,25 +89,31 @@ module.exports = (env, argv) => {
     const environmentName = getEnvironmentName(env, argv);
     const outputPath = process.env.WEBPACK_OUTPUT_PATH || 'umd';
 
+    const envVars = {
+        GIT_SHA: JSON.stringify(GIT_SHA),
+        NPM_PACKAGE_VERSION: JSON.stringify(process.env.npm_package_version),
+        HEAP_ANALYTICS_ID: getHeapAnalyticsId(environmentName),
+        INSTANT_ENVIRONMENT: JSON.stringify(environmentName),
+        ROLLBAR_CLIENT_TOKEN: JSON.stringify(process.env[ROLLBAR_CLIENT_TOKEN_ENV_NAME]),
+    };
+
+    const canRollbarBeEnabled =
+        environmentName === 'development' ? process.env.INSTANT_ROLLBAR_FORCE_DEVELOPMENT_REPORT : true;
+    if (envVars.INSTANT_ENVIRONMENT && envVars.ROLLBAR_CLIENT_TOKEN && canRollbarBeEnabled) {
+        envVars['ROLLBAR_ENABLED'] = JSON.stringify(true);
+    }
+
     let plugins = [
         new webpack.DefinePlugin({
-            'process.env': {
-                GIT_SHA: JSON.stringify(GIT_SHA),
-                NPM_PACKAGE_VERSION: JSON.stringify(process.env.npm_package_version),
-                HEAP_ANALYTICS_ID: getHeapAnalyticsId(environmentName),
-                ROLLBAR_ENVIRONMENT: JSON.stringify(environmentName),
-                ROLLBAR_CLIENT_TOKEN: JSON.stringify(process.env[ROLLBAR_CLIENT_TOKEN_ENV_NAME]),
-                ROLLBAR_FORCE_DEVELOPMENT_REPORT: JSON.stringify(process.env.INSTANT_ROLLBAR_FORCE_DEVELOPMENT_REPORT),
-            },
+            'process.env': envVars,
         }),
     ];
-
     const rollbarPlugin = getRollbarPlugin(environmentName);
     if (rollbarPlugin) {
-        console.log('Using rollbar plugin');
+        console.log('Using rollbar source map plugin');
         plugins = plugins.concat(rollbarPlugin);
     } else {
-        console.log('Not using rollbar plugin');
+        console.log('Not using rollbar source map plugin');
     }
     validateRollbarPresence(environmentName, rollbarPlugin);
 
-- 
cgit v1.2.3


From 95a80a0e757647f84515e7bc7208f18b875d4111 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Wed, 21 Nov 2018 10:35:53 -0800
Subject: Shorter validateRollbarPresence logic

---
 packages/instant/webpack.config.js | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index defdde250..adc1cb000 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -66,21 +66,14 @@ const getRollbarPlugin = environmentName => {
     };
     return new RollbarSourceMapPlugin(rollbarPluginOptions);
 };
-
-const validateRollbarPresence = (environmentName, rollbarPlugin) => {
+const validateRollbarPresence = (environmentName, rollbarEnabled, rollbarSourceMapPlugin) => {
     const requiresRollbar = environmentName === 'dogfood' || environmentName === 'staging';
-
     if (!requiresRollbar) {
         return;
     }
-
-    if (!process.env[ROLLBAR_CLIENT_TOKEN_ENV_NAME]) {
-        throw new Error(`${ROLLBAR_CLIENT_TOKEN_ENV_NAME} must be set for ${environmentName}`);
-    }
-
-    if (!rollbarPlugin) {
+    if (!rollbarEnabled || !rollbarSourceMapPlugin) {
         throw new Error(
-            `Please set rollbar env var ${ROLLBAR_PUBLISH_TOKEN_ENV_NAME} to a Rollbar project access token with post_server_item permissions to deploy source maps to ${environmentName}`,
+            `Rollbar env vars must be set to build for ${environmentName}. Please set ${ROLLBAR_CLIENT_TOKEN_ENV_NAME} to a rollbar access token with post_client_item permissions, and ${ROLLBAR_PUBLISH_TOKEN_ENV_NAME} to a rollbar access token with post_server_item permissions.`,
         );
     }
 };
@@ -115,7 +108,7 @@ module.exports = (env, argv) => {
     } else {
         console.log('Not using rollbar source map plugin');
     }
-    validateRollbarPresence(environmentName, rollbarPlugin);
+    validateRollbarPresence(environmentName, envVars['ROLLBAR_ENABLED'], rollbarPlugin);
 
     const config = {
         entry: {
-- 
cgit v1.2.3


From b2e1be5cfe373f7cdafd5bd9a0c3ec1ea1e5f1d5 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Wed, 21 Nov 2018 10:44:50 -0800
Subject: Better env var names for source map plugin

---
 packages/instant/webpack.config.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index adc1cb000..7149793c4 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -37,7 +37,7 @@ const getHeapAnalyticsId = environmentName => {
 
 const ROLLBAR_PUBLISH_TOKEN_ENV_NAME = 'INSTANT_ROLLBAR_PUBLISH_TOKEN';
 const ROLLBAR_CLIENT_TOKEN_ENV_NAME = 'INSTANT_ROLLBAR_CLIENT_TOKEN';
-const getRollbarPlugin = environmentName => {
+const getRollbarSourceMapPlugin = environmentName => {
     if (!environmentName) {
         return undefined;
     }
@@ -101,14 +101,14 @@ module.exports = (env, argv) => {
             'process.env': envVars,
         }),
     ];
-    const rollbarPlugin = getRollbarPlugin(environmentName);
-    if (rollbarPlugin) {
+    const rollbarSourceMapPlugin = getRollbarSourceMapPlugin(environmentName);
+    if (rollbarSourceMapPlugin) {
         console.log('Using rollbar source map plugin');
-        plugins = plugins.concat(rollbarPlugin);
+        plugins = plugins.concat(rollbarSourceMapPlugin);
     } else {
         console.log('Not using rollbar source map plugin');
     }
-    validateRollbarPresence(environmentName, envVars['ROLLBAR_ENABLED'], rollbarPlugin);
+    validateRollbarPresence(environmentName, envVars['ROLLBAR_ENABLED'], rollbarSourceMapPlugin);
 
     const config = {
         entry: {
-- 
cgit v1.2.3


From bd03df8af02169ef88207eb14051bc79231927aa Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Thu, 29 Nov 2018 12:05:20 -0800
Subject: feat(instant): Cleaner config-specific setup

---
 packages/instant/webpack.config.js | 73 +++++++++++++++++++++++++++++---------
 1 file changed, 56 insertions(+), 17 deletions(-)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index 41276809c..284276c1a 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -6,27 +6,64 @@ 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 ACCEPTABLE_ENV_NAMES = ['production_standalone', 'production_cdn', 'staging', 'dogfood', 'development'];
+const getEnvironmentName = env => {
+    if (!env) {
+        throw new Error('Please specify env via --env to webpack');
+    }
+    const foundName = ACCEPTABLE_ENV_NAMES.find(e => (env[e] ? e : false));
+    if (!foundName) {
+        throw new Error(
+            `Couldn't find env name, please specify via one of the following CLI arguments: ${acceptableEnvNames.map(
+                i => `--env.${i}`,
+            )}`,
+        );
+    }
+    return foundName;
+};
+
+const getConfigForEnv = environmentName => {
+    switch (environmentName) {
+        case 'production_standalone':
+        case 'production_cdn':
+            return {
+                heapAnalyticsIdEnvName: 'INSTANT_HEAP_ANALYTICS_ID_PRODUCTION',
+                heapAnalyticsIdRequired: environmentName !== 'production_standalone',
+            };
+        case 'staging':
+        case 'dogfood':
+        case 'development':
+            return {
+                heapAnalyticsIdEnvName: 'INSTANT_HEAP_ANALYTICS_ID_DEVELOPMENT',
+                heapAnalyticsIdRequired: environmentName !== 'development',
+            };
+    }
+};
+
 const GIT_SHA = childProcess
     .execSync('git rev-parse HEAD')
     .toString()
     .trim();
+const generateConfig = (environmentName, configOptions) => {
+    const outputPath = process.env.WEBPACK_OUTPUT_PATH || 'umd';
 
-const HEAP_PRODUCTION_ENV_VAR_NAME = 'INSTANT_HEAP_ANALYTICS_ID_PRODUCTION';
-const HEAP_DEVELOPMENT_ENV_VAR_NAME = 'INSTANT_HEAP_ANALYTICS_ID_DEVELOPMENT';
-const getHeapAnalyticsId = modeName => {
-    if (modeName === 'production') {
-        return process.env[HEAP_PRODUCTION_ENV_VAR_NAME];
+    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 ${environmentName}`,
+        );
     }
 
-    if (modeName === 'development') {
-        return process.env[HEAP_DEVELOPMENT_ENV_VAR_NAME];
+    const envVars = {
+        GIT_SHA: JSON.stringify(GIT_SHA),
+        INSTANT_ENVIRONMENT: JSON.stringify(environmentName),
+        NPM_PACKAGE_VERSION: JSON.stringify(process.env.npm_package_version),
+    };
+    if (heapAnalyticsId) {
+        envVars.HEAP_ANALYTICS_ID = JSON.stringify(heapAnalyticsId);
     }
 
-    return undefined;
-};
-
-module.exports = (env, argv) => {
-    const outputPath = process.env.WEBPACK_OUTPUT_PATH || 'umd';
     const config = {
         entry: {
             instant: './src/index.umd.ts',
@@ -39,11 +76,7 @@ module.exports = (env, argv) => {
         },
         plugins: [
             new webpack.DefinePlugin({
-                'process.env': {
-                    GIT_SHA: JSON.stringify(GIT_SHA),
-                    HEAP_ANALYTICS_ID: getHeapAnalyticsId(argv.mode),
-                    NPM_PACKAGE_VERSION: JSON.stringify(process.env.npm_package_version),
-                },
+                'process.env': envVars,
             }),
         ],
         devtool: 'source-map',
@@ -79,3 +112,9 @@ module.exports = (env, argv) => {
     };
     return config;
 };
+
+module.exports = (env, _argv) => {
+    const environmentName = getEnvironmentName(env);
+    const configOptions = getConfigForEnv(environmentName);
+    return generateConfig(environmentName, configOptions);
+};
-- 
cgit v1.2.3


From d99bdcf036eebc6613274fecfdd19187eaf4aa1a Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Thu, 29 Nov 2018 15:13:55 -0800
Subject: cdn approach to identifyign environments

---
 packages/instant/webpack.config.js | 53 +++++++++++---------------------------
 1 file changed, 15 insertions(+), 38 deletions(-)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index 284276c1a..020fab506 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -6,60 +6,37 @@ 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 ACCEPTABLE_ENV_NAMES = ['production_standalone', 'production_cdn', 'staging', 'dogfood', 'development'];
-const getEnvironmentName = env => {
-    if (!env) {
-        throw new Error('Please specify env via --env to webpack');
-    }
-    const foundName = ACCEPTABLE_ENV_NAMES.find(e => (env[e] ? e : false));
-    if (!foundName) {
-        throw new Error(
-            `Couldn't find env name, please specify via one of the following CLI arguments: ${acceptableEnvNames.map(
-                i => `--env.${i}`,
-            )}`,
-        );
-    }
-    return foundName;
-};
-
-const getConfigForEnv = environmentName => {
-    switch (environmentName) {
-        case 'production_standalone':
-        case 'production_cdn':
-            return {
-                heapAnalyticsIdEnvName: 'INSTANT_HEAP_ANALYTICS_ID_PRODUCTION',
-                heapAnalyticsIdRequired: environmentName !== 'production_standalone',
-            };
-        case 'staging':
-        case 'dogfood':
-        case 'development':
-            return {
-                heapAnalyticsIdEnvName: 'INSTANT_HEAP_ANALYTICS_ID_DEVELOPMENT',
-                heapAnalyticsIdRequired: environmentName !== 'development',
-            };
-    }
+const CDNS_THAT_REQUIRE_HEAP = ['production', 'staging', 'dogfood'];
+const getConfigForCdn = cdnName => {
+    return {
+        heapAnalyticsIdEnvName:
+            cdnName === 'production' ? 'INSTANT_HEAP_ANALYTICS_ID_PRODUCTION' : 'INSTANT_HEAP_ANALYTICS_ID_DEVELOPMENT',
+        heapAnalyticsIdRequired: CDNS_THAT_REQUIRE_HEAP.includes(cdnName),
+    };
 };
 
 const GIT_SHA = childProcess
     .execSync('git rev-parse HEAD')
     .toString()
     .trim();
-const generateConfig = (environmentName, configOptions) => {
+const generateConfig = (cdnName, 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 ${environmentName}`,
+            `Must define heap analytics id in ENV var ${heapAnalyticsIdEnvName} when building for ${cdnName}`,
         );
     }
 
     const envVars = {
         GIT_SHA: JSON.stringify(GIT_SHA),
-        INSTANT_ENVIRONMENT: JSON.stringify(environmentName),
         NPM_PACKAGE_VERSION: JSON.stringify(process.env.npm_package_version),
     };
+    if (cdnName) {
+        envVars.INSTANT_CDN = JSON.stringify(cdnName);
+    }
     if (heapAnalyticsId) {
         envVars.HEAP_ANALYTICS_ID = JSON.stringify(heapAnalyticsId);
     }
@@ -114,7 +91,7 @@ const generateConfig = (environmentName, configOptions) => {
 };
 
 module.exports = (env, _argv) => {
-    const environmentName = getEnvironmentName(env);
-    const configOptions = getConfigForEnv(environmentName);
-    return generateConfig(environmentName, configOptions);
+    const cdnName = env ? env.cdn : undefined;
+    const configOptions = getConfigForCdn(cdnName);
+    return generateConfig(cdnName, configOptions);
 };
-- 
cgit v1.2.3


From 09813cb1d83da4c571cf69a448c35c5f6af94dec Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Fri, 30 Nov 2018 11:20:07 -0800
Subject: fix: address PR feedback

---
 packages/instant/webpack.config.js | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index 41276809c..2a517bb59 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -3,9 +3,6 @@ const ip = require('ip');
 const path = require('path');
 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 GIT_SHA = childProcess
     .execSync('git rev-parse HEAD')
     .toString()
-- 
cgit v1.2.3


From ab631060a05fc6344ef6e2de7b0e6a0f0096e8ed Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Fri, 30 Nov 2018 12:42:40 -0800
Subject: cdn -> dischargeTarget, and report to heap

---
 packages/instant/webpack.config.js | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index 020fab506..a6fe0535d 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -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);
 };
-- 
cgit v1.2.3


From de8dcf9a72283711d41617fc2c0e849a4a8c7461 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Fri, 30 Nov 2018 12:47:16 -0800
Subject: takeout console.log

---
 packages/instant/webpack.config.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index 917e84ff0..803240e76 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -39,7 +39,6 @@ const generateConfig = (dischargeTarget, configOptions) => {
     if (heapAnalyticsId) {
         envVars.HEAP_ANALYTICS_ID = JSON.stringify(heapAnalyticsId);
     }
-    console.log(envVars);
 
     const config = {
         entry: {
-- 
cgit v1.2.3


From 91b0fd951708b0fff0733c2e1eed45a403f3cc73 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Fri, 30 Nov 2018 14:19:07 -0800
Subject: Fix variable name

---
 packages/instant/webpack.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index 60c07db61..a1db01db9 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -20,9 +20,9 @@ const getHeapConfigForDischargeTarget = dischargeTarget => {
     };
 };
 
-const DISCHARGE_TARGETS_THAT_REQUIRE = ['production', 'staging', 'dogfood'];
+const DISCHARGE_TARGETS_THAT_REQUIRE_ROLLBAR = ['production', 'staging', 'dogfood'];
 const getRollbarConfigForDischargeTarget = dischargeTarget => {
-    if (DISCHARGE_TARGETS_THAT_REQUIRE.includes(dischargeTarget)) {
+    if (DISCHARGE_TARGETS_THAT_REQUIRE_ROLLBAR.includes(dischargeTarget)) {
         const rollbarSourceMapPublicPath =
             dischargeTarget === 'production'
                 ? 'https://instant.0xproject.com'
-- 
cgit v1.2.3


From 239116eec47482807029c14b08f2ac6bb72b47d2 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Mon, 3 Dec 2018 14:53:25 -0800
Subject: feat(instant): have to use INSTANT_HEAP_FORCE_DEVELOPMENT to report
 to heap in development

---
 packages/instant/webpack.config.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'packages/instant/webpack.config.js')

diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index a1db01db9..e74cf36d9 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -71,6 +71,7 @@ const generateConfig = (dischargeTarget, heapConfigOptions, rollbarConfigOptions
             `Must define heap analytics id in ENV var ${heapAnalyticsIdEnvName} when building for ${dischargeTarget}`,
         );
     }
+    const heapEnabled = heapAnalyticsId && (nodeEnv !== 'development' || process.env.INSTANT_HEAP_FORCE_DEVELOPMENT);
 
     const rollbarTokens = getRollbarTokens(dischargeTarget, rollbarConfigOptions.rollbarRequired);
     const rollbarEnabled =
@@ -92,6 +93,7 @@ const generateConfig = (dischargeTarget, heapConfigOptions, rollbarConfigOptions
         GIT_SHA: JSON.stringify(GIT_SHA),
         NPM_PACKAGE_VERSION: JSON.stringify(process.env.npm_package_version),
         ROLLBAR_ENABLED: rollbarEnabled,
+        HEAP_ENABLED: heapEnabled
     };
     if (dischargeTarget) {
         envVars.INSTANT_DISCHARGE_TARGET = JSON.stringify(dischargeTarget);
-- 
cgit v1.2.3