Upgrade flow to 0.66 (#6288)

mapbox · Mar 7, 2018 · 31d92db · 31d92db
1 parent 4b1195a
commit 31d92db
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 20 deletions.
diff --git a/.flowconfig b/.flowconfig
@@ -7,8 +7,9 @@
 .*/node_modules/conventional-changelog-core/.*
 .*/node_modules/htmltojsx/.*
 .*/node_modules/documentation/.*
+.*/node_modules/module-deps/.*
 .*/test/unit/style-spec/fixture/invalidjson.input.json
 .*/test/integration/render-tests/.*
 
 [version]
-0.62.0
+0.66.0
diff --git a/flow-typed/mapbox-gl-js-test.js b/flow-typed/mapbox-gl-js-test.js
@@ -1,4 +1,5 @@
+// @flow
 declare module "mapbox-gl-js-test" {
     declare type CreateTest = (name: string, body: (test: CreateTest) => void) => void;
-    declare var exports: CreateTest;
+    declare module.exports: CreateTest;
 }
diff --git a/flow-typed/mapbox-gl-supported.js b/flow-typed/mapbox-gl-supported.js
@@ -2,5 +2,5 @@
 'use strict';
 declare module "@mapbox/mapbox-gl-supported" {
     declare type isSupported = (options?: {failIfMajorPerformanceCaveat: boolean}) => boolean;
-    declare var exports: isSupported;
+    declare module.exports: isSupported;
 }
diff --git a/flow-typed/unitbezier.js b/flow-typed/unitbezier.js
@@ -7,5 +7,5 @@ declare module "unitbezier" {
         solveCurveX(t: number): number;
         solve(x: number, epsilon?: number): number;
     }
-    declare var exports: typeof UnitBezier;
+    declare module.exports: typeof UnitBezier;
 }
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "eslint-plugin-node": "^5.1.1",
     "eslint-plugin-react": "^7.3.0",
     "execcommand-copy": "^1.1.0",
-    "flow-bin": "^0.62.0",
+    "flow-bin": "^0.66.0",
     "flow-coverage-report": "^0.3.0",
     "flow-remove-types": "^1.0.4",
     "github-slugger": "^1.1.1",

diff --git a/src/source/source_cache.js b/src/source/source_cache.js
@@ -43,8 +43,8 @@ class SourceCache extends Evented {
     _sourceErrored: boolean;
     _tiles: {[any]: Tile};
     _cache: Cache<Tile>;
-    _timers: {[any]: number};
-    _cacheTimers: {[any]: number};
+    _timers: {[any]: TimeoutID};
+    _cacheTimers: {[any]: TimeoutID};
     _maxTileCacheSize: ?number;
     _paused: boolean;
     _shouldReloadOnResume: boolean;

diff --git a/src/ui/camera.js b/src/ui/camera.js
@@ -71,7 +71,7 @@ class Camera extends Evented {
     _pitching: boolean;
 
     _bearingSnap: number;
-    _onEaseEnd: number;
+    _onEaseEnd: TimeoutID;
     _easeStart: number;
     _isEasing: boolean;
     _easeOptions: {duration: number, easing: (number) => number};

diff --git a/src/ui/control/geolocate_control.js b/src/ui/control/geolocate_control.js
@@ -84,7 +84,7 @@ class GeolocateControl extends Evented {
     _dotElement: HTMLElement;
     _geolocateButton: HTMLElement;
     _geolocationWatchID: number;
-    _timeoutId: ?number;
+    _timeoutId: ?TimeoutID;
     _watchState: string;
     _lastKnownPosition: any;
     _userLocationDotMarker: Marker;

diff --git a/src/ui/handler/dblclick_zoom.js b/src/ui/handler/dblclick_zoom.js
@@ -13,7 +13,7 @@ class DoubleClickZoomHandler {
     _map: Map;
     _enabled: boolean;
     _active: boolean;
-    _tapped: ?number;
+    _tapped: ?TimeoutID;
 
     /**
      * @private

diff --git a/src/ui/handler/scroll_zoom.js b/src/ui/handler/scroll_zoom.js
@@ -36,8 +36,8 @@ class ScrollZoomHandler {
     _aroundPoint: Point;
     _type: 'wheel' | 'trackpad' | null;
     _lastValue: number;
-    _timeout: ?number; // used for delayed-handling of a single wheel movement
-    _finishTimeout: ?number; // used to delay final '{move,zoom}end' events
+    _timeout: ?TimeoutID; // used for delayed-handling of a single wheel movement
+    _finishTimeout: ?TimeoutID; // used to delay final '{move,zoom}end' events
 
     _lastWheelEvent: any;
     _lastWheelEventTime: number;
@@ -175,7 +175,9 @@ class ScrollZoomHandler {
         this._active = true;
         this._map.fire(new Event('movestart', {originalEvent: e}));
         this._map.fire(new Event('zoomstart', {originalEvent: e}));
-        clearTimeout(this._finishTimeout);
+        if (this._finishTimeout) {
+            clearTimeout(this._finishTimeout);
+        }
 
         const pos = DOM.mousePos(this._el, e);
 

diff --git a/src/ui/hash.js b/src/ui/hash.js
@@ -14,7 +14,7 @@ import type Map from './map';
  */
 class Hash {
     _map: Map;
-    _updateHash: () => number;
+    _updateHash: () => TimeoutID;
 
     constructor() {
         util.bindAll([

diff --git a/src/util/throttle.js b/src/util/throttle.js
@@ -5,12 +5,12 @@
  Throttle the given function to run at most every period milliseconds.
  * @private
  */
-module.exports = function throttle(fn: () => void, time: number): () => number {
+module.exports = function throttle(fn: () => void, time: number): () => TimeoutID {
     let pending = false;
-    let timerId = 0;
+    let timerId: TimeoutID = (0: any);
 
     const later = () => {
-        timerId = 0;
+        timerId = (0: any);
         if (pending) {
             fn();
             timerId = setTimeout(later, time);

diff --git a/yarn.lock b/yarn.lock
@@ -4237,9 +4237,9 @@ flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
-flow-bin@^0.62.0:
-  version "0.62.0"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.62.0.tgz#14bca669a6e3f95c0bc0c2d1eb55ec4e98cb1d83"
+flow-bin@^0.66.0:
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.66.0.tgz#a96dde7015dc3343fd552a7b4963c02be705ca26"
 
 flow-coverage-report@^0.3.0:
   version "0.3.0"