From 0fad48d9a5107c58d5a4c44467e7afbdf09ccdc9 Mon Sep 17 00:00:00 2001
From: Thomas Down <thomas.a.down@googlemail.com>
Date: Fri, 4 Nov 2016 22:48:54 +0000
Subject: [PATCH] Remove ".es6" extensions in imports.

---
 gulpfile.js           |  4 ++++
 js/cbrowser.js        | 12 ++++++------
 js/dummy-renderer.es6 |  2 +-
 js/exports.js         |  2 +-
 js/multi-renderer.es6 |  2 +-
 js/sourceadapters.js  |  2 +-
 js/test-renderer.es6  |  2 +-
 7 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 951ec75b..b9210b37 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -15,6 +15,7 @@ var eslint = require('gulp-eslint');
 gulp.task('build-worker', function() {
     browserify({
         entries: 'js/fetchworker.js',
+        extensions: ['.js', '.es6'],
         debug: true,
         nobuiltins: true
     })
@@ -32,6 +33,7 @@ gulp.task('build-worker', function() {
 gulp.task('build-main', function() {
     browserify({
         entries: 'js/exports.js',
+        extensions: ['.js', '.es6'],
         debug: true,
         nobuiltins: true
     })
@@ -47,6 +49,7 @@ gulp.task('build-main', function() {
 gulp.task('compile-worker', function() {
     browserify({
         entries: 'js/fetchworker.js',
+        extensions: ['.js', '.es6'],
         debug: true,
         nobuiltins: true
     })
@@ -64,6 +67,7 @@ gulp.task('compile-worker', function() {
 gulp.task('compile-main', function() {
     browserify({
         entries: 'js/exports.js',
+        extensions: ['.js', '.es6'],
         debug: true,
         nobuiltins: true
     })
diff --git a/js/cbrowser.js b/js/cbrowser.js
index b4365fcf..59035733 100644
--- a/js/cbrowser.js
+++ b/js/cbrowser.js
@@ -44,14 +44,14 @@ if (typeof(require) !== 'undefined') {
     var sourceDataURI = sourcecompare.sourceDataURI;
     var sourceStyleURI = sourcecompare.sourceStyleURI;
 
-    var DefaultRenderer = require('./default-renderer.es6');
-    var OldRenderer = require('./old-renderer.js');
+    var DefaultRenderer = require('./default-renderer');
+    var OldRenderer = require('./old-renderer');
 
-    var MultiRenderer = require('./multi-renderer.es6');
-    var SubRenderer = require('./sub-renderer.es6');
+    var MultiRenderer = require('./multi-renderer');
+    var SubRenderer = require('./sub-renderer');
 
-    var TestRenderer = require('./test-renderer.es6');
-    var DummyRenderer = require('./dummy-renderer.es6');
+    var TestRenderer = require('./test-renderer');
+    var DummyRenderer = require('./dummy-renderer');
 }
 
 function Region(chr, min, max) {
diff --git a/js/dummy-renderer.es6 b/js/dummy-renderer.es6
index 3741e862..2b4a73e7 100644
--- a/js/dummy-renderer.es6
+++ b/js/dummy-renderer.es6
@@ -1,7 +1,7 @@
 /* jshint esversion: 6 */
 "use strict";
 
-import * as DefaultRenderer from "./default-renderer.es6";
+import * as DefaultRenderer from "./default-renderer";
 
 export { renderTier, drawTier };
 
diff --git a/js/exports.js b/js/exports.js
index 837e47ca..d1c1fb7e 100644
--- a/js/exports.js
+++ b/js/exports.js
@@ -35,6 +35,6 @@ window.DASStylesheet = das.DASStylesheet;
 window.DASStyle = das.DASStyle;
 window.DASSource = das.DASSource;    // Pre-0.8 configurations used this.  Still some around...
 
-var ruler = require("./rulers.es6");
+var ruler = require("./rulers");
 window.Ruler = ruler.Ruler;
 window.rulerDrawCallback = ruler.rulerDrawCallback;
diff --git a/js/multi-renderer.es6 b/js/multi-renderer.es6
index e2e33f23..a2e47f91 100644
--- a/js/multi-renderer.es6
+++ b/js/multi-renderer.es6
@@ -5,7 +5,7 @@ import { drawSeqTier } from "./sequence-draw.js";
 
 import { GridGlyph } from "./glyphs.js";
 
-import * as DefaultRenderer from "./default-renderer.es6";
+import * as DefaultRenderer from "./default-renderer";
 
 import * as R from "ramda";
 
diff --git a/js/sourceadapters.js b/js/sourceadapters.js
index 4440db07..1f9d1b8c 100644
--- a/js/sourceadapters.js
+++ b/js/sourceadapters.js
@@ -1774,5 +1774,5 @@ if (typeof(module) !== 'undefined') {
     require('./memstore');
     require('./bedwig');
     require('./vcf');
-    require('./test-source.es6');
+    require('./test-source');
 }
diff --git a/js/test-renderer.es6 b/js/test-renderer.es6
index d916e777..db4340a8 100644
--- a/js/test-renderer.es6
+++ b/js/test-renderer.es6
@@ -5,7 +5,7 @@ import { drawFeatureTier as oldDrawFeatureTier } from "./feature-draw.js";
 
 import { shallowCopy } from "./utils.js";
 
-import * as DefaultRenderer from "./default-renderer.es6";
+import * as DefaultRenderer from "./default-renderer";
 
 export { renderTier, drawTier };