chore(package): update @typescript-eslint/* to version 2.0.0

.eslintrc.yaml

@@ -1,11 +1,11 @@
 extends:
-- openlayers
-- plugin:@typescript-eslint/recommended
+  - openlayers
+  - plugin:@typescript-eslint/recommended
 env:
   jquery: true
 parserOptions:
   ecmaVersion: 2017
-  project: ./tsconfig.json
+  project: ./tsconfig-eslint.json
 rules:
   no-console: 0
   comma-dangle: 0
@@ -35,3 +35,7 @@ rules:
     - error
   '@typescript-eslint/restrict-plus-operands':
     - error
+  '@typescript-eslint/ban-ts-ignore': 0
+  '@typescript-eslint/explicit-function-return-type': 0
+  '@typescript-eslint/no-var-requires': 0
+  '@typescript-eslint/no-empty-function': 0

contribs/gmf/apps/appmodule.js

@@ -13,12 +13,18 @@ import {decodeQueryString} from 'ngeo/utils.js';
  */
 const module = angular.module('app', []);
 
-module.config(['$compileProvider', function($compileProvider) {
-  if (!('debug' in decodeQueryString(window.location.search))) {
-    // Disable the debug info
-    $compileProvider.debugInfoEnabled(false);
+module.config([
+  '$compileProvider',
+  /**
+   * @param {angular.ICompileProvider} $compileProvider
+   */
+  function($compileProvider) {
+    if (!('debug' in decodeQueryString(window.location.search))) {
+      // Disable the debug info
+      $compileProvider.debugInfoEnabled(false);
+    }
   }
-}]);
+]);
 
 
 export default module;

contribs/gmf/apps/desktop_alt/Controller.js

@@ -114,7 +114,7 @@ class Controller extends AbstractDesktopController {
     }];
 
     /**
-     * @type {GridMergeTabs}
+     * @type {import('gmf/query/gridComponent.js').GridMergeTabs}
      */
     this.gridMergeTabs = {
       'OSM_time_merged': ['osm_time', 'osm_time2'],
@@ -133,7 +133,7 @@ class Controller extends AbstractDesktopController {
     });
 
     /**
-     * @type {Object<string, ol.style.Style>} Map of styles for search overlay.
+     * @type {Object<string, import('ol/style/Style.js').default>} Map of styles for search overlay.
      * @export
      */
     this.searchStyles = {
@@ -186,10 +186,11 @@ module.controller('AlternativeDesktopController', Controller);
 module.value('gmfPermalinkOptions', /** @type {import('gmf/permalink/Permalink.js').PermalinkOptions} */ ({
   crosshairStyle: [
     new Style({
-      image: new Icon({
+      image: /** @type {import('ol/style/Image.js').default} */(new Icon({
+        // @ts-ignore: webpack
         src: 'data:image/svg+xml;base64,' + btoa(require('./image/crosshair.svg?viewbox')),
         imgSize: [22, 22],
-      })
+      }))
     })
   ]
 }));

contribs/gmf/apps/oeedit/Controller.js

@@ -58,7 +58,7 @@ class Controller extends AbstractDesktopController {
 
     /**
      * The ngeo ToolActivate manager service.
-     * @type {import('ngeo/misc/ToolActivateMgr.js').default}
+     * @type {import('ngeo/misc/ToolActivateMgr.js').ToolActivateMgr}
      */
     const ngeoToolActivateMgr = $injector.get('ngeoToolActivateMgr');
 
@@ -76,7 +76,7 @@ class Controller extends AbstractDesktopController {
     });
 
     /**
-     * @type {import("ol/source/Vector.js").default}
+     * @type {import("ol/source/Vector.js").default<*>}
      * @private
      */
     this.vectorSource_ = new olSourceVector({
@@ -222,7 +222,7 @@ module.run(
     $templateCache.put('gmf/contextualdata', require('./contextualdata.html'));
   });
 
-module.value('gmfPermalinkOptions', /** @type {PermalinkOptions} */ ({
+module.value('gmfPermalinkOptions', /** @type {import('gmf/permalink/Permalink.js').PermalinkOptions} */ ({
   pointRecenterZoom: 10
 }));
 

contribs/gmf/src/lidarprofile/Utils.js

@@ -422,7 +422,7 @@ export default class {
     let closestPoint = null;
 
     if (hP.length > 0) {
-      const minDist = Math.min.apply(Math, distances);
+      const minDist = Math.min(...distances);
       const indexMin = distances.indexOf(minDist);
       if (indexMin != -1) {
         closestPoint = hP[indexMin];

package.json

@@ -58,8 +58,8 @@
     "@types/proj4": "^2.5.0",
     "@types/sinon": "^7.0.13",
     "@types/typeahead": "^0.11.32",
-    "@typescript-eslint/eslint-plugin": "^1.11.0",
-    "@typescript-eslint/parser": "^1.11.0",
+    "@typescript-eslint/eslint-plugin": "^2.0.0",
+    "@typescript-eslint/parser": "^2.0.0",
     "angular": "1.7.8",
     "angular-animate": "^1.7.8",
     "angular-dynamic-locale": "^0.1.37",

tsconfig-eslint.json

@@ -0,0 +1,8 @@
+{
+    "extends": "tsconfig.json",
+    "include": [
+        "node_modules/ol/**/*.js",
+        "node_modules/olcs/**/*.js",
+        "node_modules/moment/src/**/*.js",
+    ],
+}

tsconfig.json

@@ -25,12 +25,13 @@
       "src/**/*.js",
       "api/src/**/*.js",
       "contribs/gmf/src/**/*.js",
+      "contribs/gmf/apps/**/*.js",
       "test/spec/**/*.js",
       "contribs/gmf/test/spec/**/*.js",
       "examples/*.js",
       "contribs/gmf/examples/*.js",
     ],
     "files": [
-      "types/dom.d.ts"
+      "types/dom.d.ts",
     ]
 }