Merge pull request #183 from jonataswalker/up-deps

Update Deps and publish

.vscode/settings.json

@@ -11,4 +11,7 @@
     "editor.formatOnPaste": true,
   },
   "search.showLineNumbers": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  },
 }

examples/contextmenu.js

@@ -51,8 +51,8 @@ var contextmenu = new ContextMenu({
 });
 map.addControl(contextmenu);
 
-contextmenu.on('open', function(evt) {
-  var feature = map.forEachFeatureAtPixel(evt.pixel, function(ft, l) {
+contextmenu.on('open', function (evt) {
+  var feature = map.forEachFeatureAtPixel(evt.pixel, function (ft, l) {
     return ft;
   });
   if (feature && feature.get('type') === 'removable') {
@@ -68,7 +68,7 @@ contextmenu.on('open', function(evt) {
   }
 });
 
-map.on('pointermove', function(e) {
+map.on('pointermove', function (e) {
   var pixel = map.getEventPixel(e.originalEvent);
   var hit = map.hasFeatureAtPixel(pixel);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol-contextmenu",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Custom Context Menu for Openlayers",
   "main": "dist/ol-contextmenu.js",
   "author": "Jonatas Walker",
@@ -19,35 +19,37 @@
   "scripts": {
     "dev": "rollup -w -c",
     "build": "rollup -c",
+    "lint": "eslint --cache --cache-location .eslintcache/ --ext .js .",
+    "lint:fix": "npm run lint -- --fix",
     "test": "npm run build && npm run test:unit",
     "test:unit": "jest",
     "test:unit:watch": "jest --watch"
   },
   "dependencies": {},
   "devDependencies": {
-    "@babel/core": "^7.7.2",
-    "@babel/preset-env": "^7.7.1",
-    "autoprefixer": "^9.7.2",
-    "babel-jest": "^24.9.0",
-    "canvas": "^2.6.0",
+    "@babel/core": "^7.9.0",
+    "@babel/preset-env": "^7.9.5",
+    "autoprefixer": "^9.7.6",
+    "babel-jest": "^25.4.0",
+    "canvas": "^2.6.1",
     "eslint": "^6.6.0",
     "eslint-config-jwalker": "^5.2.0",
-    "eslint-config-prettier": "^6.7.0",
-    "eslint-plugin-jest": "^23.0.4",
-    "eslint-plugin-prettier": "^3.1.1",
-    "jest": "^24.9.0",
-    "ol": "^6.1.1",
-    "postcss": "^7.0.23",
-    "prettier": "^1.19.1",
-    "rollup": "^1.27.2",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-jest": "^23.8.2",
+    "eslint-plugin-prettier": "^3.1.3",
+    "jest": "^25.4.0",
+    "ol": "^6.3.1",
+    "postcss": "^7.0.27",
+    "prettier": "^2.0.5",
+    "rollup": "^2.7.2",
     "rollup-plugin-buble": "^0.19.8",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-eslint": "^7.0.0",
-    "rollup-plugin-filesize": "^6.2.1",
+    "rollup-plugin-filesize": "^7.0.0",
     "rollup-plugin-includepaths": "^0.2.3",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-sass": "^1.2.2",
-    "rollup-plugin-terser": "^5.1.2",
+    "rollup-plugin-terser": "^5.3.0",
     "should": "^13.2.3"
   }
 }

rollup.config.js

@@ -43,10 +43,10 @@ const scssVars = Object.keys(cssVars).reduce(
   ''
 );
 
-const processor = css =>
+const processor = (css) =>
   postcss([autoprefixer])
     .process(css, { from: undefined })
-    .then(result => banner + result.css);
+    .then((result) => banner + result.css);
 
 const sassOpts = { data: scssVars, sourceMap: false };
 

src/helpers/dom.js

@@ -8,7 +8,7 @@ import { isNumeric } from './mix';
  */
 export function addClass(element, classname, timeout) {
   if (Array.isArray(element)) {
-    element.forEach(each => addClass(each, classname));
+    element.forEach((each) => addClass(each, classname));
     return;
   }
 
@@ -30,7 +30,7 @@ export function addClass(element, classname, timeout) {
  */
 export function removeClass(element, classname, timeout) {
   if (Array.isArray(element)) {
-    element.forEach(each => removeClass(each, classname, timeout));
+    element.forEach((each) => removeClass(each, classname, timeout));
     return;
   }
 
@@ -62,7 +62,7 @@ export function hasClass(element, c) {
  */
 export function toggleClass(element, classname) {
   if (Array.isArray(element)) {
-    element.forEach(each => toggleClass(each, classname));
+    element.forEach((each) => toggleClass(each, classname));
     return;
   }
 
@@ -165,7 +165,7 @@ export function removeAll(collection) {
 }
 
 export function getChildren(node, tag) {
-  return [].filter.call(node.childNodes, el =>
+  return [].filter.call(node.childNodes, (el) =>
     tag
       ? el.nodeType === 1 && el.tagName.toLowerCase() === tag
       : el.nodeType === 1

src/helpers/mix.js

@@ -28,12 +28,7 @@ export function contains(str_test, str) {
 }
 
 export function getUniqueId() {
-  return (
-    '_' +
-    Math.random()
-      .toString(36)
-      .substr(2, 9)
-  );
+  return '_' + Math.random().toString(36).substr(2, 9);
 }
 
 export function isDefAndNotNull(val) {
@@ -58,7 +53,7 @@ export function now() {
 
   Date.now =
     Date.now ||
-    function() {
+    function () {
       // thanks IE8
       return new Date().getTime();
     };
@@ -94,16 +89,16 @@ export function emptyArray(array) {
 }
 
 export function anyMatchInArray(source, target) {
-  return source.some(each => target.indexOf(each) >= 0);
+  return source.some((each) => target.indexOf(each) >= 0);
 }
 
 export function everyMatchInArray(arr1, arr2) {
-  return arr2.every(each => arr1.indexOf(each) >= 0);
+  return arr2.every((each) => arr1.indexOf(each) >= 0);
 }
 
 export function anyItemHasValue(obj, has = false) {
   const keys = Object.keys(obj);
-  keys.forEach(key => {
+  keys.forEach((key) => {
     if (!isEmpty(obj[key])) has = true;
   });
   return has;

src/html.js

@@ -60,7 +60,7 @@ export class Html {
         this.Base.Internal.submenu.lastLeft || this.Base.Internal.submenu.left;
       li.appendChild(sub);
 
-      item.items.forEach(each => {
+      item.items.forEach((each) => {
         this.generateHtmlAndPublish(sub, each, true);
       });
     } else {

src/internal.js

@@ -76,7 +76,7 @@ export class Internal {
 
   getItemsLength() {
     let count = 0;
-    Object.keys(this.items).forEach(k => {
+    Object.keys(this.items).forEach((k) => {
       if (this.items[k].submenu || this.items[k].separator) return;
       count++;
     });
@@ -134,7 +134,7 @@ export class Internal {
       } else {
         this.submenu.lastLeft = this.submenu.left;
       }
-      subs.forEach(sub => {
+      subs.forEach((sub) => {
         // is there enough space for submenu height?
         const viewport = getViewportSize();
         const sub_offset = offset(sub);
@@ -210,7 +210,7 @@ export class Internal {
     evt.target.addEventListener(
       'pointerdown',
       {
-        handleEvent: function(e) {
+        handleEvent: function (e) {
           if (this.opened) {
             this_.closeMenu();
             e.stopPropagation();
@@ -225,10 +225,10 @@ export class Internal {
   setItemListener(li, index) {
     const this_ = this;
     if (li && typeof this.items[index].callback === 'function') {
-      (function(callback) {
+      (function (callback) {
         li.addEventListener(
           'click',
-          function(evt) {
+          function (evt) {
             evt.preventDefault();
             const obj = {
               coordinate: this_.getCoordinateClicked(),

test/unit/helpers/data.js

@@ -1,31 +1,31 @@
 const { callback1, callback2 } = require('./functions');
 
-const dataMarker = exports.dataMarker = 'data-marker';
-const dataCenter = exports.dataCenter = 'data-center';
+const dataMarker = (exports.dataMarker = 'data-marker');
+const dataCenter = (exports.dataCenter = 'data-center');
 
-const items = exports.items = [
+const items = (exports.items = [
   '-',
   {
     text: 'Center map here',
     classname: 'bold',
     data: dataCenter,
-    callback: callback1
+    callback: callback1,
   },
   {
     text: 'Add a Marker',
     data: dataMarker,
-    callback: callback2
+    callback: callback2,
   },
-];
+]);
 
 exports.items2 = [
   {
     text: 'Foo',
-    callback: callback1
+    callback: callback1,
   },
   {
     text: 'Bar',
-    callback: callback2
+    callback: callback2,
   },
 ];
 

test/unit/helpers/functions.js

@@ -1,11 +1,11 @@
-exports.callback1 = obj => {
+exports.callback1 = (obj) => {
   console.log(obj);
 };
 
-exports.callback2 = obj => {
+exports.callback2 = (obj) => {
   console.log(obj);
 };
 
-exports.toJSON = obj => JSON.stringify(obj);
+exports.toJSON = (obj) => JSON.stringify(obj);
 
-exports.countItems = obj => Object.keys(obj).length;
+exports.countItems = (obj) => Object.keys(obj).length;