From 48872c45eb374ed4c6914099fff0c18e61959374 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Fri, 8 Mar 2019 11:01:31 -0500
Subject: [PATCH] Minor cleanups to some of the build scripts

---
 build_css.js          | 15 ++++++++-------
 build_src.js          | 34 +++++++++++++++-------------------
 development_server.js | 19 +++++++++----------
 3 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/build_css.js b/build_css.js
index c56949eca..eae032731 100644
--- a/build_css.js
+++ b/build_css.js
@@ -1,21 +1,22 @@
 /* eslint-disable no-console */
-
-const glob = require('glob');
-const concat = require('concat-files');
 const colors = require('colors/safe');
+const concat = require('concat-files');
+const glob = require('glob');
 
 
 module.exports = function buildCSS() {
-    var building = false;
+    var isBuilding = false;
     return function () {
-        if (building) return;
+        if (isBuilding) return;
+
         console.log('building css');
         console.time(colors.green('css built'));
-        building = true;
+        isBuilding = true;
+
         return concatFilesProm('css/**/*.css', 'dist/iD.css')
             .then(function () {
                 console.timeEnd(colors.green('css built'));
-                building = false;
+                isBuilding = false;
             })
             .catch(function (err) {
                 console.error(err);
diff --git a/build_src.js b/build_src.js
index 347bb922b..9d3517c9a 100644
--- a/build_src.js
+++ b/build_src.js
@@ -1,26 +1,29 @@
 /* eslint-disable no-console */
-
-const fs = require('fs');
-const rollup = require('rollup');
+const colors = require('colors/safe');
 const commonjs = require('rollup-plugin-commonjs');
 const includePaths = require('rollup-plugin-includepaths');
-const nodeResolve = require('rollup-plugin-node-resolve');
 const json = require('rollup-plugin-json');
-const colors = require('colors/safe');
+const nodeResolve = require('rollup-plugin-node-resolve');
+const rollup = require('rollup');
+const shell = require('shelljs');
+
 
 module.exports = function buildSrc() {
-    var building = false;
+    var isBuilding = false;
+
     return function () {
-        if (building) return;
+        if (isBuilding) return;
 
         // Start clean
-        unlink('dist/iD.js');
-        unlink('dist/iD.js.map');
+        shell.rm('-f', [
+            'dist/iD.js',
+            'dist/iD.js.map'
+        ]);
 
         console.log('building src');
         console.time(colors.green('src built'));
 
-        building = true;
+        isBuilding = true;
 
         return rollup
             .rollup({
@@ -50,20 +53,13 @@ module.exports = function buildSrc() {
                 });
             })
             .then(function () {
-                building = false;
+                isBuilding = false;
                 console.timeEnd(colors.green('src built'));
             })
             .catch(function (err) {
-                building = false;
+                isBuilding = false;
                 console.error(err);
                 process.exit(1);
             });
     };
 };
-
-
-function unlink(f) {
-    try {
-        fs.unlinkSync(f);
-    } catch (e) { /* noop */ }
-}
diff --git a/development_server.js b/development_server.js
index 21e95a548..8ddf929b9 100644
--- a/development_server.js
+++ b/development_server.js
@@ -1,15 +1,15 @@
 /* eslint-disable no-console */
+const colors = require('colors/safe');
+const ecstatic = require('ecstatic');
+const gaze = require('gaze');
+const http = require('http');
 
-var http = require('http');
-var gaze = require('gaze');
-var ecstatic = require('ecstatic');
-var colors = require('colors/safe');
+const isDevelopment = process.argv[2] === 'develop';
 
-var isDevelopment = process.argv[2] === 'develop';
+const buildData = require('./build_data')(isDevelopment);
+const buildSrc = require('./build_src')(isDevelopment);
+const buildCSS = require('./build_css')(isDevelopment);
 
-var buildData = require('./build_data')(isDevelopment);
-var buildSrc = require('./build_src')(isDevelopment);
-var buildCSS = require('./build_css')(isDevelopment);
 
 buildData()
     .then(function () {
@@ -25,8 +25,7 @@ if (isDevelopment) {
         });
     });
 
-    gaze(
-        [
+    gaze([
             'data/**/*.{js,json}',
             'data/core.yaml',
             // ignore the output files of `buildData`