Javascript Bundles

Makefile.am

@@ -18,7 +18,7 @@ TESTS =
 dist_systemdunit_DATA   =
 nodist_systemdunit_DATA =
 
-SUFFIXES = .js .min.js .min.js.gz .css .html .min.html .woff .woff.gz .1 .8 .5
+SUFFIXES = .js .js.gz .min.js .min.js.gz .css .html .min.html .woff .woff.gz .1 .8 .5
 
 V_CHECK = $(V_CHECK_$(V))
 V_CHECK_ = $(V_CHECK_$(AM_DEFAULT_VERBOSITY))
@@ -38,6 +38,9 @@ V_GZIP_0 = @echo "  GZIP    " $@;
 	$(V_CHECK) $(srcdir)/tools/missing $(srcdir)/tools/jshint --extract=always $<
 	$(AM_V_GEN) $(srcdir)/tools/missing $(srcdir)/tools/html-minifier --output $@ $<
 
+.js.js.gz:
+	@$(MKDIR_P) $(dir $@)
+	$(V_GZIP) gzip -c $< > $@.tmp && mv $@.tmp $@
 .min.js.min.js.gz:
 	@$(MKDIR_P) $(dir $@)
 	$(V_GZIP) gzip -c $< > $@.tmp && mv $@.tmp $@
@@ -167,7 +170,7 @@ include doc/man/Makefile-man.am
 
 nodist_noinst_DATA += guide/index.html
 
-install-data-local: guide/index.html
+install-doc-local: guide/index.html
 	$(MKDIR_P) $(DESTDIR)$(htmldir)
 	$(INSTALL_DATA) `dirname $<`/* $(DESTDIR)$(htmldir)
 
@@ -182,6 +185,8 @@ dist-doc-hook:
 
 else
 
+install-doc-local:
+	@true
 uninstall-doc-local:
 	@true
 dist-doc-hook:
@@ -191,6 +196,9 @@ upload-doc:
 
 endif
 
+install-data-local:: install-doc-local
+	@true
+
 dist-hook: dist-doc-hook
 	ln -s systemd $(distdir)/pkg/system
 

configure.ac

@@ -36,6 +36,7 @@ AC_PROG_CC_C99
 AC_PROG_RANLIB
 AC_ISC_POSIX
 AC_HEADER_STDC
+AC_PROG_LN_S
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 

pkg/base1/Makefile.am

@@ -7,25 +7,46 @@ base_GEN = \
 base_DATA = \
 	pkg/base1/cockpit.css \
 	pkg/base1/patternfly.css \
-	pkg/base1/term.js \
 	pkg/base1/manifest.json \
-	pkg/base1/po.js \
+	pkg/base1/po.js.gz \
 	pkg/base1/require.min.js.gz \
+	pkg/base1/term.min.js.gz \
 	pkg/base1/mustache.min.js.gz \
 	pkg/base1/jquery.min.js.gz \
 	pkg/base1/cockpit.min.js.gz \
+	pkg/base1/bundle.min.js.gz \
 	$(BRAND)/branding.css \
-	$(base_GEN) \
+	$(base_GEN:.js=.js.gz) \
 	$(NULL)
 
 basedebugdir = $(DBGDIR)$(basedir)
 basedebug_DATA = \
+	pkg/base1/po.js \
 	pkg/base1/require.js \
+	pkg/base1/term.js \
 	pkg/base1/mustache.js \
 	pkg/base1/jquery.js \
 	pkg/base1/cockpit.js \
+	$(base_GEN) \
 	$(NULL)
 
+base_BUNDLE = \
+	pkg/base1/require.min.js \
+	pkg/base1/cockpit.min.js \
+	pkg/base1/jquery.min.js \
+	pkg/base1/mustache.min.js \
+	$(NULL)
+
+pkg/base1/bundle.min.js: $(base_BUNDLE)
+	$(AM_V_GEN) $(srcdir)/tools/missing $(srcdir)/tools/jsbundle $@ $^
+pkg/base1/term.min.js: pkg/base1/term.js
+	@$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN) $(srcdir)/tools/missing $(srcdir)/tools/uglifyjs $< --mangle > $@.tmp && mv $@.tmp $@
+
+install-data-local::
+	$(MKDIR_P) $(DESTDIR)$(basedebugdir)
+	$(LN_S) -f require.js $(DESTDIR)$(basedebugdir)/bundle.js
+
 baseimagesdir = $(pkgdatadir)/base1/images
 baseimages_DATA = \
 	pkg/base1/images/play.png \
@@ -71,14 +92,19 @@ base_TESTS = \
 TESTS += $(base_TESTS)
 
 CLEANFILES += \
-	pkg/base1/cockpit.min.js \
+	pkg/base1/bundle.min.js \
+	pkg/base1/term.min.js \
+	$(base_BUNDLE) \
 	$(base_GEN) \
 	$(NULL)
 
 EXTRA_DIST += \
+	pkg/base1/bundle.min.js \
 	pkg/base1/jquery.min.js \
 	pkg/base1/require.min.js \
 	pkg/base1/mustache.min.js \
+	pkg/base1/term.min.js \
+	$(base_BUNDLE) \
 	$(base_DATA) \
 	$(basedebug_DATA) \
 	$(baseimages_DATA) \
@@ -92,32 +118,32 @@ FONTS_LN = cd $(srcdir)/pkg/base1/fonts; ln -sf
 VX = v*[0-9]
 
 update-lib::
-	$(srcdir)/tools/jsmerge -o $(srcdir)/pkg/base1/jquery.js \
+	$(srcdir)/tools/jsbundle $(srcdir)/pkg/base1/jquery.js \
 	    $(srcdir)/lib/jquery.$(VX).js \
 	    $(srcdir)/lib/bootstrap.$(VX).js \
 	    $(srcdir)/lib/bootstrap-select.$(VX).js \
 	    $(srcdir)/lib/bootstrap-datepicker.$(VX).js \
 	    $(srcdir)/lib/jquery-flot.$(VX).js \
 	    $(srcdir)/lib/attrchange.js
-	$(srcdir)/tools/jsmerge -o $(srcdir)/pkg/base1/jquery.min.js \
+	$(srcdir)/tools/jsbundle $(srcdir)/pkg/base1/jquery.min.js \
 	    $(srcdir)/lib/jquery.$(VX).min.js \
 	    $(srcdir)/lib/bootstrap.$(VX).min.js \
 	    $(srcdir)/lib/bootstrap-select.$(VX).min.js \
 	    $(srcdir)/lib/bootstrap-datepicker.$(VX).min.js \
 	    $(srcdir)/lib/jquery-flot.$(VX).min.js \
 	    $(srcdir)/lib/attrchange.min.js
-	$(srcdir)/tools/jsmerge -o $(srcdir)/pkg/base1/require.js \
+	$(srcdir)/tools/jsbundle $(srcdir)/pkg/base1/require.js \
 	    $(srcdir)/lib/requirejs.$(VX).js \
 	    $(srcdir)/pkg/base1/require-config.js \
 	    $(srcdir)/pkg/base1/require-loaders.js
-	$(srcdir)/tools/jsmerge -o $(srcdir)/pkg/base1/require.min.js \
+	$(srcdir)/tools/jsbundle $(srcdir)/pkg/base1/require.min.js \
 	    $(srcdir)/lib/requirejs.$(VX).min.js \
 	    $(srcdir)/pkg/base1/require-config.js \
 	    $(srcdir)/pkg/base1/require-loaders.js
-	$(srcdir)/tools/jsmerge -o $(srcdir)/pkg/base1/patternfly.css \
+	$(srcdir)/tools/cssbundle $(srcdir)/pkg/base1/patternfly.css \
 	    $(srcdir)/lib/patternfly.$(VX).css \
 	    $(srcdir)/lib/bootstrap-datepicker.$(VX).css
-	$(srcdir)/tools/jsmerge -o $(srcdir)/pkg/base/patternfly.min.css \
+	$(srcdir)/tools/cssbundle $(srcdir)/pkg/base1/patternfly.min.css \
 	    $(srcdir)/lib/patternfly.$(VX).min.css \
 	    $(srcdir)/lib/bootstrap-datepicker.$(VX).min.css
 	$(BASE_LN) ../../lib/mustache.$(VX).js mustache.js

pkg/base1/bundle.js

@@ -0,0 +1 @@
+require.js

pkg/docker/console.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="../legacy/cockpit.css" type="text/css" rel="stylesheet">
-    <script src="../base1/require.js"></script>
+    <script src="../base1/bundle.js"></script>
 <script>
 require([
     "jquery",

pkg/kubernetes/Makefile.am

@@ -1,33 +1,46 @@
 
 kubernetesdir = $(pkgdatadir)/kubernetes
 kubernetes_DATA = \
-	pkg/kubernetes/angular.min.js.gz \
-	pkg/kubernetes/client.min.js.gz \
+	pkg/kubernetes/kubernetes.min.js.gz \
 	pkg/kubernetes/manifest.json \
 	pkg/kubernetes/tool.html \
 	pkg/kubernetes/cluster.html \
 	pkg/kubernetes/app.css \
-	pkg/kubernetes/app.js \
-	pkg/kubernetes/dashboard.js \
 	$(NULL)
 
 kubernetesdebugdir = $(DBGDIR)$(kubernetesdir)
 kubernetesdebug_DATA = \
 	pkg/kubernetes/angular.js \
+	pkg/kubernetes/app.js \
 	pkg/kubernetes/client.js \
+	pkg/kubernetes/dashboard.js \
+	pkg/kubernetes/kubernetes.js \
+	$(NULL)
+
+kubernetes_BUNDLE = \
+	pkg/kubernetes/angular.min.js \
+	pkg/kubernetes/app.min.js \
+	pkg/kubernetes/client.min.js \
+	pkg/kubernetes/dashboard.min.js \
 	$(NULL)
 
+pkg/kubernetes/kubernetes.min.js: $(kubernetes_BUNDLE)
+	$(AM_V_GEN) $(srcdir)/tools/missing $(srcdir)/tools/jsbundle $@ $^
+
 kubernetes_TESTS = \
 	pkg/kubernetes/test-kubernetes.html \
 	$(NULL)
 
 TESTS += $(kubernetes_TESTS)
 
 CLEANFILES += \
-	pkg/kubernetes/client.min.js \
+	pkg/kubernetes/kubernetes.min.js \
+	$(kubernetes_BUNDLE) \
 	$(NULL)
 
 EXTRA_DIST += \
+	pkg/kubernetes/kubernetes.min.js \
+	$(kubernetes_BUNDLE) \
 	$(kubernetes_DATA) \
 	$(kubernetesdebug_DATA) \
 	$(kubernetes_TESTS) \
@@ -38,11 +51,11 @@ EXTRA_DIST += \
 	$(NULL)
 
 update-lib::
-	$(srcdir)/tools/jsmerge -o $(srcdir)/pkg/kubernetes/angular.js \
+	$(srcdir)/tools/jsbundle $(srcdir)/pkg/kubernetes/angular.js \
 	    $(srcdir)/lib/angular.$(VX).js \
 	    $(srcdir)/lib/angular-route.$(VX).js \
 	    $(srcdir)/pkg/kubernetes/angular-config.js
-	$(srcdir)/tools/jsmerge -o $(srcdir)/pkg/kubernetes/angular.min.js \
+	$(srcdir)/tools/jsbundle $(srcdir)/pkg/kubernetes/angular.min.js \
 	    $(srcdir)/lib/angular.$(VX).min.js \
 	    $(srcdir)/lib/angular-route.$(VX).min.js \
 	    $(srcdir)/pkg/kubernetes/angular-config.js

pkg/kubernetes/app.js

@@ -1,7 +1,8 @@
 define([
+    "jquery",
     "kubernetes/angular",
     "kubernetes/client"
-], function(angular, kubernetes) {
+], function($, angular, kubernetes) {
     'use strict';
 
     function KubernetesService(client) {
@@ -38,7 +39,7 @@ define([
             self.address = spec.portalIP + ":" + spec.port;
             self.namespace = meta.namespace;
             service = item;
-        }
+        };
     }
 
     function KubernetesNode(client) {
@@ -73,7 +74,7 @@ define([
             self.name = meta.name;
             self.address = status.hostIP;
             node = item;
-        }
+        };
     }
 
     function builder(type, client, Constructor) {

pkg/kubernetes/cluster.html

@@ -30,7 +30,8 @@
 
     <div class="row" ng-view></div>
 
-  <script src="../base1/require.js"></script>
+  <script src="../base1/bundle.js"></script>
+  <script src="../kubernetes/kubernetes.js"></script>
 
   <script type="text/ng-template" id="dashboard.html">
     <div class="col-md-12 col-md-8">

pkg/kubernetes/dashboard.js

@@ -1,7 +1,8 @@
 define([
+    "jquery",
     "kubernetes/angular",
     "kubernetes/app"
-], function(angular) {
+], function($, angular) {
     'use strict';
 
     return angular.module('kubernetes.dashboard', ['ngRoute'])

pkg/kubernetes/kubernetes.js

@@ -0,0 +1 @@
+/* Empty. Replaced in production by a javascript bundle. */

pkg/kubernetes/tool.html

@@ -5,7 +5,8 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="../legacy/cockpit.css" type="text/css" rel="stylesheet">
-    <script src="../base1/require.js"></script>
+    <script src="../base1/bundle.js"></script>
+    <script src="../kubernetes/kubernetes.js"></script>
 <script>
 require([
     "jquery",