Merge branch 'release/0.3.0'

.gitignore

@@ -1,6 +1,6 @@
 .DS_Store
 node_modules
-#/dist
+/dist
 
 # Vue configuration files
 .env.local

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2019 University of Michigan Center for Statistical Genetics
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -3,7 +3,7 @@
 This is a demonstration of loading GWAS results via the web browser, fetching only the data 
 required for that region. It works with Tabixed GWAS data files in a variety of formats.
 
-A live [demonstration](https://abought.github.io/locuszoom-tabix/) is available. 
+A live [demonstration](https://statgen.github.io/localzoom/) is available. 
 
 
 ## Getting help

babel.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  presets: [
-    '@vue/app',
-  ],
+    presets: [
+        '@vue/app',
+    ],
 };

deploy.sh

@@ -19,6 +19,6 @@ git add -A
 git commit -m 'Deploy newest version'
 
 # if you are deploying to https://<USERNAME>.github.io/<REPO>
- git push -f https://github.com/abought/locuszoom-tabix.git master:gh-pages
+git push -f https://github.com/statgen/localzoom.git master:gh-pages
 
 cd -

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "locuszoom-tabix",
-  "version": "0.2.1",
-  "private": true,
+  "name": "localzoom",
+  "version": "0.3.0",
+  "license": "MIT",
   "main": "lib/LzTabix.umd.min.js",
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -16,18 +16,19 @@
     "bootstrap": "^4.1.3",
     "bootstrap-vue": "^2.0.0-rc.11",
     "gwas-credible-sets": "^0.1.0",
-    "locuszoom": "~0.9.0",
+    "locuszoom": "https://github.com/statgen/locuszoom#develop",
     "lodash": "^4.17.11",
+    "tabix-reader": "https://github.com/abought/tabix-reader",
     "tabulator-tables": "^4.1.4",
-    "vue": "^2.5.17",
+    "vue": "^2.6.10",
     "vue-bootstrap-typeahead": "^0.2.6"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.0.0",
     "@vue/cli-plugin-eslint": "^3.0.0",
     "@vue/cli-plugin-unit-mocha": "^3.0.0",
     "@vue/cli-service": "^3.0.0",
-    "@vue/eslint-config-airbnb": "^3.0.1",
+    "@vue/eslint-config-airbnb": "^4.0.0",
     "@vue/test-utils": "^1.0.0-beta.20",
     "chai": "^4.1.2",
     "node-sass": "^4.9.0",

public/index.html

@@ -4,19 +4,8 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <!-- Necessary includes for LocusZoom.js -->
-  <!-- FIXME: These assets are being loaded statically for now, due to problems with the various module styles. Improve support for use of non-global-variable-->
+  <!-- Necessary includes for LocusZoom.js (code is imported via modules) -->
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/locuszoom.css" type="text/css"/>
-  <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/locuszoom.vendor.min.js" type="application/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/locuszoom.app.min.js" type="application/javascript"></script>
-
-  <!-- Extensions for credible sets -->
-  <script type="application/javascript" src="https://unpkg.com/[email protected]/dist/gwas-credible-sets.min.js" integrity="sha384-lJL/xQT18Xu6GVovitlKgX4kL8hw6YfgLGVM5PWcFUMe+tfvznEwsJlauLzB1AnQ" crossorigin="anonymous"></script>
-  <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/ext/lz-credible-sets.min.js" type="application/javascript"></script>
-
-  <!-- FIXME: Vue build fails when `import`ing a UMD bundle; include file separately for now -->
-  <script src="external/dalliance-tabix-reader.js" type="application/javascript"></script>
-
   <title>LocalZoom ~ Plot your own Tabixed Data with LocusZoom.js</title>
 
   <style>