From 31d7eaad90976557477a4b5777d5bbfb7a30d122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Thu, 18 Jun 2015 13:00:18 +0200
Subject: [PATCH] Add ";" delimiters between bundled JS files

This is to make sure that they all end on a ; and hence stuff doesn't break if a file included directly after starts with a (...) construct. Of course it would be better if all bundled files are valid in that matter, however since we can't enforce that, we'll add this slight overhead to reduce the risk of stuff breaking.

See for example: http://stackoverflow.com/questions/20307462/js-cant-combine-lib-files
---
 src/octoprint/server/__init__.py | 39 ++++++++++++++++++++++++--------
 src/octoprint/settings.py        |  3 ++-
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index 437333ed..fca1ad8a 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -674,6 +674,20 @@ class Server():
 
 		base_folder = settings().getBaseFolder("generated")
 
+		# clean the folder
+		if settings().getBoolean(["devel", "webassets", "clean_on_startup"]):
+			import shutil
+			for entry in ("webassets", ".webassets-cache"):
+				path = os.path.join(base_folder, entry)
+				self._logger.debug("Deleting {path}...".format(**locals()))
+				if os.path.isdir(path):
+					shutil.rmtree(path, ignore_errors=True)
+				elif os.path.isfile(path):
+					try:
+						os.remove(path)
+					except:
+						self._logger.exception("Exception while trying to delete {entry} from {base_folder}".format(**locals()))
+
 		AdjustedEnvironment = type(Environment)(Environment.__name__, (Environment,), dict(
 			resolver_class=util.flask.PluginAssetResolver
 		))
@@ -754,16 +768,7 @@ class Server():
 		if len(less_app) == 0:
 			less_app = ["empty"]
 
-		js_libs_bundle = Bundle(*js_libs, output="webassets/packed_libs.js")
-		if settings().getBoolean(["devel", "webassets", "minify"]):
-			js_app_bundle = Bundle(*js_app, output="webassets/packed_app.js", filters="rjsmin")
-		else:
-			js_app_bundle = Bundle(*js_app, output="webassets/packed_app.js")
-
-		css_libs_bundle = Bundle(*css_libs, output="webassets/packed_libs.css")
-		css_app_bundle = Bundle(*css_app, output="webassets/packed_app.css")
-
-		from webassets.filter import register_filter
+		from webassets.filter import register_filter, Filter
 		from webassets.filter.cssrewrite.base import PatternRewriter
 		import re
 		class LessImportRewrite(PatternRewriter):
@@ -782,7 +787,21 @@ class Server():
 
 				return "{import_with_options}\"{import_url}\";".format(**locals())
 
+		class JsDelimiterBundle(Filter):
+			name = "js_delimiter_bundler"
+			options = {}
+			def input(self, _in, out, **kwargs):
+				out.write(_in.read())
+				out.write("\n;\n")
+
 		register_filter(LessImportRewrite)
+		register_filter(JsDelimiterBundle)
+
+		js_libs_bundle = Bundle(*js_libs, output="webassets/packed_libs.js", filters="js_delimiter_bundler")
+		js_app_bundle = Bundle(*js_app, output="webassets/packed_app.js", filters="js_delimiter_bundler")
+
+		css_libs_bundle = Bundle(*css_libs, output="webassets/packed_libs.css")
+		css_app_bundle = Bundle(*css_app, output="webassets/packed_app.css")
 
 		all_less_bundle = Bundle(*less_app, output="webassets/packed_app.less", filters="less_importrewrite")
 
diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py
index ab4e24f3..b44a6844 100644
--- a/src/octoprint/settings.py
+++ b/src/octoprint/settings.py
@@ -251,7 +251,8 @@ default_settings = {
 		},
 		"webassets": {
 			"minify": False,
-			"bundle": True
+			"bundle": True,
+			"clean_on_startup": True
 		},
 		"virtualPrinter": {
 			"enabled": False,