Merge branch 'dev' into replace_history_import

galaxyproject · Nov 22, 2017 · 4ecf7a0 · 4ecf7a0
2 parents 4cf8ad2 + 7ee9215
commit 4ecf7a0
Show file tree

Hide file tree

Showing 474 changed files with 215 additions and 685 deletions.
diff --git a/.gitignore b/.gitignore
@@ -123,6 +123,8 @@ sprite-*.less
 
 # JS, Local node_modules, and bower_components directories
 static/scripts/bundled/[0-9]*
+static/maps
+static/scripts/bundled/*.js.map
 node_modules
 bower_components
 client/galaxy/scripts/libs/*

diff --git a/client/gulpfile.js b/client/gulpfile.js
@@ -48,12 +48,12 @@ gulp.task('scripts', function() {
   return gulp.src(paths.scripts)
     .pipe(plumber())
     .pipe(cached('scripts'))
-    .pipe(sourcemaps.init())
+    //.pipe(sourcemaps.init())
     .pipe(babel({
         plugins: ['transform-es2015-modules-amd']
     }))
     .pipe(gulpif(nopack_mode, beautify(), uglify()))
-    .pipe(sourcemaps.write('../maps/'))
+    //.pipe(sourcemaps.write('../maps/'))
     .pipe(gulp.dest('../static/scripts/'));
 });
 

diff --git a/client/webpack.config.js b/client/webpack.config.js
@@ -38,7 +38,7 @@ var commonLibs = [
 ];
 
 module.exports = {
-    devtool: "source-map",
+    //devtool: "source-map",
     entry: {
         libs: commonLibs,
         login: "./galaxy/scripts/apps/login.js",

diff --git a/static/maps/admin.toolshed.js.map b/static/maps/admin.toolshed.js.map
diff --git a/static/maps/analysis.js.map b/static/maps/analysis.js.map
diff --git a/static/maps/app.js.map b/static/maps/app.js.map
diff --git a/static/maps/app/analysis.js.map b/static/maps/app/analysis.js.map