Remove webpack provide, fix bug in jointSort library function.

veg · Mar 10, 2020 · 3c617e4 · 3c617e4
1 parent 2f19c89
commit 3c617e4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/dist/data/CD2-slim.fasta b/dist/data/CD2-slim.fasta
@@ -0,0 +1,20 @@
+>Human
+GCCTTGGAAACCTGGGGTGCCTTGGGTCAG
+>Chimp
+GCCTTGGAAACCTGGGGTGCCTTGGGTCAG
+>Baboon
+GCTTTGGAAACCTGGGGAGCGCTGGGTCAG
+>RhMonkey
+GCTTTGGAAACCTGGGGAGCGCTGGGTCAG
+>Cow
+AGCATTGTCGTCTGGGGTGCCCTGGATCAT
+>Pig
+ACTGAGGTTGTCTGGGGCATCGTGGATCAA
+>Horse
+AATATCACCATCTTGGGTGCCCTGGAACGT
+>Cat
+GATGATATCGTCTGGGGTACCCTGGGTCAG
+>Mouse
+AATGAGACCATCTGGGGTGTCTTGGGTCAT
+>Rat
+AGTGGGACCGTCTGGGGTGCCCTGGGTCAT
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alignment.js",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "library.js",
   "license": "MIT",
   "dependencies": {

diff --git a/src/helpers/jointSort.js b/src/helpers/jointSort.js
@@ -1,3 +1,5 @@
+import { max } from "d3";
+
 function sortFASTAAndNewick(sequence_data, tree) {
   var i = 0;
   tree.traverse_and_compute(function(n) {
@@ -6,7 +8,7 @@ function sortFASTAAndNewick(sequence_data, tree) {
       n.name = "Node" + i++;
     }
     if (n.children && n.children.length) {
-      d += d3.max(n.children, function(d) {
+      d += max(n.children, function(d) {
         return d["count_depth"];
       });
     }

diff --git a/webpack.common.js b/webpack.common.js
@@ -9,11 +9,6 @@ module.exports = {
     new HtmlWebpackPlugin({
       title: "Javascript Alignment Viewer"
     }),
-    new webpack.ProvidePlugin({
-      d3: "d3",
-      _: "underscore",
-      $: "jquery"
-    }),
     new ExtractTextPlugin("alignment.css")
   ],
   module: {