Migrate src/ to ES6 imports

src/main/BamDataSource.js

@@ -1,13 +1,13 @@
 /* @flow */
 'use strict';
 
-var Events = require('backbone').Events,
-    _ = require('underscore'),
-    Q = require('q');
+import _ from 'underscore';
+import Q from 'q';
+import {Events} from 'backbone';
 
-var ContigInterval = require('./ContigInterval'),
-    BamFile = require('./bam'),
-    RemoteFile = require('./RemoteFile');
+import ContigInterval from './ContigInterval';
+import BamFile from './bam';
+import RemoteFile from './RemoteFile';
 
 import type {Alignment, AlignmentDataSource} from './Alignment';
 

src/main/BigBed.js

@@ -5,17 +5,16 @@
  */
 'use strict';
 
-var Q = require('q'),
-    _ = require('underscore'),
-    jBinary = require('jbinary'),
-    pako = require('pako/lib/inflate');  // for gzip inflation
-
-
-var RemoteFile = require('./RemoteFile'),
-    Interval = require('./Interval'),
-    ContigInterval = require('./ContigInterval'),
-    utils = require('./utils.js'),
-    bbi = require('./formats/bbi');
+import Q from 'q';
+import _ from 'underscore';
+import jBinary from 'jbinary';
+import pako from 'pako/lib/inflate';  // for gzip inflation
+
+import RemoteFile from './RemoteFile';
+import Interval from './Interval';
+import ContigInterval from './ContigInterval';
+import utils from './utils.js';
+import bbi from './formats/bbi';
 
 
 function parseHeader(buffer) {

src/main/BigBedDataSource.js

@@ -3,14 +3,13 @@
 
 import type {Strand} from './Alignment';
 
-var Events = require('backbone').Events,
-    _ = require('underscore'),
-    Q = require('q');
+import _ from 'underscore';
+import Q from 'q';
+import {Events} from 'backbone';
 
-
-var ContigInterval = require('./ContigInterval'),
-    Interval = require('./Interval'),
-    BigBed = require('./BigBed');
+import ContigInterval from './ContigInterval';
+import Interval from './Interval';
+import BigBed from './BigBed';
 
 
 export type Gene = {

src/main/ContigInterval.js

@@ -1,8 +1,8 @@
 /* @flow */
 'use strict';
 
-var Interval = require('./Interval'),
-    {flatMap} = require('./utils');
+import Interval from './Interval';
+import {flatMap} from './utils';
 
 /**
  * Class representing a closed interval on the genome: contig:start-stop.

src/main/Controls.js

@@ -6,11 +6,11 @@
 
 import type {PartialGenomeRange} from './types';
 
-var React = require('react'),
-    _ = require('underscore');
+import React from 'react';
+import _ from 'underscore';
 
-var utils = require('./utils'),
-    Interval = require('./Interval');
+import utils from './utils';
+import Interval from './Interval';
 
 type Props = {
   range: ?GenomeRange;

src/main/CoverageCache.js

@@ -13,8 +13,8 @@ import type {BasePair, OpInfo} from './pileuputils';
 import type ContigInterval from '../main/ContigInterval';
 import type Interval from '../main/Interval';
 
-var {getOpInfo} = require('./pileuputils'),
-    utils = require('./utils');
+import {getOpInfo} from './pileuputils';
+import utils from './utils';
 
 export type BinSummary = {
   count: number;

src/main/CoverageTrack.js

@@ -10,17 +10,17 @@ import type {TwoBitSource} from './TwoBitDataSource';
 import type {DataCanvasRenderingContext2D} from 'data-canvas';
 import type {BinSummary} from './CoverageCache';
 
-var React = require('react'),
-    scale = require('./scale'),
-    shallowEquals = require('shallow-equals'),
-    d3utils = require('./d3utils'),
-    _ = require("underscore"),
-    dataCanvas = require('data-canvas'),
-    canvasUtils = require('./canvas-utils'),
-    CoverageCache = require('./CoverageCache'),
-    TiledCanvas = require('./TiledCanvas'),
-    style = require('./style'),
-    ContigInterval = require('./ContigInterval');
+import React from 'react';
+import scale from './scale';
+import shallowEquals from 'shallow-equals';
+import d3utils from './d3utils';
+import _ from 'underscore';
+import dataCanvas from 'data-canvas';
+import canvasUtils from './canvas-utils';
+import CoverageCache from './CoverageCache';
+import TiledCanvas from './TiledCanvas';
+import style from './style';
+import ContigInterval from './ContigInterval';
 
 // Basic setup (TODO: make this configurable by the user)
 const SHOW_MISMATCHES = true;

src/main/GA4GHAlignment.js

@@ -7,8 +7,8 @@
 
 import type {CigarOp, MateProperties, Strand} from './Alignment';
 
-var ContigInterval = require('./ContigInterval'),
-    SamRead = require('./SamRead');
+import ContigInterval from './ContigInterval';
+import SamRead from './SamRead';
 
 // See https://github.com/ga4gh/schemas/blob/v0.5.1/src/main/resources/avro/common.avdl
 var OP_MAP = {

src/main/GA4GHDataSource.js

@@ -7,11 +7,11 @@
 
 import type {Alignment, AlignmentDataSource} from './Alignment';
 
-var Events = require('backbone').Events,
-    _ = require('underscore');
+import _ from 'underscore';
+import {Events} from 'backbone';
 
-var ContigInterval = require('./ContigInterval'),
-    GA4GHAlignment = require('./GA4GHAlignment');
+import ContigInterval from './ContigInterval';
+import GA4GHAlignment from './GA4GHAlignment';
 
 var ALIGNMENTS_PER_REQUEST = 200;  // TODO: explain this choice.
 

src/main/GeneTrack.js

@@ -8,19 +8,19 @@ import type {Strand} from './Alignment';
 import type {Gene, BigBedSource} from './BigBedDataSource';
 import type {VizProps} from './VisualizationWrapper';
 
-var React = require('react'),
-    ReactDOM = require('react-dom'),
-    _ = require('underscore'),
-    shallowEquals = require('shallow-equals');
-
-var bedtools = require('./bedtools'),
-    Interval = require('./Interval'),
-    d3utils = require('./d3utils'),
-    scale = require('./scale'),
-    ContigInterval = require('./ContigInterval'),
-    canvasUtils = require('./canvas-utils'),
-    dataCanvas = require('data-canvas'),
-    style = require('./style');
+import React from 'react';
+import ReactDOM from 'react-dom';
+import _ from 'underscore';
+import shallowEquals from 'shallow-equals';
+
+import bedtools from './bedtools';
+import Interval from './Interval';
+import d3utils from './d3utils';
+import scale from './scale';
+import ContigInterval from './ContigInterval';
+import canvasUtils from './canvas-utils';
+import dataCanvas from 'data-canvas';
+import style from './style';
 
 
 // Draw an arrow in the middle of the visible portion of range.

src/main/GenomeTrack.js

@@ -8,17 +8,17 @@ import type {VizProps} from './VisualizationWrapper';
 import type {TwoBitSource} from './TwoBitDataSource';
 import type {DataCanvasRenderingContext2D} from 'data-canvas';
 
-var React = require('react'),
-    ReactDOM = require('react-dom'),
-    shallowEquals = require('shallow-equals');
-
-var canvasUtils = require('./canvas-utils'),
-    ContigInterval = require('./ContigInterval'),
-    dataCanvas = require('data-canvas'),
-    d3utils = require('./d3utils'),
-    DisplayMode = require('./DisplayMode'),
-    TiledCanvas = require('./TiledCanvas'),
-    style = require('./style');
+import React from 'react';
+import ReactDOM from 'react-dom';
+import shallowEquals from 'shallow-equals';
+
+import canvasUtils from './canvas-utils';
+import ContigInterval from './ContigInterval';
+import dataCanvas from 'data-canvas';
+import d3utils from './d3utils';
+import DisplayMode from './DisplayMode';
+import TiledCanvas from './TiledCanvas';
+import style from './style';
 
 
 function renderGenome(ctx: DataCanvasRenderingContext2D,

src/main/LocationTrack.js

@@ -6,13 +6,13 @@
 
 import type {VizProps} from './VisualizationWrapper';
 
-var React = require('react'),
-    ReactDOM = require('react-dom'),
-    EmptySource = require('./EmptySource'),
-    canvasUtils = require('./canvas-utils'),
-    dataCanvas = require('data-canvas'),
-    style = require('./style'),
-    d3utils = require('./d3utils');
+import React from 'react';
+import ReactDOM from 'react-dom';
+import EmptySource from './EmptySource';
+import canvasUtils from './canvas-utils';
+import dataCanvas from 'data-canvas';
+import style from './style';
+import d3utils from './d3utils';
 
 class LocationTrack extends React.Component {
   props: VizProps;

src/main/Menu.js

@@ -16,7 +16,7 @@
 
 'use strict';
 
-var React = require('react');
+import React from 'react';
 
 type MenuItem = {
   key: string;

src/main/PileupCache.js

@@ -11,11 +11,11 @@ import type {Strand, Alignment, AlignmentDataSource} from './Alignment';
 import type {TwoBitSource} from './TwoBitDataSource';
 import type {BasePair} from './pileuputils';
 
-var _ = require('underscore'),
-    ContigInterval = require('./ContigInterval'),
-    Interval = require('./Interval'),
-    {addToPileup, getOpInfo} = require('./pileuputils'),
-    utils = require('./utils');
+import _ from 'underscore';
+import ContigInterval from './ContigInterval';
+import Interval from './Interval';
+import {addToPileup, getOpInfo} from './pileuputils';
+import utils from './utils';
 
 // This bundles everything intrinsic to the alignment that we need to display
 // it, i.e. everything not dependend on scale/viewport.

src/main/PileupTrack.js

@@ -12,20 +12,20 @@ import type {DataCanvasRenderingContext2D} from 'data-canvas';
 import type Interval from './Interval';
 import type {VizProps} from './VisualizationWrapper';
 
-var React = require('react'),
-    shallowEquals = require('shallow-equals'),
-    _ = require('underscore');
-
-var scale = require('./scale'),
-    d3utils = require('./d3utils'),
-    {CigarOp} = require('./pileuputils'),
-    ContigInterval = require('./ContigInterval'),
-    DisplayMode = require('./DisplayMode'),
-    PileupCache = require('./PileupCache'),
-    TiledCanvas = require('./TiledCanvas'),
-    canvasUtils = require('./canvas-utils'),
-    dataCanvas = require('data-canvas'),
-    style = require('./style');
+import React from 'react';
+import shallowEquals from 'shallow-equals';
+import _ from 'underscore';
+
+import scale from './scale';
+import d3utils from './d3utils';
+import {CigarOp} from './pileuputils';
+import ContigInterval from './ContigInterval';
+import DisplayMode from './DisplayMode';
+import PileupCache from './PileupCache';
+import TiledCanvas from './TiledCanvas';
+import canvasUtils from './canvas-utils';
+import dataCanvas from 'data-canvas';
+import style from './style';
 
 
 var READ_HEIGHT = 13;

src/main/RemoteFile.js

@@ -5,7 +5,7 @@
  */
 'use strict';
 
-var Q = require('q');
+import Q from 'q';
 
 type Chunk = {
   start: number;

src/main/Root.js

@@ -7,10 +7,10 @@
 import type {TwoBitSource} from './TwoBitDataSource';
 import type {VisualizedTrack, VizWithOptions} from './types';
 
-var React = require('react'),
-    Controls = require('./Controls'),
-    Menu = require('./Menu'),
-    VisualizationWrapper = require('./VisualizationWrapper');
+import React from 'react';
+import Controls from './Controls';
+import Menu from './Menu';
+import VisualizationWrapper from './VisualizationWrapper';
 
 type Props = {
   referenceSource: TwoBitSource;

src/main/SamRead.js

@@ -15,11 +15,11 @@
 import type VirtualOffset from './VirtualOffset';
 import type {Strand, CigarOp, MateProperties} from './Alignment';
 
-var jDataView = require('jdataview'),
-    jBinary = require('jbinary'),
-    _ = require('underscore'),
-    bamTypes = require('./formats/bamTypes'),
-    ContigInterval = require('./ContigInterval');
+import jDataView from 'jdataview';
+import jBinary from 'jbinary';
+import _ from 'underscore';
+import bamTypes from './formats/bamTypes';
+import ContigInterval from './ContigInterval';
 
 // TODO: Make more extensive use of the jBinary specs.
 

src/main/ScaleTrack.js

@@ -12,13 +12,13 @@
 
 import type {VizProps} from './VisualizationWrapper';
 
-var React = require('react'),
-    ReactDOM = require('react-dom'),
-    EmptySource = require('./EmptySource'),
-    canvasUtils = require('./canvas-utils'),
-    dataCanvas = require('data-canvas'),
-    style = require('./style'),
-    d3utils = require('./d3utils');
+import React from 'react';
+import ReactDOM from 'react-dom';
+import EmptySource from './EmptySource';
+import canvasUtils from './canvas-utils';
+import dataCanvas from 'data-canvas';
+import style from './style';
+import d3utils from './d3utils';
 
 class ScaleTrack extends React.Component {
   props: VizProps;

src/main/TiledCanvas.js

@@ -6,15 +6,15 @@
 
 import type {DataCanvasRenderingContext2D} from 'data-canvas';
 
-var _ = require('underscore');
-
-var scale = require('./scale'),
-    ContigInterval = require('./ContigInterval'),
-    Interval = require('./Interval'),
-    canvasUtils = require('./canvas-utils'),
-    dataCanvas = require('data-canvas'),
-    utils = require('./utils'),
-    d3utils = require('./d3utils');
+import _ from 'underscore';
+
+import scale from './scale';
+import ContigInterval from './ContigInterval';
+import Interval from './Interval';
+import canvasUtils from './canvas-utils';
+import dataCanvas from 'data-canvas';
+import utils from './utils';
+import d3utils from './d3utils';
 
 type Tile = {
   pixelsPerBase: number;