Merge branch 'master' into newmc

[gruntmaster-page.git] / make_static.PL

diff --git a/make_static.PL b/make_static.PL
index 4857bf0ccd37e2a367a75d1b037070df167023fa..44f56fa6012f89f1d0093eb3ab101e0781b5613e 100644 (file)
--- a/make_static.PL
+++ b/make_static.PL
@@ -4,13 +4,14 @@ use warnings;
 
 use CSS::Minifier::XS qw//;
 use CSS::SpriteMaker;
-use JavaScript::Minifier::XS qw//;
 
+use Digest::SHA qw/sha256_base64/;
 use IO::Compress::Gzip qw/gzip/;
-use File::Slurp qw/read_file write_file/;
+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(
@@ -55,17 +56,11 @@ 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;
-       }
-       gzip_file '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;
+       system 'cp', '-rp', 'js', 'static/';
+       gzip_file 'static/js/all.js';
 }
 
 my $sprite_mtime = -M 'static/logos.png' // 0;
@@ -92,6 +87,13 @@ for (<js/*>) {
        }
 }
 
+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;