Skip to content

Commit

Permalink
Remove ".es6" extensions in imports.
Browse files Browse the repository at this point in the history
  • Loading branch information
dasmoth committed Nov 4, 2016
1 parent 8bb5384 commit 0fad48d
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 11 deletions.
4 changes: 4 additions & 0 deletions gulpfile.js
Expand Up @@ -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
})
Expand All @@ -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
})
Expand All @@ -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
})
Expand All @@ -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
})
Expand Down
12 changes: 6 additions & 6 deletions js/cbrowser.js
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion 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 };

Expand Down
2 changes: 1 addition & 1 deletion js/exports.js
Expand Up @@ -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;
2 changes: 1 addition & 1 deletion js/multi-renderer.es6
Expand Up @@ -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";

Expand Down
2 changes: 1 addition & 1 deletion js/sourceadapters.js
Expand Up @@ -1774,5 +1774,5 @@ if (typeof(module) !== 'undefined') {
require('./memstore');
require('./bedwig');
require('./vcf');
require('./test-source.es6');
require('./test-source');
}
2 changes: 1 addition & 1 deletion js/test-renderer.es6
Expand Up @@ -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 };

Expand Down

0 comments on commit 0fad48d

Please sign in to comment.