Fix linter problems caused by import/no-extraneous-dependencies

4 files changed, 12 insertions, 187 deletions

diff --git a/gui/package-lock.json b/gui/package-lock.json
index 3ef0508c02..831fc1c4bc 100644
--- a/gui/package-lock.json
+++ b/gui/package-lock.json
@@ -414,6 +414,16 @@
         "@types/react": "*"
       }
     },
+    "@types/react-simple-maps": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/@types/react-simple-maps/-/react-simple-maps-0.12.2.tgz",
+      "integrity": "sha512-dmALUc5CDy3+76sn0ZF2mcdWN0VH9d/F4P5fpEB0vdrJIw1KJjHK8kumeHsyXiktz4joBUWcxAZOTfifmj82fQ==",
+      "dev": true,
+      "requires": {
+        "@types/d3-geo": "*",
+        "@types/react": "*"
+      }
+    },
     "@types/sinon": {
       "version": "7.0.9",
       "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-7.0.9.tgz",
diff --git a/gui/package.json b/gui/package.json
index af585ccd35..2d4282249e 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -53,6 +53,7 @@
     "@types/react-dom": "^16.8.2",
     "@types/react-redux": "^7.0.6",
     "@types/react-router": "^4.4.3",
+    "@types/react-simple-maps": "^0.12.1",
     "@types/sinon": "^7.0.5",
     "@types/sprintf-js": "^1.1.2",
     "@types/stream-json": "^1.0.0",
diff --git a/gui/types/d3-geo-projection/index.d.ts b/gui/types/d3-geo-projection/index.d.ts
index 0f6de59ba2..0c70c39e6b 100644
--- a/gui/types/d3-geo-projection/index.d.ts
+++ b/gui/types/d3-geo-projection/index.d.ts
@@ -1,4 +1,5 @@
 declare module 'd3-geo-projection' {
+  // eslint-disable-next-line import/no-extraneous-dependencies
   import { GeoProjection } from 'd3-geo';
 
   export function geoTimes(): GeoProjection;
diff --git a/gui/types/react-simple-maps/index.d.ts b/gui/types/react-simple-maps/index.d.ts
deleted file mode 100644
index 1f7b3a9b4a..0000000000
--- a/gui/types/react-simple-maps/index.d.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-//
-// TODO: Remove these typings once the following PR is merged and add "@types/react-simple-maps".
-// https://github.com/DefinitelyTyped/DefinitelyTyped/pull/32632
-//
-
-declare module 'react-simple-maps' {
-  // Type definitions for react-simple-maps 0.12
-  // Project: https://github.com/zcreativelabs/react-simple-maps#readme
-  // Definitions by: Novikov Mihail <https://github.com/thepocp>
-  //                 Andrej Mihajlov <https://github.com/pronebird>
-  // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-  // TypeScript Version: 2.8
-
-  import * as React from 'react';
-  import { GeoProjection } from 'd3-geo';
-
-  export type Point = [number, number];
-
-  export interface MarkerType {
-    coordinates: Point;
-  }
-
-  export interface Line {
-    coordinates: {
-      start: Point;
-      end: Point;
-    };
-  }
-
-  export interface ProjectionConfig {
-    scale: number;
-    xOffset: number;
-    yOffset: number;
-    rotation: [number, number, number];
-    precision: number;
-  }
-
-  export type ProjectionFunction = (
-    width: number,
-    height: number,
-    config: ProjectionConfig,
-  ) => GeoProjection;
-
-  export interface ComposableMapProps {
-    width?: number;
-    height?: number;
-    projection?: string | ProjectionFunction;
-    projectionConfig?: Partial<ProjectionConfig>;
-    style?: React.CSSProperties;
-    defs?: SVGDefsElement;
-    className?: string;
-    showCenter?: boolean;
-    preserveAspectRatio?: string;
-    viewBox?: string;
-  }
-
-  export interface ZoomableGlobeProps {
-    center?: Point;
-    zoom?: number;
-    disablePanning?: boolean;
-    style?: React.CSSProperties;
-    width?: number;
-    height?: number;
-    onMoveStart?: (currentCenter: Point) => void;
-    onMoveEnd?: (newCenter: Point) => void;
-    sensitivity?: number;
-  }
-
-  export interface ZoomableGroupProps {
-    center?: Point;
-    zoom?: number;
-    disablePanning?: boolean;
-    style?: React.CSSProperties;
-    width?: number;
-    height?: number;
-    onMoveStart?: (currentCenter: Point) => void;
-    onMoveEnd?: (newCenter: Point) => void;
-    backdrop?: {
-      x: Point;
-      y: Point;
-    };
-  }
-
-  export interface GeographiesProps {
-    disableOptimization?: boolean;
-    geography?: string | { [key: string]: any } | string[];
-    children?: (geographies: object[], projection: GeoProjection) => void;
-  }
-
-  export interface GeographyProps {
-    cacheId?: number | string | null;
-    precision?: number;
-    round?: boolean;
-    geography?: object;
-    projection?: GeoProjection;
-    tabable?: boolean;
-    style?: {
-      default?: React.CSSProperties;
-      hover?: React.CSSProperties;
-      pressed?: React.CSSProperties;
-    };
-    onClick?: (geography: object, evt: React.MouseEvent<SVGPathElement>) => void;
-    onMouseEnter?: (geography: object, evt: React.MouseEvent<SVGPathElement>) => void;
-    onMouseMove?: (geography: object, evt: React.MouseEvent<SVGPathElement>) => void;
-    onMouseLeave?: (geography: object, evt: React.MouseEvent<SVGPathElement>) => void;
-    onMouseDown?: (geography: object, evt: React.MouseEvent<SVGPathElement>) => void;
-    onMouseUp?: (geography: object, evt: React.MouseEvent<SVGPathElement>) => void;
-    onFocus?: (geography: object, evt: React.FocusEvent<SVGPathElement>) => void;
-    onBlur?: (geography: object, evt: React.FocusEvent<SVGPathElement>) => void;
-  }
-
-  export interface MarkerProps {
-    marker?: MarkerType;
-    tabable?: boolean;
-    style?: {
-      default?: React.CSSProperties;
-      hover?: React.CSSProperties;
-      pressed?: React.CSSProperties;
-    };
-    preserveMarkerAspect?: boolean;
-    onClick?: (marker: MarkerType, evt: React.MouseEvent<SVGGElement>) => void;
-    onMouseEnter?: (marker: MarkerType, evt: React.MouseEvent<SVGGElement>) => void;
-    onMouseMove?: (marker: MarkerType, evt: React.MouseEvent<SVGGElement>) => void;
-    onMouseLeave?: (marker: MarkerType, evt: React.MouseEvent<SVGGElement>) => void;
-    onMouseDown?: (marker: MarkerType, evt: React.MouseEvent<SVGGElement>) => void;
-    onMouseUp?: (marker: MarkerType, evt: React.MouseEvent<SVGGElement>) => void;
-    onFocus?: (marker: MarkerType, evt: React.FocusEvent<SVGGElement>) => void;
-    onBlur?: (marker: MarkerType, evt: React.FocusEvent<SVGGElement>) => void;
-  }
-
-  export interface AnnotationProps {
-    subject?: Point;
-    dx?: number;
-    dy?: number;
-    zoom?: number;
-    stroke?: string;
-    strokeWidth?: number;
-    style?: React.CSSProperties;
-    markerEnd?: string;
-    curve?: number;
-  }
-
-  export interface GraticuleProps {
-    step?: Point;
-    round?: boolean;
-    precision?: number;
-    outline?: boolean;
-    stroke?: string;
-    fill?: string;
-    style?: React.CSSProperties;
-    disableOptimization?: boolean;
-    Globe?: boolean;
-  }
-
-  export interface LineProps {
-    line?: Line;
-    tabable?: boolean;
-    style?: {
-      default?: React.CSSProperties;
-      hover?: React.CSSProperties;
-      pressed?: React.CSSProperties;
-    };
-    preserveMarkerAspect?: boolean;
-    buildPath?: (start: Point, end: Point, line: Line) => string;
-    onClick?: (line: Line, evt: React.MouseEvent<SVGPathElement>) => void;
-    onMouseEnter?: (line: Line, evt: React.MouseEvent<SVGPathElement>) => void;
-    onMouseMove?: (line: Line, evt: React.MouseEvent<SVGPathElement>) => void;
-    onMouseLeave?: (line: Line, evt: React.MouseEvent<SVGPathElement>) => void;
-    onMouseDown?: (line: Line, evt: React.MouseEvent<SVGPathElement>) => void;
-    onMouseUp?: (line: Line, evt: React.MouseEvent<SVGPathElement>) => void;
-    onFocus?: (line: Line, evt: React.FocusEvent<SVGPathElement>) => void;
-    onBlur?: (line: Line, evt: React.FocusEvent<SVGPathElement>) => void;
-  }
-
-  export class ComposableMap extends React.Component<ComposableMapProps> {}
-  export class ZoomableGroup extends React.Component<ZoomableGroupProps> {}
-  export class ZoomableGlobe extends React.Component<ZoomableGlobeProps> {}
-  export class Geographies extends React.Component<GeographiesProps> {}
-  export class Geography extends React.Component<GeographyProps> {}
-  export class Markers extends React.Component {}
-  export class Marker extends React.Component<MarkerProps> {}
-  export class Annotations extends React.Component {}
-  export class Annotation extends React.Component<AnnotationProps> {}
-  export class Graticule extends React.Component<GraticuleProps> {}
-  export class Lines extends React.Component {}
-  export class Line extends React.Component<LineProps> {}
-}