X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=gulpfile.js;h=b1592bddf50e6892b65ff2ad8d97e35207d3c177;hb=2a1f00d810b5c4f04b72bc6a393380b858f70909;hp=f842bf7e40fcdf41f71783a706c174b5475a14ce;hpb=ab847f3786353185f78163b02c276760a380e80c;p=dygraphs.git

diff --git a/gulpfile.js b/gulpfile.js
index f842bf7..b1592bd 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,7 +1,6 @@
 var gulp = require('gulp');
 var plugins = require('gulp-load-plugins')();
 var karma = require('karma').server;
-var lazypipe = require('lazypipe');
 var path = require('path');
 
 var dev = false;
@@ -100,7 +99,7 @@ gulp.task('create-dev', function() {
   var dest = 'dist';
   return gulp.src(mergePaths(src.polyfills, src.main, src.plugins, src.devOptions, src.datahandlers), {base: '.'})
     .pipe(plugins.sourcemaps.init({debug:true}))
-    .pipe(plugins.concat('dygraph-combined.dev.js'))
+    .pipe(plugins.concat('dygraph-combined-dev.js'))
     .pipe(plugins.header(copyright))
     .pipe(plugins.sourcemaps.write('.'))  // '.' = external sourcemap
     .pipe(gulp.dest(dest));
@@ -108,9 +107,9 @@ gulp.task('create-dev', function() {
 
 gulp.task('concat', function() {
   var dest = 'dist';
-  return gulp.src(mergePaths(src.polyfills, src.main, src.plugins, src.datahandlers))
+  return gulp.src(mergePaths(src.polyfills, src.main, src.plugins, src.datahandlers), {base: '.'})
      .pipe(plugins.sourcemaps.init())
-     .pipe(plugins.concat('dygraph-combined.js'))
+     .pipe(plugins.concat('scratch'))
      .pipe(plugins.header(copyright))
      .pipe(gulp.dest(dest))
      .pipe(plugins.uglify({
@@ -121,26 +120,18 @@ gulp.task('concat', function() {
       preserveComments: "none"
      }))
      .pipe(plugins.header(copyright))
-     .pipe(plugins.rename('dygraph-combined.min.js'))
+     .pipe(plugins.rename('dygraph-combined.js'))
      .pipe(plugins.sourcemaps.write('.'))
      .pipe(gulp.dest(dest));
 
 });
 
-gulp.task("bower-dist", ['concat'], function() {
-  gulp.src('src/dygraph/extras/**', {base: 'src/dygraph'})
-    .pipe(gulp.dest('dist/bower'));
-
-  return gulp.src('dist/dygraph-combined*')
-    .pipe(gulp.dest('dist/bower'));
-});
-
 gulp.task('gwt-dist', ['concat'], function() {
   // Copy package structure to dist folder
   gulp.src('gwt/**', {'base': '.'})
     .pipe(gulp.dest('dist'));
 
-  gulp.src('dygraph-combined.min.js')
+  gulp.src('dygraph-combined.js')
     .pipe(gulp.dest('dist/gwt/org/danvk'));
 
   // Generate jar
@@ -159,7 +150,7 @@ gulp.task('test', ['concat', 'create-dev'], function(done) {
 
 gulp.task('coveralls', ['test'], plugins.shell.task([
   './scripts/transform-coverage.js ' +
-      'dist/dygraph-combined.dev.js.map ' +
+      'dist/dygraph-combined-dev.js.map ' +
       'dist/coverage/report-lcov/lcov.info ' +
   '| ./node_modules/.bin/coveralls'
 ]));
@@ -172,6 +163,6 @@ gulp.task('watch-test', function() {
   gulp.watch(['src/**', 'auto_tests/tests/**'], ['test']);
 });
 
-gulp.task('dist', ['gwt-dist', 'bower-dist']);
+gulp.task('dist', ['gwt-dist', 'concat', 'create-dev']);
 gulp.task('travis', ['test', 'coveralls']);
 gulp.task('default', ['test', 'dist']);