From 668e5a1fa900cd329197d5ba3cf065bfc52ef705 Mon Sep 17 00:00:00 2001
From: Vladimir Agafonkin <agafonkin@gmail.com>
Date: Fri, 22 Mar 2019 10:47:18 +0200
Subject: [PATCH] simplify benchmark build configs

---
 bench/styles/rollup_config_benchmarks.js   | 23 +++++++++-------------
 bench/versions/rollup_config_benchmarks.js | 21 ++++++++------------
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/bench/styles/rollup_config_benchmarks.js b/bench/styles/rollup_config_benchmarks.js
index cac3ab1865e..e24f175ff45 100644
--- a/bench/styles/rollup_config_benchmarks.js
+++ b/bench/styles/rollup_config_benchmarks.js
@@ -1,7 +1,7 @@
 import fs from 'fs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
 import replace from 'rollup-plugin-replace';
-import {plugins as basePlugins} from '../../build/rollup_plugins';
+import {plugins} from '../../build/rollup_plugins';
 
 let styles = ['mapbox://styles/mapbox/streets-v10'];
 
@@ -11,17 +11,14 @@ if (process.env.MAPBOX_STYLES) {
         .map(style => style.match(/\.json$/) ? require(style) : style);
 }
 
-const plugins = () => basePlugins(true, true).concat(
-    replace({
-        'process.env.BENCHMARK_VERSION': JSON.stringify(process.env.BENCHMARK_VERSION),
-        'process.env.MAPBOX_ACCESS_TOKEN': JSON.stringify(process.env.MAPBOX_ACCESS_TOKEN),
-        'process.env.MapboxAccessToken': JSON.stringify(process.env.MapboxAccessToken),
-        'process.env.MAPBOX_STYLES': JSON.stringify(styles),
-        'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
-    })
-);
+const replaceConfig = {
+    'process.env.BENCHMARK_VERSION': JSON.stringify(process.env.BENCHMARK_VERSION),
+    'process.env.MAPBOX_ACCESS_TOKEN': JSON.stringify(process.env.MAPBOX_ACCESS_TOKEN),
+    'process.env.MapboxAccessToken': JSON.stringify(process.env.MapboxAccessToken),
+    'process.env.MAPBOX_STYLES': JSON.stringify(styles)
+};
 
-const config = [{
+export default [{
     input: [`bench/styles/benchmarks.js`, 'src/source/worker.js'],
     output: {
         dir: 'rollup/build/benchmarks/styles',
@@ -30,7 +27,7 @@ const config = [{
         sourcemap: 'inline',
         chunkFileNames: 'shared.js'
     },
-    plugins: plugins()
+    plugins: plugins(true, true).concat(replace(replaceConfig))
 }, {
     input: 'rollup/style_benchmarks.js',
     output: {
@@ -43,5 +40,3 @@ const config = [{
     treeshake: false,
     plugins: [sourcemaps()],
 }];
-
-export default config;
diff --git a/bench/versions/rollup_config_benchmarks.js b/bench/versions/rollup_config_benchmarks.js
index d91428664cf..6ad4861840c 100644
--- a/bench/versions/rollup_config_benchmarks.js
+++ b/bench/versions/rollup_config_benchmarks.js
@@ -1,18 +1,15 @@
 import fs from 'fs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
 import replace from 'rollup-plugin-replace';
-import {plugins as basePlugins} from '../../build/rollup_plugins';
+import {plugins} from '../../build/rollup_plugins';
 
-const plugins = () => basePlugins(true, true).concat(
-    replace({
-        'process.env.BENCHMARK_VERSION': JSON.stringify(process.env.BENCHMARK_VERSION),
-        'process.env.MAPBOX_ACCESS_TOKEN': JSON.stringify(process.env.MAPBOX_ACCESS_TOKEN),
-        'process.env.MapboxAccessToken': JSON.stringify(process.env.MapboxAccessToken),
-        'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
-    })
-);
+const replaceConfig = {
+    'process.env.BENCHMARK_VERSION': JSON.stringify(process.env.BENCHMARK_VERSION),
+    'process.env.MAPBOX_ACCESS_TOKEN': JSON.stringify(process.env.MAPBOX_ACCESS_TOKEN),
+    'process.env.MapboxAccessToken': JSON.stringify(process.env.MapboxAccessToken)
+};
 
-const config = [{
+export default [{
     input: [`bench/versions/benchmarks.js`, 'src/source/worker.js'],
     output: {
         dir: 'rollup/build/benchmarks/versions',
@@ -21,7 +18,7 @@ const config = [{
         sourcemap: 'inline',
         chunkFileNames: 'shared.js'
     },
-    plugins: plugins()
+    plugins: plugins(true, true).concat(replace(replaceConfig))
 }, {
     input: 'rollup/benchmarks.js',
     output: {
@@ -34,5 +31,3 @@ const config = [{
     treeshake: false,
     plugins: [sourcemaps()],
 }];
-
-export default config;