X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=make_static.PL;h=9fd5bcaf62916cb024ac8c59c07f7030a2ff1772;hb=fa8b7f99072328f6a9855cd0b300691405a09ec1;hp=44ef19e253ea28cde50b7f92d0643477f8d62f2a;hpb=f57a9178d3c6982315f7c5b5b01be79abafeffa6;p=plack-app-gruntmaster.git

diff --git a/make_static.PL b/make_static.PL
index 44ef19e..9fd5bca 100644
--- a/make_static.PL
+++ b/make_static.PL
@@ -2,11 +2,12 @@
 use v5.14;
 use warnings;
 
-use CSS::Minifier::XS qw//;
-
+use CSS::Minifier::XS qw/minify/;
 use Digest::SHA qw/sha256_base64/;
 use IO::Compress::Gzip qw/gzip/;
 use File::Slurp qw/read_file write_file edit_file_lines/;
+use File::Which;
+use List::Util qw/first/;
 
 mkdir 'static';
 mkdir 'static/css';
@@ -14,27 +15,57 @@ mkdir 'static/js';
 
 sub gzip_file {
 	my ($file) = @_;
-	gzip $file => "$file.gz", -Level => 9, Minimal => 1;
+	my $zopfli = which 'zopfli';
+	system $zopfli => $file if $zopfli;
+	gzip $file => "$file.gz", -Level => 9, Minimal => 1 unless $zopfli;
+}
+
+sub write_gzfile {
+	my ($file, @content) = @_;
+	write_file $file, @content;
+	gzip_file $file
+}
+
+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;
-		gzip_file "static/css/$theme.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};
+		}
+	}
+
+	write_gzfile "static/css/$_.css", minify $css{$_} for keys %css
 }
 
 sub make_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 ECMASCRIPT5_STRICT --source_map_location_mapping js/|/static/js/,, <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;
+	write_gzfile 'static/js/all.js', '//# sourceMappingURL=/static/js/js.map', "\n", $js;
 	system 'cp', '-rp', 'js', 'static/';
-	gzip_file 'static/js/all.js';
 }
 
 my $css_mtime = -M 'static/css/slate.css' // 0;
@@ -45,7 +76,7 @@ for (<css/*>, <css/themes/*>) {
 	}
 }
 
-my $js_mtime = -M 'static/js.js' // 0;
+my $js_mtime = -M 'static/js/all.js' // 0;
 for (<js/*>) {
 	if (!$js_mtime || $js_mtime > -M) {
 		make_js;