Merge branch 'master' into newmc

[gruntmaster-page.git] / make_static.PL

diff --git a/make_static.PL b/make_static.PL
index 758efc1f39349e85975563488c3ba2a9ecf90dd6..44f56fa6012f89f1d0093eb3ab101e0781b5613e 100644 (file)
--- a/make_static.PL
+++ b/make_static.PL
@@ -3,7 +3,7 @@ use v5.14;
 use warnings;
 
 use CSS::Minifier::XS qw//;
-use JavaScript::Minifier::XS qw//;
+use CSS::SpriteMaker;
 
 use Digest::SHA qw/sha256_base64/;
 use IO::Compress::Gzip qw/gzip/;
@@ -11,6 +11,32 @@ use File::Slurp qw/read_file write_file edit_file_lines/;
 
 mkdir 'static';
 mkdir 'static/css';
+mkdir 'static/js';
+
+sub make_sprite {
+       my $maker = Local::CSS::SpriteMaker->new(
+               css_class_prefix => 'logo-',
+               rc_override_classname => sub {
+                       my ($name) = @_;
+                       $name =~ s/-light/.logo-light/r;
+               }
+       );
+
+       $maker->make_sprite(
+               source_images     => ['logos/'],
+               target_file       => 'static/logos.png',
+               add_extra_padding => 10,
+       );
+
+       $maker->print_css(
+               filename        => 'css/logos.css',
+               sprite_filename => '/static/logos.png',
+       );
+
+       system 'pngnq-s9', '-s1', 'static/logos.png';
+       system 'optipng', '-o7', '-zm1-9', 'static/logos-nq8.png';
+       rename 'static/logos-nq8.png', 'static/logos.png';
+}
 
 sub gzip_file {
        my ($file) = @_;
@@ -30,17 +56,19 @@ sub make_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
        }
-       gzip_file 'static/js.js';
 }
 
 my $css_mtime = -M 'static/css/slate.css' // 0;
@@ -64,4 +92,25 @@ edit_file_lines {
        return unless $file;
        my $hash = sha256_base64 scalar read_file $file;
        s/integrity=".*"/integrity="sha256-$hash="/;
-} 'tmpl/skel.en'
+} 'tmpl/skel.en';
+
+package
+  Local::CSS::SpriteMaker;
+
+use parent qw/CSS::SpriteMaker/;
+
+sub _get_stylesheet_string {
+       my $self = shift;
+       my @ret = split "\n", $self->SUPER::_get_stylesheet_string(@_);
+       shift @ret;
+       @ret = sort @ret;
+       unshift @ret, <<EOF;
+a.logo {
+       background-image: url("/static/logos.png");
+       background-repeat: no-repeat;
+       display: inline-block;
+       vertical-align: middle;
+}
+EOF
+       join "\n", @ret;
+}