From 26cded30c9680985e601089d54ca8d6ac99d07c3 Mon Sep 17 00:00:00 2001
From: Vladimir Agafonkin <agafonkin@gmail.com>
Date: Wed, 21 Sep 2016 15:34:07 +0300
Subject: [PATCH 1/3] remove support for building mapbox-gl with webpack

---
 README.md                      | 13 +++----------
 package.json                   |  6 ++----
 test/build/webpack.test.js     | 27 ---------------------------
 test/fixtures/webpack-entry.js |  5 -----
 4 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 test/build/webpack.test.js
 delete mode 100644 test/fixtures/webpack-entry.js

diff --git a/README.md b/README.md
index 976758180b7..ea7b1171b7e 100644
--- a/README.md
+++ b/README.md
@@ -64,23 +64,16 @@ var map = new mapboxgl.Map({
 
 To use the [vector tiles](https://www.mapbox.com/maps/) and styles hosted on http://mapbox.com, you must [create an account](https://www.mapbox.com/studio/signup/) and then [obtain an access token](https://www.mapbox.com/studio/account/tokens/). You may learn more about access tokens [here](https://www.mapbox.com/help/define-access-token/).
 
-Install the [`mapbox-gl` npm package](https://www.npmjs.com/package/mapbox-gl)
-and the required loaders.
+Install the [`mapbox-gl` npm package](https://www.npmjs.com/package/mapbox-gl):
 
 ```bash
 npm install --save mapbox-gl
-npm install --save transform-loader
-npm install --save json-loader
-npm install --save webworkify-webpack
 ```
 
-Add the [required additional options from webpack.config.example.js](webpack.config.example.js)
-to your webpack configuration.
-
-Instantiate `mapboxgl.Map`
+Require the distribution build of mapbox-gl and instantiate `mapboxgl.Map`:
 
 ```js
-var mapboxgl = require('mapbox-gl');
+var mapboxgl = require('mapbox-gl/dist/mapbox-gl.js');
 mapboxgl.accessToken = '<your access token here>';
 var map = new mapboxgl.Map({
     container: '<your HTML element id>',
diff --git a/package.json b/package.json
index 27af94908c1..a0bc62fa976 100644
--- a/package.json
+++ b/package.json
@@ -75,9 +75,7 @@
     "unist-util-visit": "1.1.0",
     "vinyl": "1.1.1",
     "vinyl-fs": "2.4.3",
-    "watchify": "^3.7.0",
-    "webpack": "^1.13.1",
-    "webworkify-webpack": "^1.1.3"
+    "watchify": "^3.7.0"
   },
   "browserify": {
     "transform": [
@@ -108,7 +106,7 @@
     "open-changed-examples": "git diff --name-only mb-pages HEAD -- docs/_posts/examples/*.html | awk '{print \"http://127.0.0.1:4000/mapbox-gl-js/example/\" substr($0,33,length($0)-37)}' | xargs open",
     "test": "run-s lint test-unit",
     "test-suite": "run-s test-render test-query",
-    "test-unit": "tap --reporter dot --no-coverage test/js test/build/webpack.test.js",
+    "test-unit": "tap --reporter dot --no-coverage test/js",
     "test-render": "node test/render.test.js",
     "test-query": "node test/query.test.js",
     "test-cov": "nyc --reporter=text-summary --cache run-s test-unit test-render test-query"
diff --git a/test/build/webpack.test.js b/test/build/webpack.test.js
deleted file mode 100644
index 53a03b09b55..00000000000
--- a/test/build/webpack.test.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict';
-
-var webpack = require("webpack");
-var test = require('tap').test;
-var MemoryFS = require('memory-fs');
-var util = require('../../js/util/util');
-
-test('builds with webpack', function(t) {
-
-    var compiler = webpack(util.extend(require('../../webpack.config.example'), {
-        entry: './test/fixtures/webpack-entry.js',
-        output: {
-            path: '/',
-            filename: 'webpack.js'
-        }
-    }));
-
-    compiler.outputFileSystem = new MemoryFS();
-    compiler.run(function(error, stats) {
-        t.error(error);
-        t.notOk(stats.hasErrors());
-        t.notOk(stats.hasWarnings());
-        t.ok(compiler.outputFileSystem.readFileSync('/webpack.js').toString());
-        t.end();
-    });
-
-});
diff --git a/test/fixtures/webpack-entry.js b/test/fixtures/webpack-entry.js
deleted file mode 100644
index 566241d398e..00000000000
--- a/test/fixtures/webpack-entry.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-// Script for testing a webpack build that requires mapbox-gl
-
-require('../../js/mapbox-gl');

From 95be0252c7f3e98f6c2894dd3b2b86964bac6896 Mon Sep 17 00:00:00 2001
From: Vladimir Agafonkin <agafonkin@gmail.com>
Date: Wed, 21 Sep 2016 16:12:50 +0300
Subject: [PATCH 2/3] clarify usage of mapbox-gl with other module bundlers

---
 README.md | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index ea7b1171b7e..d7065970d30 100644
--- a/README.md
+++ b/README.md
@@ -13,10 +13,12 @@ It is part of the [Mapbox GL ecosystem](https://github.com/mapbox/mapbox-gl) whi
 
 [<img width="981" alt="Mapbox GL JS gallery" src="https://cloud.githubusercontent.com/assets/281306/14547142/a3c98294-025f-11e6-92f4-d6b0f50c8e89.png">](https://www.mapbox.com/gallery/)
 
-## Using Mapbox GL JS with a `<script>` tag
+## Using Mapbox vector tiles and styles
 
 To use the [vector tiles](https://www.mapbox.com/maps/) and styles hosted on http://mapbox.com, you must [create an account](https://www.mapbox.com/studio/signup/) and then [obtain an access token](https://www.mapbox.com/studio/account/tokens/). You may learn more about access tokens [here](https://www.mapbox.com/help/define-access-token/).
 
+## Using Mapbox GL JS with a `<script>` tag
+
 ```html
 <!DOCTYPE html>
 <html>
@@ -41,8 +43,6 @@ To use the [vector tiles](https://www.mapbox.com/maps/) and styles hosted on htt
 
 ## Using Mapbox GL JS with [Browserify](http://browserify.org/)
 
-To use the [vector tiles](https://www.mapbox.com/maps/) and styles hosted on http://mapbox.com, you must [create an account](https://www.mapbox.com/studio/signup/) and then [obtain an access token](https://www.mapbox.com/studio/account/tokens/). You may learn more about access tokens [here](https://www.mapbox.com/help/define-access-token/).
-
 Install the [`mapbox-gl` npm package](https://www.npmjs.com/package/mapbox-gl)
 
 ```bash
@@ -60,33 +60,18 @@ var map = new mapboxgl.Map({
 });
 ```
 
-## Using Mapbox GL JS with [Webpack](https://webpack.github.io/)
-
-To use the [vector tiles](https://www.mapbox.com/maps/) and styles hosted on http://mapbox.com, you must [create an account](https://www.mapbox.com/studio/signup/) and then [obtain an access token](https://www.mapbox.com/studio/account/tokens/). You may learn more about access tokens [here](https://www.mapbox.com/help/define-access-token/).
-
-Install the [`mapbox-gl` npm package](https://www.npmjs.com/package/mapbox-gl):
-
-```bash
-npm install --save mapbox-gl
-```
+## Using Mapbox GL JS with other module systems
 
-Require the distribution build of mapbox-gl and instantiate `mapboxgl.Map`:
+Since our build system depends on Browserify, to use Mapbox GL with any other module bundlers like [Webpack](https://webpack.github.io/), [SystemJS](https://github.com/systemjs/systemjs), you have to require the distribution build instead of the package entry point:
 
 ```js
 var mapboxgl = require('mapbox-gl/dist/mapbox-gl.js');
-mapboxgl.accessToken = '<your access token here>';
-var map = new mapboxgl.Map({
-    container: '<your HTML element id>',
-    style: 'mapbox://styles/mapbox/streets-v9'
-});
 ```
 
-### Using import
-
-If you're using the ES6 module system, you can import `mapboxgl` like so:
+If you're using the ES6 module system (e.g. with [Rollup](https://github.com/rollup/rollup) as a bundler), you can import `mapboxgl` like so:
 
 ```js
-import mapboxgl from 'mapbox-gl';
+import mapboxgl from 'mapbox-gl/dist/mapbox-gl.js';
 ```
 
 ## Third Party Projects

From 5e4de772eb79ae78b24d2f1188c47ad7f674d647 Mon Sep 17 00:00:00 2001
From: Vladimir Agafonkin <agafonkin@gmail.com>
Date: Wed, 21 Sep 2016 18:58:23 +0300
Subject: [PATCH 3/3] remove webpack config example

---
 webpack.config.example.js | 68 ---------------------------------------
 1 file changed, 68 deletions(-)
 delete mode 100644 webpack.config.example.js

diff --git a/webpack.config.example.js b/webpack.config.example.js
deleted file mode 100644
index ee11d04f9d8..00000000000
--- a/webpack.config.example.js
+++ /dev/null
@@ -1,68 +0,0 @@
-const webpack = require('webpack');
-const path = require('path');
-
-/**
- * Mapbox GL JS example webpack configuration. This demonstrates the options
- * you'll need to add to your existing webpack configuration in order to successfully
- * use Mapbox GL JS.
- *
- * This configuration refers to specific paths, especially in its configuration
- * of the brfs transform. You'll likely need to change these paths so that
- * they point at the correct file in Mapbox GL JS.
- *
- * Additional dependencies:
- *
- *     npm install --save transform-loader
- *     npm install --save json-loader
- *     npm install --save webworkify-webpack
- *
- * Why these dependencies?
- *
- * json-loader
- * By default, browserify and node allow you to use the `require` method
- * with JSON files. Webpack doesn't have this built-in, so we include
- * the json loader.
- *
- * transform-loader
- * Mapbox GL JS uses the brfs browserify transform to allow it to use
- * the fs.readFileSync method in order to load its shaders for WebGL. Adding
- * the transform loader lets webpack use brfs as well.
- *
- * webworkify-webpack
- * Mapbox GL JS uses the webworkify module by default, and that module
- * does things very specific to browserify's module loading system. In this
- * configuration, we alias webworkify to webworkify-webpack to add webpack
- * support.
- */
-module.exports = {
-    entry: './test.js',
-    output: {
-        path: './',
-        filename: 'test.bundle.js',
-    },
-    resolve: {
-        alias: {
-            'webworkify': 'webworkify-webpack'
-        }
-    },
-    module: {
-        loaders: [{
-            test: /\.json$/,
-            loader: 'json-loader'
-        }, {
-            test: /\.js$/,
-            include: path.resolve('node_modules/mapbox-gl-shaders/index.js'),
-            loader: 'transform/cacheable?brfs'
-        }],
-        postLoaders: [{
-            include: /node_modules\/mapbox-gl-shaders/,
-            loader: 'transform',
-            query: 'brfs'
-        }]
-    },
-
-    // You may use any "devtool" except "eval" and "eval-source-map" due to
-    // a "webworkify-webpack" caveat. 
-    // See https://github.com/borisirota/webworkify-webpack#caveats
-    devtool: 'cheap-source-map'
-}