Merge pull request #29 from Leaflet/rollup

Streamline the build process by switching more pieces to RollupJS
Leaflet · Dec 2, 2016 · fd327e6 · fd327e6
2 parents 3ae6ff2 + c43caa3
commit fd327e6
Show file tree

Hide file tree

Showing 20 changed files with 395 additions and 696 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 
+## 1.2.0
+
+* Refactored the code modules into ES6 modules
+* Switched the build system and dependencies to use RollupJS
+
 ## 1.1.0
 
 * Support for mouse/pointer events on geometries (by @perliedman)

diff --git a/README.md b/README.md
@@ -216,7 +216,7 @@ Internally, Leaflet.VectorGrid uses two classes named `L.SVG.Tile` and `L.Canvas
 
 ## Developing
 
-Run `npm install`, then run the `build-script/browserify-dependencies.sh` script. The dependencies do not provide browser-ready packages, see for example [mapbox/geojson-vt#52](https://github.com/mapbox/geojson-vt/pull/52).
+Run `npm install`.
 
 ## TODO
 

diff --git a/build-script/browserify-dependencies.sh b/build-script/browserify-dependencies.sh
diff --git a/demo/demo-geojson.html b/demo/demo-geojson.html
@@ -5,9 +5,9 @@
 	<meta charset="utf-8" />
 
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<link rel="stylesheet" href="./leaflet.css" />
-	<script src="./leaflet-src.js"></script>
-	<script src="../Leaflet.VectorGrid.bundled.js"></script>
+	<link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.2/dist/leaflet.css" />
+	<script src="https://unpkg.com/leaflet@1.0.2/dist/leaflet.js"></script>
+	<script src="../dist/Leaflet.VectorGrid.bundled.js"></script>
 
 	<script type="text/javascript" src="./eu-countries.js"></script>
 

diff --git a/demo/demo-points.html b/demo/demo-points.html
@@ -6,9 +6,9 @@
 
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-	<link rel="stylesheet" href="./leaflet.css" />
-	<script src="./leaflet-src.js"></script>
-	<script src="../Leaflet.VectorGrid.bundled.js"></script>
+	<link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.2/dist/leaflet.css" />
+	<script src="https://unpkg.com/leaflet@1.0.2/dist/leaflet.js"></script>
+	<script src="../dist/Leaflet.VectorGrid.bundled.js"></script>
 </head>
 <body style='margin:0'>
 	<div id="map" style="width: 100vw; height: 100vh"></div>

diff --git a/demo/demo-topojson.html b/demo/demo-topojson.html
@@ -5,12 +5,9 @@
 	<meta charset="utf-8" />
 
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<link rel="stylesheet" href="./leaflet.css" />
-	<script src="./leaflet-src.js"></script>
-	<script src="../Leaflet.VectorGrid.bundled.js"></script>
-
-	<script type="text/javascript" src="./eu-countries.js"></script>
-
+	<link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.2/dist/leaflet.css" />
+	<script src="https://unpkg.com/leaflet@1.0.2/dist/leaflet.js"></script>
+	<script src="../dist/Leaflet.VectorGrid.bundled.js"></script>
 </head>
 <body style='margin:0'>
 	<div id="map" style="width: 100vw; height: 100vh"></div>

diff --git a/demo/demo-vectortiles.html b/demo/demo-vectortiles.html
@@ -6,9 +6,9 @@
 
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-	<link rel="stylesheet" href="./leaflet.css" />
-	<script src="./leaflet-src.js"></script>
-	<script src="../Leaflet.VectorGrid.bundled.js"></script>
+	<link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.2/dist/leaflet.css" />
+	<script src="https://unpkg.com/leaflet@1.0.2/dist/leaflet.js"></script>
+	<script src="../dist/Leaflet.VectorGrid.bundled.js"></script>
 </head>
 <body style='margin:0'>
 	<div id="map" style="width: 100vw; height: 100vh"></div>

diff --git a/demo/demo.html b/demo/demo.html
diff --git a/demo/map-panes-example.html b/demo/map-panes-example.html