Remove more of the Makefile

development_server.js

@@ -1,4 +1,7 @@
-var rollup = require( 'rollup' );
+/* eslint-disable no-console */
+
+var fs = require('fs');
+var rollup = require('rollup');
 var nodeResolve = require('rollup-plugin-node-resolve');
 var commonjs = require('rollup-plugin-commonjs');
 var json = require('rollup-plugin-json');
@@ -9,45 +12,67 @@ var ecstatic = require('ecstatic');
 var cache;
 var building = false;
 
-function build() {
-  if (building) return;
-  building = true;
-  console.log('Rebuilding');
-  console.time('Rebuilt');
-  rollup.rollup({
-    entry: './modules/id.js',
-    cache: cache,
-    plugins: [
-        nodeResolve({ jsnext: true, main: true, browser: false }),
-        commonjs(),
-        json()
-    ]
-  }).then(function (bundle) {
-    console.timeEnd('Rebuilt');
-    cache = bundle;
-    bundle.write({
-      format: 'iife',
-      dest: 'dist/iD.js',
-      sourceMap: true
-    });
-    building = false;
-  }, function(err) {
-    building = false;
-    console.error(err);
-  });
-}
 
 if (process.argv[2] === 'develop') {
     build();
+
     gaze('modules/**/**.js', function(err, watcher) {
         watcher.on('all', function() {
             build();
         });
     });
+
     http.createServer(
-      ecstatic({ root: __dirname })
+        ecstatic({ root: __dirname })
     ).listen(8080);
+
     console.log('Listening on :8080');
+
 } else {
     build();
 }
+
+
+
+function unlink(f) {
+    try { fs.unlinkSync(f); } catch (e) { /* noop */ }
+}
+
+function build() {
+    if (building) return;
+
+    // Start clean
+    unlink('dist/iD.js');
+    unlink('dist/iD.js.map');
+
+    building = true;
+    console.log('Rebuilding');
+    console.time('Rebuilt');
+
+    rollup.rollup({
+        entry: './modules/id.js',
+        cache: cache,
+        plugins: [
+            nodeResolve({
+                jsnext: true, main: true, browser: false
+            }),
+            commonjs(),
+            json()
+        ]
+
+    }).then(function (bundle) {
+        console.timeEnd('Rebuilt');
+        cache = bundle;
+        bundle.write({
+            format: 'iife',
+            dest: 'dist/iD.js',
+            sourceMap: true
+        });
+        building = false;
+
+    }, function(err) {
+        building = false;
+        console.error(err);
+    });
+}
+