From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 17 Apr 2015 18:23:36 +0000 (+0300)
Subject: Depend on compiler.jar for JS compilation, move js into static/js/
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=f57a9178d3c6982315f7c5b5b01be79abafeffa6;p=plack-app-gruntmaster.git

Depend on compiler.jar for JS compilation, move js into static/js/
---

diff --git a/Makefile.PL b/Makefile.PL
index 6da9ecf..2bf04ac 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -10,12 +10,11 @@ WriteMakefile(
 	LICENSE           => 'AGPL_3',
 	SIGN              => 1,
 	clean             => {
-		FILES => 'static/css/ static/js.js static/js.js.gz static/js.map static/js/'
+		FILES => 'static/css/ static/js/'
 	},
 	BUILD_REQUIRES    => {
 		qw/CSS::Minifier::XS          0
 		   File::Slurp                0
-		   JavaScript::Minifier::XS   0
 		   Test::MockTime             0
 		   Test::More                 0
 		   Test::WWW::Mechanize::PSGI 0/,
diff --git a/make_static.PL b/make_static.PL
index 758efc1..44ef19e 100644
--- a/make_static.PL
+++ b/make_static.PL
@@ -3,7 +3,6 @@ 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/;
@@ -11,6 +10,7 @@ use File::Slurp qw/read_file write_file edit_file_lines/;
 
 mkdir 'static';
 mkdir 'static/css';
+mkdir 'static/js';
 
 sub gzip_file {
 	my ($file) = @_;
@@ -30,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 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;
diff --git a/tmpl/skel.en b/tmpl/skel.en
index 459d37b..b28726c 100644
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@ -6,7 +6,7 @@
 <link href="/static/css/cyborg.css" title="cyborg" rel="stylesheet" integrity="x">
 <link href="/static/css/slate.css" title="slate" rel="alternate stylesheet" integrity="x">
 <link href="/static/css/readable.css" title="readable" rel="alternate stylesheet" integrity="x">
-<script src="/static/js.js" type="text/javascript" async defer integrity="x"></script>
+<script src="/static/js/all.js" type="text/javascript" async defer integrity="x"></script>
 
 <body>
 <div class="container-fluid">