Merge branch 'master' into newmc

[gruntmaster-page.git] / make_static.PL

diff --git a/make_static.PL b/make_static.PL
index f0fa945418269bdce4db180fadcefdd5f91bd877..23c5643d91ddeb063d4b0236890fd38856af593a 100644 (file)
--- a/make_static.PL
+++ b/make_static.PL
@@ -2,14 +2,16 @@
 use v5.14;
 use warnings;
 
-use CSS::Minifier::XS qw//;
+use CSS::Minifier::XS qw/minify/;
 use CSS::SpriteMaker;
-use JavaScript::Minifier::XS qw//;
-
-use File::Slurp qw/read_file write_file/;
+use Digest::SHA qw/sha256_base64/;
+use IO::Compress::Gzip qw/gzip/;
+use File::Slurp qw/read_file write_file edit_file_lines/;
+use List::Util qw/first/;
 
 mkdir 'static';
 mkdir 'static/css';
+mkdir 'static/js';
 
 sub make_sprite {
        my $maker = Local::CSS::SpriteMaker->new(
@@ -28,7 +30,7 @@ sub make_sprite {
 
        $maker->print_css(
                filename        => 'css/logos.css',
-               sprite_filename => 'https://static.mindcoding.ro/static/logos.png',
+               sprite_filename => '/static/logos.png',
        );
 
        system 'pngnq-s9', '-s1', 'static/logos.png';
@@ -36,27 +38,62 @@ sub make_sprite {
        rename 'static/logos-nq8.png', 'static/logos.png';
 }
 
+sub gzip_file {
+       my ($file) = @_;
+       gzip $file => "$file.gz", -Level => 9, Minimal => 1;
+}
+
+sub read_css_into_blocks {
+       my ($file) = @_;
+       my (@blocks, $block);
+       for (read_file $file) {
+               $block .= $_;
+               if (/^}/) {
+                       push @blocks, $block;
+                       $block = '';
+               }
+       }
+       \@blocks
+}
+
 sub make_css {
-       my $common_css;
-       $common_css .= read_file $_ for <css/*.css>;
+       my %css;
+       $css{common} .= read_file $_ for <css/*.css>;
+
+       my (%themes, $rndtheme);
        for (<css/themes/*>) {
-               my ($theme) = m,themes/(.*)\.css,;
-               my $css = read_file $_;
-               $css .= $common_css;
-               write_file "static/css/$theme.css", CSS::Minifier::XS::minify $css;
+               ($rndtheme) = m,themes/(.*)\.css,;
+               $themes{$rndtheme} = read_css_into_blocks $_;
+       }
+
+       while (grep { scalar @$_ } values %themes) {
+               my %blocks = map { $_ => (shift @{$themes{$_}}) // '' } keys %themes;
+               if (grep { $_ ne $blocks{$rndtheme} } values %blocks) {
+                       $css{$_} .= $blocks{$_} for keys %themes;
+               } else {
+                       $css{common} .= $blocks{$rndtheme};
+               }
+       }
+
+       for my $name (keys %css) {
+               write_file "static/css/$name.css", minify $css{$name};
+               gzip_file "static/css/$name.css"
        }
 }
 
 sub make_js {
-       if (-f 'compiler.jar') {
-               system java => -jar => 'compiler.jar', qw,-O SIMPLE --create_source_map static/js.map --js_output_file static/js.js --language_in ECMASCRIPT5_STRICT --source_map_location_mapping js/|/static/js/,, <js/*>;
-               my $js = read_file 'static/js.js';
-               write_file 'static/js.js', '//# sourceMappingURL=/static/js.map', "\n", $js;
-               system 'cp', '-rp', 'js', 'static/';
-       } else {
-               my $js;
-               $js .= read_file $_ for <js/*.js>;
-               write_file 'static/js.js', JavaScript::Minifier::XS::minify $js;
+       system java => -jar => 'compiler.jar', qw,-O SIMPLE --create_source_map static/js/js.map --js_output_file static/js/all.js --language_in ECMASCRIPT6_STRICT --language_out ECMASCRIPT5_STRICT --source_map_location_mapping js/|/static/js/,, <js/*>;
+       my $js = read_file 'static/js/all.js';
+       write_file 'static/js/all.js', '//# sourceMappingURL=/static/js/js.map', "\n", $js;
+       system 'cp', '-rp', 'js', 'static/';
+       gzip_file 'static/js/all.js';
+}
+
+my $sprite_mtime = -M 'static/logos.png' // 0;
+for (<logos/*>) {
+       if (!$sprite_mtime || $sprite_mtime > -M) {
+               make_sprite;
+               last
        }
 }
 
@@ -76,13 +113,12 @@ for (<js/*>) {
        }
 }
 
-my $sprite_mtime = -M 'static/logos.png' // 0;
-for (<logos/*>) {
-       if (!$sprite_mtime || $sprite_mtime > -M) {
-               make_sprite;
-               last
-       }
-}
+edit_file_lines {
+       my ($file) = m,(static.*\.(?:css|js)),;
+       return unless $file;
+       my $hash = sha256_base64 scalar read_file $file;
+       s/integrity=".*"/integrity="sha256-$hash="/;
+} 'tmpl/skel.en';
 
 package
   Local::CSS::SpriteMaker;
@@ -96,7 +132,7 @@ sub _get_stylesheet_string {
        @ret = sort @ret;
        unshift @ret, <<EOF;
 a.logo {
-       background-image: url("https://static.mindcoding.ro/static/logos.png");
+       background-image: url("/static/logos.png");
        background-repeat: no-repeat;
        display: inline-block;
        vertical-align: middle;