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

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.
This commit is contained in:
kevgliss 2015-07-19 19:04:42 -07:00
parent 8e0e22d49d
commit 5ce3f9427b
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gulp/build.js
View File

@ -26,7 +26,7 @@ var gulp = require('gulp'),
imagemin = require('gulp-imagemin'), imagemin = require('gulp-imagemin'),
minifyHtml = require('gulp-minify-html'), minifyHtml = require('gulp-minify-html'),
bowerFiles = require('main-bower-files'), bowerFiles = require('main-bower-files'),
replace = require('gulp-replace-task'); replace = require('gulp-replace');
gulp.task('default', ['clean'], function () { gulp.task('default', ['clean'], function () {
@ -227,5 +227,15 @@ gulp.task('build:images', function () {
.pipe(size()); .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('build', ['build:ngviews', 'build:inject', 'build:images', 'build:fonts', 'build:html', 'build:extras']);
gulp.task('package', ['package:strip']);

2
lemur/static/app/angular/app.js vendored
View File

@ -62,7 +62,7 @@ lemur.controller('datePickerController', function ($scope, $timeout){
lemur.factory('LemurRestangular', function (Restangular, $location, $auth) { lemur.factory('LemurRestangular', function (Restangular, $location, $auth) {
return Restangular.withConfig(function (RestangularConfigurer) { return Restangular.withConfig(function (RestangularConfigurer) {
RestangularConfigurer.setBaseUrl('http://127.0.0.1:5000/api/1'); RestangularConfigurer.setBaseUrl('http://localhost:5000/api/1');
RestangularConfigurer.setDefaultHttpFields({withCredentials: true}); RestangularConfigurer.setDefaultHttpFields({withCredentials: true});
RestangularConfigurer.addResponseInterceptor(function (data, operation, what, url, response, deferred) { RestangularConfigurer.addResponseInterceptor(function (data, operation, what, url, response, deferred) {

2
package.json
View File

@ -37,7 +37,7 @@
"gulp-plumber": "^0.6.4", "gulp-plumber": "^0.6.4",
"gulp-print": "^1.1.0", "gulp-print": "^1.1.0",
"gulp-protractor": "0.0.11", "gulp-protractor": "0.0.11",
"gulp-replace": "~0.4.0", "gulp-replace": "~0.5.3",
"gulp-replace-task": "~0.1.0", "gulp-replace-task": "~0.1.0",
"gulp-rev": "^1.0.0", "gulp-rev": "^1.0.0",
"gulp-rev-replace": "^0.3.0", "gulp-rev-replace": "^0.3.0",

2
setup.py
View File

@ -81,6 +81,8 @@ class BuildStatic(Command):
log.info("running [gulp buld]") log.info("running [gulp buld]")
check_output([os.path.join(ROOT, 'node_modules', '.bin', 'gulp'), 'build'], cwd=ROOT) check_output([os.path.join(ROOT, 'node_modules', '.bin', 'gulp'), 'build'], cwd=ROOT)
log.info("running [gulp package]")
check_output([os.path.join(ROOT, 'node_modules', '.bin', 'gulp'), 'package'], cwd=ROOT)
setup( setup(
name='lemur', name='lemur',