Basic webpack4 builds but does not load. Errors on JBrowse/ConfigAdap…

…ter/conf
GMOD · May 9, 2018 · ae776b3 · ae776b3
1 parent 7050c10
commit ae776b3
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 32 deletions.
diff --git a/src/JBrowse/Browser.js b/src/JBrowse/Browser.js
@@ -53,7 +53,7 @@ define( [
             'JBrowse/View/StandaloneDatasetList',
             'dijit/focus',
             '../lazyload.js', // for dynamic CSS loading
-            'dojo/text!./package.json',
+            'JBrowse/package',
 
 
             // extras for webpack
@@ -252,7 +252,7 @@ _initialLocation: function() {
 version: function() {
     // when a build is put together, the build system assigns a string
     // to the variable below.
-    return JSON.parse(packagejson).version;
+    return packagejson.version;
 }.call(),
 
 
@@ -1401,7 +1401,7 @@ browserMeta: function() {
             + '  <div class="tagline">A next-generation genome browser<br> built with JavaScript and HTML5.</div>'
             + '  <a class="mainsite" target="_blank" href="http://jbrowse.org">JBrowse website</a>'
             + '  <div class="gmod">JBrowse is a <a target="_blank" href="http://gmod.org">GMOD</a> project.</div>'
-            + '  <div class="copyright">'+JSON.parse(packagejson).copyright+'</div>'
+            + '  <div class="copyright">'+packagejson.copyright+'</div>'
             + ((Object.keys(this.plugins).length>1&&!this.config.noPluginsForAboutBox) ? (
                 '  <div class="loaded-plugins">Loaded plugins<ul class="plugins-list">'
                 + array.map(Object.keys(this.plugins), function(elt) {

diff --git a/src/JBrowse/package.js b/src/JBrowse/package.js
@@ -0,0 +1,25 @@
+define(function() {
+    return {
+        "name": "JBrowse",
+        "version": "1.15.0-alpha.0",
+        "copyright":"© 2007-2017 The Evolutionary Software Foundation",
+        "main": "main",
+        "dependencies": {
+            "dojo": "current",
+            "dijit": "current",
+            "dojox": "current",
+            "util": "current"
+        },
+        "description": "A modern client-side genome browser.",
+        "licenses": [
+            {
+                "type": "LGPL-2.1",
+                "url": "https://raw.github.com/GMOD/jbrowse/master/LICENSE"
+            }
+        ],
+        "bugs": "https://github.com/gmod/jbrowse/issues",
+        "keywords": ["JavaScript", "JBrowse", "Genome Browser", "Genomics", "Bioinformatics"],
+        "homepage": "http://jbrowse.org",
+        "dojoBuild": "JBrowse.profile.js"
+    }
+})
diff --git a/src/JBrowse/package.json b/src/JBrowse/package.json
diff --git a/webpack.config.js b/webpack.config.js
@@ -3,11 +3,10 @@ require('babel-polyfill')
 
 const DojoWebpackPlugin = require("dojo-webpack-plugin")
 const CopyWebpackPlugin = require("copy-webpack-plugin")
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
-const CleanWebpackPlugin = require('clean-webpack-plugin');
+const CleanWebpackPlugin = require("clean-webpack-plugin");
 
 const path = require("path")
-const glob = require('glob')
+const glob = require("glob")
 const webpack = require("webpack")
 
 // if JBROWSE_BUILD_MIN env var is 1 or true, then we also minimize the JS
@@ -56,7 +55,7 @@ var webpackConf = {
         ),
 
         new webpack.NormalModuleReplacementPlugin(/^dojo\/text!/, function(data) {
-            data.request = data.request.replace(/^dojo\/text!/, "!!raw-loader!");
+            data.request = data.request.replace(/^dojo\/text!/, "!raw-loader!");
         }),
 
         new webpack.NormalModuleReplacementPlugin(
@@ -117,8 +116,6 @@ if (DEBUG) {
     webpackConf.devtool = 'source-map'
     webpackConf.entry.run_jasmine = 'tests/js_tests/main.js'
     webpackConf.plugins.push( new webpack.optimize.AggressiveMergingPlugin() )
-} else {
-    webpackConf.plugins.push( new UglifyJsPlugin({maxConcurrentCallsPerWorker: 1}))
 }
 
 module.exports = webpackConf