Skip to content

Commit

Permalink
backport changes from production
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Aug 22, 2014
1 parent f90e92f commit aae1976
Show file tree
Hide file tree
Showing 23 changed files with 204 additions and 16,351 deletions.
32 changes: 32 additions & 0 deletions assets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"/build/script.js": [
"/js/md5.js",
"/js/underscore-min.js",
"/js/jquery-1.10.2.min.js",
"/js/bootstrap.min.js",
"/js/jquery.highlight.js",
"/js/jquery.tablesorter.min.js",
"/js/jquery.tablesorter.pager.js",
"/js/jquery.tablesorter.widgets.min.js",
"/js/parsers/parser-file-type.js",
"/js/widgets/widget-grouping.js",
"/js/typeahead.bundle.js",
"/js/jquery.flot.js",
"/js/jquery.flot.categories.js",
"/js/jquery.flot.stack.js",
"/js/jquery.flot.pie.js",
"/js/jquery.flot.axislabels.js",
"/js/jquery.gravatar.js",
"/js/d3.min.js",
"/js/searchWidget.js",
"/js/script.js"
],
"/build/style.css": [
"/css/bootstrap.min.css",
"/css/bootstrap-theme.min.css",
"/css/font-awesome.min.css",
"/css/theme.bootstrap.css",
"/css/theme.bootstrap_2.css",
"/css/style.css"
]
}
29 changes: 29 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
var assets = require('./assets');

var _ = require('underscore');
var gulp = require('gulp');
var gutil = require('gulp-util');
var clean = require('gulp-clean');
var concat = require('gulp-concat');
var uglify = require('gulp-uglify');
var cleancss = require('gulp-minify-css');

gulp.task('clean', function () {
return gulp.src('public/build', {read: false})
.pipe(clean())
});

gulp.task('js', function() {
return gulp.src(_.map(assets['/build/script.js'], function(p) { return 'public'+p }))
.pipe(concat('script.js'))
.pipe(uglify())
.pipe(gulp.dest('public/build'))
.on('error', gutil.log)
});

gulp.task('css', function() {
return gulp.src(_.map(assets['/build/style.css'], function(p) { return 'public'+p }))
.pipe(concat('style.css'))
.pipe(cleancss())
.pipe(gulp.dest('public/build'))
});
15 changes: 13 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,20 @@
"sequelize": "^2.0.0-dev9",
"underscore": "^1.5.2",
"cookie-parser": "~1.3.2",
"body-parser": "~1.5.0"
"body-parser": "~1.5.0",
"etagify": "0.0.2",
"connect-cachify": "0.0.17"
},
"devDependencies": {
"gulp": "~3.8.7",
"gulp-changed": "~0.4.1",
"gulp-clean": "~0.3.1",
"gulp-util": "~3.0.0",
"gulp-concat": "~2.3.4",
"gulp-watch": "~0.6.9",
"gulp-uglify": "~0.3.1",
"gulp-minify-css": "~0.3.7"
},
"devDependencies": {},
"scripts": {},
"repository": {
"type": "git",
Expand Down
14 changes: 14 additions & 0 deletions public/build/script.js

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions public/build/style.css

Large diffs are not rendered by default.

Loading

0 comments on commit aae1976

Please sign in to comment.