distinguish dev and prod webpack output

colin-combe · Jun 20, 2020 · 2d769fd · 2d769fd
1 parent 812c166
commit 2d769fd
Show file tree

Hide file tree

Showing 34 changed files with 1,243 additions and 1,142 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,5 +1,5 @@
 {
-  "presets": [
+ "presets": [
     [
       "@babel/preset-env",
       {

diff --git a/.eslintrc.json b/.eslintrc.json
@@ -4,7 +4,7 @@
     "semi": ["error", "always" ],
     "semi-style": ["error", "last"],
     "semi-spacing": ["error", {"before": false, "after": true}],
-    "quotes": [ "warn", "single" ],
+    "quotes": [ "warn", "double" ], // JSON standard says double
     "brace-style": "warn"
 //    "object-curly-newline": ["error", "always"]
   },

diff --git a/css/style.css b/css/style.css
@@ -144,25 +144,11 @@ body, input, select, textarea, button {
 }
 
 .page-header {
-    /*
-        height:35px;
-    */
     padding: 10px;
     background-color: #091D42;
     color: #fff;
-    /*
-        position: absolute;
-    */
-    /* increased z-index to 50 so it's children (i.e. drop-down menus) overlay floating windows */
-    /*
-        todo? would be better if floaty windows didn't go under this -- cc
-    */
-    /*
-        z-index: 50;
-    */
 }
 
-/* history page */
 .tableContainer a {
     color: #091D42;
     text-decoration: underline;
@@ -177,7 +163,7 @@ body, input, select, textarea, button {
     background-color: #091D42;
 }
 
-/* network page */
+
 #main {
     /*
         height:100vh;
@@ -236,10 +222,6 @@ body, input, select, textarea, button {
     color: #039;
     height: 30px;
     /*#091D42;*/
-    /*
-        padding: 10px 8px;
-        border: 0;
-    */
 }
 
 .panelInner thead td {

diff --git a/data/index.js b/data/index.js
@@ -1,111 +1,111 @@
 // eslint-disable-next-line no-unused-vars
 const exampleIndex = [
     {
-        'ac': 'CPX-5183',
-        'name': 'CPX-5183',
-        'url': 'https://www.ebi.ac.uk/complexportal/complex/CPX-5183',
+        "ac": "CPX-5183",
+        "name": "CPX-5183",
+        "url": "https://www.ebi.ac.uk/complexportal/complex/CPX-5183",
     }, {
-        'ac': 'CPX-1920',
-        'name': '~CPX-1920',
-        'url': 'https://www.ebi.ac.uk/complexportal/complex/CPX-1920',
+        "ac": "CPX-1920",
+        "name": "~CPX-1920",
+        "url": "https://www.ebi.ac.uk/complexportal/complex/CPX-1920",
     },
     {
-        'ac': 'EBI-12598622',
-        'name': 'EBI-12598622',
-        'url': 'https://ebi-intact.github.io/intact-view/details/interaction/EBI-12598622',
+        "ac": "EBI-12598622",
+        "name": "EBI-12598622",
+        "url": "https://ebi-intact.github.io/intact-view/details/interaction/EBI-12598622",
     },
     {
-        'ac': 'CPX-297',
-        'name': 'CPX-297',
-        'url': 'https://www.ebi.ac.uk/complexportal/complex/CPX-297',
+        "ac": "CPX-297",
+        "name": "CPX-297",
+        "url": "https://www.ebi.ac.uk/complexportal/complex/CPX-297",
     },
     {
-        'ac': 'CPX-1556',
-        'name': 'CMG-Pol epsilon complex',
-        'url': 'https://www.ebi.ac.uk/complexportal/complex/CPX-1556',
+        "ac": "CPX-1556",
+        "name": "CMG-Pol epsilon complex",
+        "url": "https://www.ebi.ac.uk/complexportal/complex/CPX-1556",
     },
     {
-        'ac': 'EBI-6161327',
-        'name': 'EBI-6161327',
-        'url': 'https://wwwdev.ebi.ac.uk/intact/ws/graph/interaction/export/EBI-6161327',
+        "ac": "EBI-6161327",
+        "name": "EBI-6161327",
+        "url": "https://wwwdev.ebi.ac.uk/intact/ws/graph/interaction/export/EBI-6161327",
     },
     {
-        'ac': 'EBI-4371590',
-        'name': 'EBI-4371590',
-        'url': 'https://ebi-intact.github.io/intact-view/details/interaction/EBI-4371590',
+        "ac": "EBI-4371590",
+        "name": "EBI-4371590",
+        "url": "https://ebi-intact.github.io/intact-view/details/interaction/EBI-4371590",
     },
     {
-        'ac': 'EBI-5260847',
-        'name': 'EBI-5260847',
-        'url': 'https://ebi-intact.github.io/intact-view/details/interaction/EBI-5260847',
+        "ac": "EBI-5260847",
+        "name": "EBI-5260847",
+        "url": "https://ebi-intact.github.io/intact-view/details/interaction/EBI-5260847",
     },
     {
-        'ac': 'EBI-12734333',
-        'name': 'EBI-12734333',
-        'url': 'https://ebi-intact.github.io/intact-view/details/interaction/EBI-12734333',
+        "ac": "EBI-12734333",
+        "name": "EBI-12734333",
+        "url": "https://ebi-intact.github.io/intact-view/details/interaction/EBI-12734333",
     },
     {
-        'ac': 'EBI-9691559',
-        'name': 'Mitochondrial pyruvate dehydrogenase complex',
-        'url': 'https://ebi-intact.github.io/intact-view/details/interaction/EBI-9691559',
-        'disableStoichExpand': true,
+        "ac": "EBI-9691559",
+        "name": "Mitochondrial pyruvate dehydrogenase complex",
+        "url": "https://ebi-intact.github.io/intact-view/details/interaction/EBI-9691559",
+        "disableStoichExpand": true,
     },
 
     {
-        'ac': 'EBI-10887677',
-        'name': 'Shelterin complex',
-        'url': 'https://ebi-intact.github.io/intact-view/details/interaction/EBI-10887677'
+        "ac": "EBI-10887677",
+        "name": "Shelterin complex",
+        "url": "https://ebi-intact.github.io/intact-view/details/interaction/EBI-10887677"
     },
     {
-        'ac': 'EBI-9082861',
-        'name': 'PDGF receptor alpha-beta - PDGF-BB heterotetramer',
-        'url': 'https://ebi-intact.github.io/intact-view/details/interaction/EBI-9082861',
+        "ac": "EBI-9082861",
+        "name": "PDGF receptor alpha-beta - PDGF-BB heterotetramer",
+        "url": "https://ebi-intact.github.io/intact-view/details/interaction/EBI-9082861",
     },
 
     {
-        'ac': 'EBI-1202920',
-        'name': 'PCNA homotrimer',
-        'url': 'http://www.ebi.ac.uk/intact/complex/details/EBI-1202920',
+        "ac": "EBI-1202920",
+        "name": "PCNA homotrimer",
+        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-1202920",
     },
     {
-        'ac': 'EBI-6554207',
-        'name': 'DnaB helicase complex',
-        'url': 'http://www.ebi.ac.uk/intact/complex/details/EBI-6554207',
+        "ac": "EBI-6554207",
+        "name": "DnaB helicase complex",
+        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-6554207",
     },
     {
-        'ac': 'EBI-8869931',
-        'name': 'IscS-TusA complex',
-        'url': 'http://www.ebi.ac.uk/intact/complex/details/EBI-8869931',
+        "ac": "EBI-8869931",
+        "name": "IscS-TusA complex",
+        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-8869931",
     },
     {
-        'ac': 'EBI-9008283',
-        'name': 'Chaperonin-containing T-complex',
-        'url': 'http://www.ebi.ac.uk/intact/complex/details/EBI-9008283',
+        "ac": "EBI-9008283",
+        "name": "Chaperonin-containing T-complex",
+        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-9008283",
     },
     {
-        'ac': 'EBI-9008420',
-        'name': 'Hemoglobin HbA complex',
-        'url': 'http://www.ebi.ac.uk/intact/complex/details/EBI-9008420',
+        "ac": "EBI-9008420",
+        "name": "Hemoglobin HbA complex",
+        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-9008420",
     },
 
     {
-        'ac': 'EBI-9696567',
-        'name': 'Core mediator complex',
-        'url': 'http://www.ebi.ac.uk/intact/complex/details/EBI-9696567',
+        "ac": "EBI-9696567",
+        "name": "Core mediator complex",
+        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-9696567",
     },
     {
-        'ac': 'EBI-9997373',
-        'name': 'Telomerase holoenzyme complex',
-        'url': 'http://www.ebi.ac.uk/intact/complex/details/EBI-9997373',
+        "ac": "EBI-9997373",
+        "name": "Telomerase holoenzyme complex",
+        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-9997373",
     },
     {
-        'ac': 'EBI-10828997',
-        'name': 'GLI3-SUFU complex',
-        'url': 'http://www.ebi.ac.uk/intact/complex/details/EBI-10828997',
+        "ac": "EBI-10828997",
+        "name": "GLI3-SUFU complex",
+        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-10828997",
     },
     {
-        'ac': 'CPX-1599',
-        'name': '40S cytosolic small ribosomal subunit',
-        'url': 'https://www.ebi.ac.uk/complexportal/complex/CPX-1599',
+        "ac": "CPX-1599",
+        "name": "40S cytosolic small ribosomal subunit",
+        "url": "https://www.ebi.ac.uk/complexportal/complex/CPX-1599",
     }
 ];
diff --git a/dist/complexviewer.js b/dist/complexviewer.js
diff --git a/mi-json-schema.json b/mi-json-schema.json
@@ -1,6 +1,7 @@
 {
   "type": "object",
   "$schema": "http://json-schema.org/draft-03/schema",
+  "$id": "http://complexviewer.org/mi-json-schema.json",
   "required": false,
   "properties": {
     "data": {

diff --git a/package.json b/package.json
@@ -25,35 +25,36 @@
     }
   ],
   "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "[email protected]:MICommunity/ComplexViewer.git"
+  },
+  "bugs": {
+    "url": "https://github.com/MICommunity/ComplexViewer/issues"
+  },
   "devDependencies": {
-    "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.11",
-    "webpack-dev-server": "^3.11.0",
-    "style-loader": "^1.2.1",
-    "css-loader": "^3.6.0",
-    "file-loader": "^6.0.0",
-    "url-loader": "^4.1.0",
     "@babel/core": "^7.10.2",
     "@babel/preset-env": "^7.10.2",
     "babel-loader": "^8.1.0",
-    "eslint": "^7.2.0"
+    "css-loader": "^3.6.0",
+    "eslint": "^7.2.0",
+    "file-loader": "^6.0.0",
+    "style-loader": "^1.2.1",
+    "url-loader": "^4.1.0",
+    "webpack": "^4.43.0",
+    "webpack-cli": "^3.3.11",
+    "webpack-dev-server": "^3.11.0",
+    "webpack-merge": "^4.2.2"
   },
   "scripts": {
     "clean": "rm dist/*",
-    "start:dev": "webpack-dev-server --config webpack.conf.js",
-    "build-dev": "rm dist/*; webpack -d --mode development --config webpack.conf.js",
-    "build-prod": "rm dist/*; webpack -p --mode production --config webpack.conf.js"
+    "start:dev": "webpack-dev-server --open --config webpack.dev.js",
+    "build-dev": "rm dist/*; webpack -d --mode development --config webpack.dev.js",
+    "build-prod": "rm dist/*; webpack -p --mode production --config webpack.prod.js"
   },
   "engines": {
     "node": ">=14.0.0"
   },
-  "browserify-shim": {
-    "./bower_components/colorbrewer/colorbrewer.js": "colorbrewer"
-  },
-  "repository": {
-    "type": "git",
-    "url": "[email protected]:MICommunity/interaction-viewer.git"
-  },
   "dependencies": {
     "colorbrewer": "^1.3.0",
     "core-js": "^3.6.5",