X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=make_static.PL;h=0d8d10b873a5dee5f6db1ae50cb885fe9829fb3b;hb=bbacb12cf514480d7a34b3c39fdebc7ffb5a7315;hp=10532b9a8dbd502663ba66c505f36b92534d592c;hpb=3c9bcb475efecdd49e86f09a4cf9da4985031b55;p=plack-app-gruntmaster.git

diff --git a/make_static.PL b/make_static.PL
index 10532b9..0d8d10b 100644
--- a/make_static.PL
+++ b/make_static.PL
@@ -3,13 +3,14 @@ use v5.14;
 use warnings;
 
 use CSS::Minifier::XS qw//;
-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 gzip_file {
 	my ($file) = @_;
@@ -29,17 +30,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 $css_mtime = -M 'static/css/slate.css' // 0;
@@ -57,3 +52,10 @@ for (<js/*>) {
 		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'