Merge branch 'master' into refactor-connect-edges

w8r · Feb 21, 2020 · 123d104 · 123d104
2 parents 9779472 + c0fe938
commit 123d104
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 86 deletions.
diff --git a/dist/martinez.min.js b/dist/martinez.min.js
diff --git a/dist/martinez.umd.js b/dist/martinez.umd.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,13 +1,14 @@
 {
   "name": "martinez-polygon-clipping",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Martinez polygon clipping algorithm, does boolean operation on polygons (multipolygons, polygons with holes etc): intersection, union, difference, xor",
   "main": "dist/martinez.umd.js",
   "browser": "dist/martinez.umd.js",
-  "module": "src/index",
-  "jsnext:main": "src/index",
+  "module": "index.js",
+  "jsnext:main": "index.js",
   "files": [
     "index.d.ts",
+    "index.js",
     "src/",
     "dist/"
   ],
@@ -50,7 +51,7 @@
     "eslint-plugin-jsdoc": "^20.0.2",
     "eslint-plugin-promise": "^3.8.0",
     "geojson-project": "^1.0.0",
-    "http-server": "^0.10.0",
+    "http-server": "^0.12.1",
     "leaflet": "^1.2.0",
     "leaflet-editable": "^1.1.0",
     "load-json-file": "^2.0.0",