From 17d71cb1cf4e5d2ade9130af7280a153f4d3256a Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Wed, 27 Sep 2017 12:26:28 -0400
Subject: [PATCH] Use rollup-plugin-includepaths to help rollup resolve d3 on
 npm2

rollup-plugin-node-resolve seems unable to resolve d3 under npm2
which is installed by default with node 4.  So this plugin adds
an extra include path to help it find the d3 dependencies.

npm3 flat dependencies:  /node_modules/d3-selection
npm2 hierarchical dependencies:  /node_modules/d3/node_modules/d3-selection
---
 development_server.js | 10 +++++++++-
 package.json          |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/development_server.js b/development_server.js
index be608cac0..694b59948 100644
--- a/development_server.js
+++ b/development_server.js
@@ -2,6 +2,7 @@
 
 var fs = require('fs');
 var rollup = require('rollup');
+var includePaths = require('rollup-plugin-includepaths');
 var nodeResolve = require('rollup-plugin-node-resolve');
 var commonjs = require('rollup-plugin-commonjs');
 var json = require('rollup-plugin-json');
@@ -50,8 +51,15 @@ function build() {
     rollup.rollup({
         entry: './modules/id.js',
         plugins: [
+            includePaths({
+                paths: [
+                    'node_modules/d3/node_modules'  // for npm 2
+                ]
+            }),
             nodeResolve({
-                jsnext: true, main: true, browser: false
+                module: true,
+                main: true,
+                browser: false
             }),
             commonjs(),
             json()
diff --git a/package.json b/package.json
index e7fa75d28..9d8aac564 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "request": "^2.81.0",
     "rollup": "0.45.2",
     "rollup-plugin-commonjs": "8.2.1",
+    "rollup-plugin-includepaths": "0.2.2",
     "rollup-plugin-json": "2.2.0",
     "rollup-plugin-node-resolve": "3.0.0",
     "shelljs": "^0.7.5",