1 files changed, 9 insertions, 53 deletions

diff --git a/gulpfile.js b/gulpfile.js
index 89e2a536f..c1012d5aa 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -30,10 +30,12 @@ const packageJSON = require('./package.json')
 const dependencies = Object.keys(packageJSON && packageJSON.dependencies || {})
 const materialUIDependencies = ['@material-ui/core']
 const reactDepenendencies = dependencies.filter(dep => dep.match(/react/))
+const d3Dependencies = ['c3', 'd3']
 
 const uiDependenciesToBundle = [
   ...materialUIDependencies,
   ...reactDepenendencies,
+  ...d3Dependencies,
 ]
 
 function gulpParallel (...args) {
@@ -49,8 +51,6 @@ const browserPlatforms = [
   'opera',
 ]
 const commonPlatforms = [
-  // browser webapp
-  'mascara',
   // browser extensions
   ...browserPlatforms,
 ]
@@ -84,6 +84,10 @@ createCopyTasks('fonts', {
   source: './app/fonts/',
   destinations: commonPlatforms.map(platform => `./dist/${platform}/fonts`),
 })
+createCopyTasks('vendor', {
+  source: './app/vendor/',
+  destinations: commonPlatforms.map(platform => `./dist/${platform}/vendor`),
+})
 createCopyTasks('reload', {
   devOnly: true,
   source: './app/scripts/',
@@ -104,14 +108,6 @@ createCopyTasks('manifest', {
   destinations: browserPlatforms.map(platform => `./dist/${platform}`),
 })
 
-// copy mascara
-
-createCopyTasks('html:mascara', {
-  source: './mascara/',
-  pattern: 'proxy/index.html',
-  destinations: [`./dist/mascara/`],
-})
-
 function createCopyTasks (label, opts) {
   if (!opts.devOnly) {
     const copyTaskName = `copy:${label}`
@@ -292,12 +288,11 @@ const buildJsFiles = [
 createTasksForBuildJsUIDeps({ dependenciesToBundle: uiDependenciesToBundle, filename: 'libs' })
 createTasksForBuildJsExtension({ buildJsFiles, taskPrefix: 'dev:extension:js', devMode: true })
 createTasksForBuildJsExtension({ buildJsFiles, taskPrefix: 'build:extension:js' })
-createTasksForBuildJsMascara({ taskPrefix: 'build:mascara:js' })
-createTasksForBuildJsMascara({ taskPrefix: 'dev:mascara:js', devMode: true })
 
 function createTasksForBuildJsUIDeps ({ dependenciesToBundle, filename }) {
   const destinations = browserPlatforms.map(platform => `./dist/${platform}`)
 
+
   const bundleTaskOpts = Object.assign({
     buildSourceMaps: true,
     sourceMapDir: '../sourcemaps',
@@ -333,22 +328,6 @@ function createTasksForBuildJsExtension ({ buildJsFiles, taskPrefix, devMode, bu
   createTasksForBuildJs({ rootDir, taskPrefix, bundleTaskOpts, destinations, buildPhase1, buildPhase2 })
 }
 
-function createTasksForBuildJsMascara ({ taskPrefix, devMode, bundleTaskOpts = {} }) {
-  // inpage must be built before all other scripts:
-  const rootDir = './mascara/src/'
-  const buildPhase1 = ['ui', 'proxy', 'background', 'metamascara']
-  const destinations = ['./dist/mascara']
-  bundleTaskOpts = Object.assign({
-    buildSourceMaps: true,
-    sourceMapDir: './',
-    minifyBuild: !devMode,
-    buildWithFullPaths: devMode,
-    watch: devMode,
-    devMode,
-  }, bundleTaskOpts)
-  createTasksForBuildJs({ rootDir, taskPrefix, bundleTaskOpts, destinations, buildPhase1 })
-}
-
 function createTasksForBuildJs ({ rootDir, taskPrefix, bundleTaskOpts, destinations, buildPhase1 = [], buildPhase2 = [] }) {
   // bundle task for each file
   const jsFiles = [].concat(buildPhase1, buildPhase2)
@@ -398,7 +377,6 @@ gulp.task('dev',
     'dev:scss',
     gulp.parallel(
       'dev:extension:js',
-      'dev:mascara:js',
       'dev:copy',
       'dev:reload'
     )
@@ -417,18 +395,6 @@ gulp.task('dev:extension',
   )
 )
 
-gulp.task('dev:mascara',
-  gulp.series(
-    'clean',
-    'dev:scss',
-    gulp.parallel(
-      'dev:mascara:js',
-      'dev:copy',
-      'dev:reload'
-    )
-  )
-)
-
 gulp.task('build',
   gulp.series(
     'clean',
@@ -436,7 +402,6 @@ gulp.task('build',
     gulpParallel(
       'build:extension:js:uideps',
       'build:extension:js',
-      'build:mascara:js',
       'copy'
     )
   )
@@ -453,17 +418,6 @@ gulp.task('build:extension',
   )
 )
 
-gulp.task('build:mascara',
-  gulp.series(
-    'clean',
-    'build:scss',
-    gulp.parallel(
-      'build:mascara:js',
-      'copy'
-    )
-  )
-)
-
 gulp.task('dist',
   gulp.series(
     'build',
@@ -506,6 +460,8 @@ function generateBundler (opts, performBundle) {
   bundler.transform(envify({
     METAMASK_DEBUG: opts.devMode,
     NODE_ENV: opts.devMode ? 'development' : 'production',
+    PUBNUB_SUB_KEY: process.env.PUBNUB_SUB_KEY || '',
+    PUBNUB_PUB_KEY: process.env.PUBNUB_PUB_KEY || '',
   }), {
     global: true,
   })