Add ES6 to index

DenisCarriere · Mar 4, 2017 · e78253f · e78253f
1 parent d71d136
commit e78253f
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 123 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,8 @@ lib-cov
 # Coverage directory used by tools like istanbul
 coverage
 
+index.js
+
 # nyc test coverage
 .nyc_output
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,6 @@
 
 ## 2.2.0 - 2017-03-04
 
-- Convert to pure ES5 module (no exports)
 - Modify rollup config
 - Output browser bundle to `docs/`
 

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ $ npm install --save global-mercator
 **web browser ([ES5](https://kangax.github.io/compat-table/es5))**
 
 ```html
-<script src="https://unpkg.com/global-mercator/global-mercator.min.js"></script>
+<script src="https://unpkg.com/global-mercator/global-mercator.js"></script>
 ```
 
 ## Quickstart

diff --git a/docs/global-mercator.min.js → docs/global-mercator.js b/docs/global-mercator.min.js → docs/global-mercator.js
@@ -1,4 +1,4 @@
-var mercator = (function () {
+(function (exports) {
 var originShift = 2 * Math.PI * 6378137 / 2.0;
 function initialResolution (tileSize) {
   tileSize = tileSize || 256;
@@ -609,37 +609,33 @@ function maxBBox (array) {
   }
 }
 
-var index = {
-  hash,
-  bboxToCenter,
-  lngLatToMeters,
-  metersToLngLat,
-  metersToPixels,
-  lngLatToTile,
-  lngLatToGoogle,
-  metersToTile,
-  pixelsToMeters,
-  pixelsToTile,
-  tileToBBoxMeters,
-  tileToBBox,
-  googleToBBoxMeters,
-  googleToBBox,
-  tileToGoogle,
-  googleToTile,
-  googleToQuadkey,
-  tileToQuadkey,
-  quadkeyToTile,
-  quadkeyToGoogle,
-  bboxToMeters,
-  validateTile,
-  validateZoom,
-  validateLngLat,
-  validatePixels,
-  resolution,
-  range,
-  maxBBox
-};
-
-return index;
-
-}());
+exports.hash = hash;
+exports.bboxToCenter = bboxToCenter;
+exports.lngLatToMeters = lngLatToMeters;
+exports.metersToLngLat = metersToLngLat;
+exports.metersToPixels = metersToPixels;
+exports.lngLatToTile = lngLatToTile;
+exports.lngLatToGoogle = lngLatToGoogle;
+exports.metersToTile = metersToTile;
+exports.pixelsToMeters = pixelsToMeters;
+exports.pixelsToTile = pixelsToTile;
+exports.tileToBBoxMeters = tileToBBoxMeters;
+exports.tileToBBox = tileToBBox;
+exports.googleToBBoxMeters = googleToBBoxMeters;
+exports.googleToBBox = googleToBBox;
+exports.tileToGoogle = tileToGoogle;
+exports.googleToTile = googleToTile;
+exports.googleToQuadkey = googleToQuadkey;
+exports.tileToQuadkey = tileToQuadkey;
+exports.quadkeyToTile = quadkeyToTile;
+exports.quadkeyToGoogle = quadkeyToGoogle;
+exports.bboxToMeters = bboxToMeters;
+exports.validateTile = validateTile;
+exports.validateZoom = validateZoom;
+exports.validateLngLat = validateLngLat;
+exports.validatePixels = validatePixels;
+exports.resolution = resolution;
+exports.range = range;
+exports.maxBBox = maxBBox;
+
+}((this.mercator = this.mercator || {})));
diff --git a/docs/index.html b/docs/index.html
@@ -8,7 +8,7 @@
 <body>
   <h1>Global Mercator</h1>
   <h2>Open Console</h2>
-  <script src="global-mercator.min.js"></script>
+  <script src="global-mercator.js"></script>
   <script>
   console.log("globalMercator.tileToBBox([10, 15, 8]) >>", globalMercator.tileToBBox([10, 15, 8]))
   </script>

diff --git a/docs/rollup.config.js b/docs/rollup.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+  entry: 'index.es6.js',
+  dest: 'docs/global-mercator.js',
+  format: 'iife',
+  useStrict: false,
+  moduleName: 'mercator'
+}