From be85cd8e893091d62188587eb30cf160f8f16a84 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 19 Mar 2018 11:59:41 -0400
Subject: [PATCH] Drop support for node 4 / npm 2 (closes #4853)

This fixes several issues with dependency resolution
---
 .travis.yml              | 1 -
 README.md                | 2 +-
 build_src.js             | 8 +-------
 modules/ui/field_help.js | 2 +-
 modules/ui/help.js       | 3 +--
 package.json             | 4 ++--
 6 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e46f7d27c..d67619a35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - "4"
   - "6"
   - "8"
 sudo: required
diff --git a/README.md b/README.md
index 02ea26062..759c552d4 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Come on in, the water's lovely. More help? Ping `jfire` or `bhousel` on:
 
 ## Prerequisites
 
-* [Node.js](https://nodejs.org/) version 4 or newer
+* [Node.js](https://nodejs.org/) version 6 or newer
 * [`git`](https://www.atlassian.com/git/tutorials/install-git/) for your platform
   * Note for Windows users:
     * Edit `$HOME\.gitconfig`:<br/>
diff --git a/build_src.js b/build_src.js
index 3b17696db..591d21373 100644
--- a/build_src.js
+++ b/build_src.js
@@ -5,7 +5,6 @@ const rollup = require('rollup');
 const nodeResolve = require('rollup-plugin-node-resolve');
 const commonjs = require('rollup-plugin-commonjs');
 const json = require('rollup-plugin-json');
-const includePaths = require('rollup-plugin-includepaths');
 const colors = require('colors/safe');
 const flowRemoveTypes = require('flow-remove-types');
 
@@ -30,11 +29,6 @@ module.exports = function buildSrc() {
                 input: './modules/id.js',
                 plugins: [
                     flow(),
-                    includePaths({
-                        paths: [
-                            'node_modules/d3/node_modules' // for npm 2
-                        ]
-                    }),
                     nodeResolve({
                         module: true,
                         main: true,
@@ -84,4 +78,4 @@ function flow() {
             map: null
         })
     };
-}
\ No newline at end of file
+}
diff --git a/modules/ui/field_help.js b/modules/ui/field_help.js
index 803e40c67..49f4874a3 100644
--- a/modules/ui/field_help.js
+++ b/modules/ui/field_help.js
@@ -6,7 +6,7 @@ import {
 import marked from 'marked';
 import { t } from '../util/locale';
 import { svgIcon } from '../svg';
-import { icon } from 'intro/helper';
+import { icon } from './intro/helper';
 
 
 // This currently only works with the 'restrictions' field
diff --git a/modules/ui/help.js b/modules/ui/help.js
index 30d17833a..bf158f366 100644
--- a/modules/ui/help.js
+++ b/modules/ui/help.js
@@ -15,8 +15,7 @@ import { uiMapData } from './map_data';
 import { uiShortcuts } from './shortcuts';
 import { uiTooltipHtml } from './tooltipHtml';
 import { tooltip } from '../util/tooltip';
-
-import { icon } from 'intro/helper';
+import { icon } from './intro/helper';
 
 export function uiHelp(context) {
     var key = t('help.key');
diff --git a/package.json b/package.json
index 391d43c6e..1a484f43d 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,6 @@
     "request": "^2.85.0",
     "rollup": "~0.57.0",
     "rollup-plugin-commonjs": "^9.0.0",
-    "rollup-plugin-includepaths": "^0.2.2",
     "rollup-plugin-json": "^2.2.0",
     "rollup-plugin-node-resolve": "^3.2.0",
     "shelljs": "^0.8.0",
@@ -89,6 +88,7 @@
     ]
   },
   "engines": {
-    "node": ">=4.0.0"
+    "node": ">=6.0.0",
+    "npm": ">=3.0.0"
   }
 }