Skip to content

Commit

Permalink
Remove duplicate bootstrap from css, make templates.js deterministic
Browse files Browse the repository at this point in the history
  • Loading branch information
theotherp committed May 28, 2024
1 parent ff6c613 commit 982b16c
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 24 deletions.
18 changes: 16 additions & 2 deletions core/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,22 @@ gulp.task('vendor-scripts', function () {
gulp.task('vendor-css', function () {
var dest = staticFolder + '/css';
return merge(
gulp.src(wiredep().css)
gulp.src(wiredep({
exclude: [
"bower_components/bootstrap/",
"bower_components/bootstrap-switch/"
]
}).css)
.pipe(sort())
.pipe(cached("vendor-css")),
gulp.src(wiredep().less)
gulp.src(wiredep(
{
exclude: [
"bower_components/bootstrap/",
"bower_components/bootstrap-switch/"
]
}
).less)
.pipe(sort())
.pipe(cached("vendor-less"))
.pipe(less())
Expand All @@ -76,6 +88,7 @@ gulp.task('vendor-css', function () {
gulp.task('templates', function () {
return gulp.src(uiSrcFolder + '/html/**/*.html')
//.pipe(cached("templates")) //Doesn't work properly, will only contain last updated file
.pipe(sort())
.pipe(angularTemplateCache("templates.js", {root: "static/html/"}))
.pipe(concat('templates.js'))
.pipe(gulp.dest(staticFolder + '/js'));
Expand Down Expand Up @@ -207,6 +220,7 @@ gulp.task('default', function () {
liveReloadActive = true;
log("Will watch '" + uiSrcFolder + "'");
log("Will build files into folder '" + staticFolder + "'");
runSequence(["index"]);
gulp.watch([uiSrcFolder + '/less/nzbhydra.less'], ['delMainLessCache']);
gulp.watch([uiSrcFolder + '/**/*'], ['index']);
});
6 changes: 1 addition & 5 deletions core/src/main/resources/static/css/alllibs.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/src/main/resources/static/css/alllibs.css.map

Large diffs are not rendered by default.

Loading

0 comments on commit 982b16c

Please sign in to comment.