Merge pull request #35 from eapearson/master

update deps, remove unused, remove source maps in vendors to stop 404…
kbaseattic · Dec 10, 2019 · c5729c4 · c5729c4
2 parents d144c8a + cffd22f
commit c5729c4
Show file tree

Hide file tree

Showing 17 changed files with 2,639 additions and 2,993 deletions.
diff --git a/build/Gruntfile.js b/build/Gruntfile.js
@@ -5,39 +5,24 @@ module.exports = function (grunt) {
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
         copy: {
-            vega: {
-                expand: true,
-                flatten: true,
-                src: 'node_modules/vega-lib/build/vega.js',
-                dest: '../src/plugin/iframe_root/js/vendor/vega'
-            },
-            d3: {
-                expand: true,
-                flatten: true,
-                src: 'node_modules/d3/dist/d3.js',
-                dest: '../src/plugin/iframe_root/js/vendor/d3'
-            },
-            dagre: {
-                expand: true,
-                flatten: true,
-                src: 'node_modules/dagre/dist/dagre.js',
-                dest: '../src/plugin/iframe_root/js/vendor/dagre'
-            },
-            'dagre-d3': {
-                expand: true,
-                flatten: true,
-                src: 'node_modules/dagre-d3/dist/dagre-d3.js',
-                dest: '../src/plugin/iframe_root/js/vendor/dagre-d3'
-            },
             'pure-uuid': {
                 expand: true,
                 flatten: true,
-                src: 'node_modules/pure-uuid/uuid',
-                dest: '../src/plugin/iframe_root/js/vendor/pure-uuid'
+                src: 'node_modules/pure-uuid/uuid.js',
+                dest: '../src/plugin/iframe_root/modules/vendor/pure-uuid'
             }
+        },
+        clean: {
+            options: {
+                force: true
+            },
+            vendor: '../src/plugin/iframe_root/modules/vendor/*',
+            bower: './bower_components/',
+            npm: './node_modules/'
         }
     });
 
     grunt.loadNpmTasks('grunt-contrib-copy');
+    grunt.loadNpmTasks('grunt-contrib-clean');
 
 };
diff --git a/build/README.md b/build/README.md
@@ -8,7 +8,11 @@ By hand:
 
 ```
 cd build
-npm install
-./node_modules/.bin/bower-installer
-./node_modules/.bin/grunt copy
+yarn clean
+yarn install
+yarn install-bower
+yarn install-npm
+yarn remove-source-maps
 ```
+
+> Only use yarn clean if you want to clean out the stuff installed in vendor, as well as the node and bower packages installed in build.
diff --git a/build/bower.json b/build/bower.json
@@ -1,50 +1,61 @@
 {
     "name": "kbase-ui-plugin-dashboard-internal",
     "description": "Just the internal iframe app",
-    "keywords": ["kbase", "widget"],
-    "author": ["[email protected]"],
+    "keywords": [
+        "kbase",
+        "widget"
+    ],
+    "author": [
+        "[email protected]"
+    ],
     "install": {
         "path": "../src/plugin/iframe_root/modules/vendor",
         "sources": {
             "bootstrap": [
-                { "bower_components/bootstrap/dist/css/bootstrap.css": "css/bootstrap.css" },
-                { "bower_components/bootstrap/dist/css/bootstrap-theme.css": "css/bootstrap-theme.css" },
-                { "bower_components/bootstrap/dist/fonts/**": "fonts/" },
-                { "bower_components/bootstrap/dist/js/bootstrap.js": "bootstrap.js" }
+                {
+                    "bower_components/bootstrap/dist/css/bootstrap.css": "css/bootstrap.css"
+                },
+                {
+                    "bower_components/bootstrap/dist/css/bootstrap-theme.css": "css/bootstrap-theme.css"
+                },
+                {
+                    "bower_components/bootstrap/dist/fonts/**": "fonts/"
+                },
+                {
+                    "bower_components/bootstrap/dist/js/bootstrap.js": "bootstrap.js"
+                }
             ],
             "kbase-common-es6": "bower_components/kbase-common-es6/src/**",
             "kbase-common-js": "bower_components/kbase-common-js/dist/kb_common/**",
             "kbase-service-clients-js": "bower_components/kbase-service-clients-js/dist/kb_service/**",
             "font-awesome": [
-                { "bower_components/font-awesome/css/font-awesome.css": "css/font-awesome.css" },
-                { "bower_components/font-awesome/fonts/**": "fonts/" }
+                {
+                    "bower_components/font-awesome/css/font-awesome.css": "css/font-awesome.css"
+                },
+                {
+                    "bower_components/font-awesome/fonts/**": "fonts/"
+                }
             ],
             "pure-uuid": "bower_components/pure-uuid/uuid.js"
         }
     },
     "dependencies": {
-        "bluebird": "3.5.5",
+        "bluebird": "3.7.2",
         "bootstrap": "3.4.1",
         "jquery": "^2.1.0",
         "requirejs": "2.3.6",
         "require-css": "0.1.10",
         "kbase-common-js": "2.18.1",
-        "kbase-common-es6": "0.10.20",
+        "kbase-common-es6": "0.10.23",
         "js-yaml": "3.13.1",
         "requirejs-text": "2.0.16",
         "requirejs-yaml": "eapearson/requirejs-yaml#1.0.5",
-        "pure-uuid": "eapearson/pure-uuid#1.1.1",
         "kbase-service-clients-js": "3.3.5",
         "nunjucks": "3.1.2",
         "spark-md5": "3.0.0",
         "font-awesome": "4.7.0",
         "datatables-bootstrap3-plugin": "eapearson/datatables-bootstrap3-plugin#1.0.1",
-        "datatables": "1.10.19",
-        "file-saver": "1.3.4"
-    },
-
-    "resolutions": {
-        "file-saver": "1.3.4"
+        "datatables": "1.10.19"
     },
     "license": "SEE LICENSE IN ../LICENSE"
-}
+}