KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Gulp fixes

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-07-06 00:53:18 +02:00
parent 9a66bc85ef
commit 3ca6dea8e1
6 changed files with 567 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -5,6 +5,7 @@ server/config/mongo_config.js
server/config/cert_config.js server/config/cert_config.js
server/config/recaptcha.js server/config/recaptcha.js
server/config/analytics.js server/config/analytics.js
server/public/assets/dist/maps/
server/public/assets/dist/callback.min.js server/public/assets/dist/callback.min.js
server/public/assets/dist/token.min.js server/public/assets/dist/token.min.js
server/public/assets/dist/embed.min.js server/public/assets/dist/embed.min.js

30
gulpfile.js
View File

@@ -1,64 +1,76 @@
var gulp = require('gulp'), var gulp = require('gulp'),
gutil = require('gulp-util'), gutil = require('gulp-util'),
uglify = require('gulp-uglifyjs'), uglify = require('gulp-uglify'),
sourcemaps = require('gulp-sourcemaps'),
concat = require('gulp-concat'); concat = require('gulp-concat');
gulp.task('js', function () { gulp.task('js', function () {
gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/*.js', '!server/public/assets/js/embed*', '!server/public/assets/js/token*', '!server/public/assets/js/remotecontroller.js', '!server/public/assets/js/callback.js']) return gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/*.js', '!server/public/assets/js/embed*', '!server/public/assets/js/token*', '!server/public/assets/js/remotecontroller.js', '!server/public/assets/js/callback.js'])
.pipe(sourcemaps.init())
.pipe(concat('main.min.js'))
.pipe(uglify({ .pipe(uglify({
mangle: true, mangle: true,
compress: true, compress: true,
enclose: true enclose: true,
})) }))
.pipe(concat('main.min.js'))
.pipe(sourcemaps.write('maps'))
.pipe(gulp.dest('server/public/assets/dist')); .pipe(gulp.dest('server/public/assets/dist'));
}); });
gulp.task('embed', function () { gulp.task('embed', function () {
gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/player.js', 'server/public/assets/js/helpers.js', 'server/public/assets/js/playercontrols.js', 'server/public/assets/js/list.js', 'server/public/assets/js/embed.js', '!server/public/assets/js/frontpage*', '!server/public/assets/js/remotecontroller.js', 'server/public/assets/js/hostcontroller.js']) return gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/player.js', 'server/public/assets/js/helpers.js', 'server/public/assets/js/playercontrols.js', 'server/public/assets/js/list.js', 'server/public/assets/js/embed.js', '!server/public/assets/js/frontpage*', '!server/public/assets/js/remotecontroller.js', 'server/public/assets/js/hostcontroller.js'])
.pipe(sourcemaps.init())
.pipe(uglify({ .pipe(uglify({
mangle: true, mangle: true,
compress: true, compress: true,
enclose: true enclose: true
})) }))
.pipe(concat('embed.min.js')) .pipe(concat('embed.min.js'))
.pipe(sourcemaps.write('maps'))
.pipe(gulp.dest('server/public/assets/dist')); .pipe(gulp.dest('server/public/assets/dist'));
}); });
gulp.task('token', function() { gulp.task('token', function() {
gulp.src(['server/public/assets/js/token*', 'server/public/assets/js/helpers.js']) return gulp.src(['server/public/assets/js/token*', 'server/public/assets/js/helpers.js'])
.pipe(sourcemaps.init())
.pipe(uglify({ .pipe(uglify({
mangle: true, mangle: true,
compress: true, compress: true,
enclose: true enclose: true
})) }))
.pipe(concat('token.min.js')) .pipe(concat('token.min.js'))
.pipe(sourcemaps.write('maps'))
.pipe(gulp.dest('server/public/assets/dist')); .pipe(gulp.dest('server/public/assets/dist'));
}) })
gulp.task('callback', function () { gulp.task('callback', function () {
gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/callback.js']) return gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/callback.js'])
.pipe(sourcemaps.init())
.pipe(uglify({ .pipe(uglify({
mangle: true, mangle: true,
compress: true, compress: true,
enclose: true enclose: true
})) }))
.pipe(concat('callback.min.js')) .pipe(concat('callback.min.js'))
.pipe(sourcemaps.write('maps'))
.pipe(gulp.dest('server/public/assets/dist')); .pipe(gulp.dest('server/public/assets/dist'));
}); });
gulp.task('build', function() { gulp.task('build', function() {
gulp.run(['js', 'embed', 'remotecontroller', 'callback', 'token']); return gulp.run(['js', 'embed', 'remotecontroller', 'callback', 'token']);
}) })
gulp.task('remotecontroller', function () { gulp.task('remotecontroller', function () {
gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/remotecontroller.js', 'server/public/assets/js/helpers.js']) return gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/remotecontroller.js', 'server/public/assets/js/helpers.js'])
.pipe(sourcemaps.init())
.pipe(uglify({ .pipe(uglify({
mangle: true, mangle: true,
compress: true, compress: true,
enclose: true enclose: true
})) }))
.pipe(concat('remote.min.js')) .pipe(concat('remote.min.js'))
.pipe(sourcemaps.write('maps'))
.pipe(gulp.dest('server/public/assets/dist')); .pipe(gulp.dest('server/public/assets/dist'));
}); });

715
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

9
package.json
View File

@@ -20,10 +20,10 @@
"url": "https://github.com/zoff-music/zoff/issues" "url": "https://github.com/zoff-music/zoff/issues"
}, },
"devDependencies": { "devDependencies": {
"gulp-util": "~3.0.6",
"gulp": "~3.9.0", "gulp": "~3.9.0",
"gulp-concat": "~2.6.0", "gulp-concat": "^2.6.1",
"gulp-uglifyjs": "~0.6.2" "gulp-uglifyjs": "~0.6.2",
"gulp-util": "~3.0.6"
}, },
"homepage": "https://github.com/zoff-music/zoff#readme", "homepage": "https://github.com/zoff-music/zoff#readme",
"dependencies": { "dependencies": {
@@ -40,7 +40,8 @@
"express-sessions": "^1.0.6", "express-sessions": "^1.0.6",
"farmhash": "^2.1.0", "farmhash": "^2.1.0",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-concat": "^2.6.1", "gulp-sourcemaps": "^2.6.4",
"gulp-uglify": "^3.0.0",
"gulp-uglifyjs": "^0.6.2", "gulp-uglifyjs": "^0.6.2",
"gulp-util": "^3.0.8", "gulp-util": "^3.0.8",
"helmet": "^3.12.0", "helmet": "^3.12.0",

2
server/public/assets/js/frontpage.js
View File

@@ -336,7 +336,7 @@ var Frontpage = {
Helper.tooltip(document.querySelectorAll(".pin")[0].parentElement.parentElement.parentElement, "destroy"); Helper.tooltip(document.querySelectorAll(".pin")[0].parentElement.parentElement.parentElement, "destroy");
} }
} }
currently_showing_channels = 1; currently_showing_channels = 1;
clearTimeout(retry_frontpage); clearTimeout(retry_frontpage);
Helper.ajax({ Helper.ajax({

2
server/public/assets/js/helpers.js
View File

@@ -8,7 +8,7 @@ var Helper = {
toReturn = toReturn.toLowerCase().replace(/&/g, "&"); toReturn = toReturn.toLowerCase().replace(/&/g, "&");
return toReturn.toLowerCase(); return toReturn.toLowerCase();
}, },
encodeChannelName: function(str) { encodeChannelName: function(str) {
var _fn = encodeURIComponent; var _fn = encodeURIComponent;
var toReturn = _fn(str); var toReturn = _fn(str);