From e9558c6fcbcebd2d602a33e3ca2cee94453dcbf0 Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Sat, 9 Feb 2019 09:42:51 +0700 Subject: [PATCH] build CSS for prod --- ui/build | 10 ++++++++++ ui/gulp/cssProject.js | 14 +++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ui/build b/ui/build index db0dd6be72..446ad8986b 100755 --- a/ui/build +++ b/ui/build @@ -14,6 +14,7 @@ mkdir -p public/compiled ts_apps1="common chess" ts_apps2="ceval game tree chat nvui" apps="site chat cli challenge notify learn insight editor puzzle round analyse lobby tournament tournamentSchedule tournamentCalendar simul perfStat dasher" +css_apps="site" if [ $mode == "upgrade" ]; then yarn upgrade --non-interactive @@ -35,6 +36,13 @@ build() { gulp $target } +build_css() { + echo "build_css" "$@" + set -ev + cd ui/$1 + gulp "css-$target" +} + if type -p parallel; then # parallel execution! if [ -z "$P_OPTS" -a ! -e ~/.parallel/config ]; then P_OPTS="-j+4 --halt 2" @@ -44,8 +52,10 @@ if type -p parallel; then # parallel execution! parallel --gnu $P_OPTS build_ts ::: $ts_apps1 parallel --gnu $P_OPTS build_ts ::: $ts_apps2 parallel --gnu $P_OPTS build ::: $apps + parallel --gnu $P_OPTS build_css ::: $css_apps else # sequential execution echo "For faster builds, install GNU parallel." for app in $ts_apps1 $ts_apps2; do (build_ts $app); done for app in $apps; do (build $app); done + for app in $css_apps; do (build_css $app); done fi diff --git a/ui/gulp/cssProject.js b/ui/gulp/cssProject.js index 9c1494925d..1de84a94ac 100644 --- a/ui/gulp/cssProject.js +++ b/ui/gulp/cssProject.js @@ -24,7 +24,6 @@ module.exports = (name, dir) => { const sourcesGlob = sourceDir + '/**/*.scss'; const buildsGlob = sourceDir + '/build/*.scss'; const commonGlob = '../common/css/**/*.scss'; - console.log(commonGlob); createThemedBuilds(buildDir); @@ -45,6 +44,19 @@ module.exports = (name, dir) => { gulp.watch(commonGlob, build); } ])); + + gulp.task('css-dev', build); + + gulp.task('css-prod', () => gulp + .src(buildsGlob) + .pipe(sass({ + ...sassOptions, + ...{ outputStyle: 'compressed' } + }).on('error', sass.logError)) + .pipe(autoprefixer(autoprefixerOptions)) + .pipe(renameAs('min')) + .pipe(destination()) + ); } function renameAs(ext) {