Precommit work

This commit is contained in:
Curtis Castrapel
2018-08-22 10:38:09 -07:00
parent a21b71a0e2
commit 3e9726d9db
45 changed files with 246 additions and 207 deletions

View File

@ -240,8 +240,8 @@ gulp.task('addUrlContextPath',['addUrlContextPath:revreplace'], function(){
.pipe(gulpif(urlContextPathExists, replace('angular/', argv.urlContextPath + '/angular/')))
.pipe(gulp.dest(function(file){
return file.base;
}))
})
}));
});
});
gulp.task('addUrlContextPath:revision', function(){
@ -249,16 +249,16 @@ gulp.task('addUrlContextPath:revision', function(){
.pipe(rev())
.pipe(gulp.dest('lemur/static/dist'))
.pipe(rev.manifest())
.pipe(gulp.dest('lemur/static/dist'))
})
.pipe(gulp.dest('lemur/static/dist'));
});
gulp.task('addUrlContextPath:revreplace', ['addUrlContextPath:revision'], function(){
var manifest = gulp.src("lemur/static/dist/rev-manifest.json");
var manifest = gulp.src('lemur/static/dist/rev-manifest.json');
var urlContextPathExists = argv.urlContextPath ? true : false;
return gulp.src( "lemur/static/dist/index.html")
return gulp.src('lemur/static/dist/index.html')
.pipe(gulpif(urlContextPathExists, revReplace({prefix: argv.urlContextPath + '/', manifest: manifest}, revReplace({manifest: manifest}))))
.pipe(gulp.dest('lemur/static/dist'));
})
});
gulp.task('build', ['build:ngviews', 'build:inject', 'build:images', 'build:fonts', 'build:html', 'build:extras']);

View File

@ -1,10 +1,12 @@
'use strict';
// Contents of: config/karma.conf.js
module.exports = function (config) {
config.set({
basePath : '../',
// Fix for "JASMINE is not supported anymore" warning
frameworks : ["jasmine"],
frameworks : ['jasmine'],
files : [
'app/lib/angular/angular.js',

View File

@ -3,7 +3,7 @@
var gulp = require('gulp');
var browserSync = require('browser-sync');
var httpProxy = require('http-proxy');
require('http-proxy');
/* This configuration allow you to configure browser sync to proxy your backend */
/*