Infra/lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into ci

Browse Source 
* master:
  Fixed issue where hardcoded localhost:port combination existed in Javascript, added another step to setup.py 'package' that removes such instances and creates a more agnostic javascript blob.
  Fixing issue where nginx was not sending the right mimetype for CSS files.

Conflicts:
	gulp/build.js
This commit is contained in:
kevgliss
2015-07-20 16:53:58 -07:00
parent c89dff7994 b978435975
commit 9c0f2917ad
9 changed files with 90 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gulp/build.js
View File

@ -27,8 +27,7 @@ var gulp = require('gulp'),
minifyHtml = require('gulp-minify-html'),
bowerFiles = require('main-bower-files'),
karma = require('karma'),
replace = require('gulp-replace-task');
replace = require('gulp-replace');
gulp.task('default', ['clean'], function () {
gulp.start('fonts', 'styles');
@ -237,5 +236,15 @@ gulp.task('build:images', function () {
.pipe(size());
});
gulp.task('package:strip', function () {
return gulp.src(['lemur/static/dist/scripts/main*'])
.pipe(replace('http:\/\/localhost:5000', ''))
.pipe(replace('http:\/\/localhost:3000', ''))
.pipe(useref())
.pipe(revReplace())
.pipe(gulp.dest('lemur/static/dist/scripts'))
.pipe(size());
});
gulp.task('build', ['build:ngviews', 'build:inject', 'build:images', 'build:fonts', 'build:html', 'build:extras']);
gulp.task('package', ['package:strip']);