Update starlight and sync files with sailor

sailorproject · Feb 15, 2016 · d566a8c · d566a8c
1 parent 99d0134
commit d566a8c
Show file tree

Hide file tree

Showing 15 changed files with 57 additions and 234 deletions.
diff --git a/js/starlight/DOMAPI.js b/js/starlight/DOMAPI.js
diff --git a/js/starlight/DOMAPI.min.js b/js/starlight/DOMAPI.min.js
diff --git a/js/starlight/babel.min.js b/js/starlight/babel.min.js
diff --git a/js/starlight/browser.5.8.34.min.js b/js/starlight/browser.5.8.34.min.js
diff --git a/js/starlight/latclient.js b/js/starlight/latclient.js
diff --git a/js/starlight/parser.min.js b/js/starlight/parser.min.js
diff --git a/js/starlight/starlight.js b/js/starlight/starlight.js
diff --git a/js/starlight/starlight.min.js b/js/starlight/starlight.min.js
diff --git a/lua/latclient.lua b/lua/latclient.lua
@@ -1,5 +1,5 @@
 --[[
-Lua@Client 0.3.2
+Lua@Client 0.4
 Lua Pages Template Preprocessor Extension
 Copyright (c) 2014-2015 Felipe Daragon
 

diff --git a/lua/latclient/common.lua b/lua/latclient/common.lua
@@ -51,4 +51,4 @@ function M.js_string_escape(s)
 
 end
 
-return M
+return M
diff --git a/lua/latclient/conf.lua b/lua/latclient/conf.lua
@@ -5,4 +5,4 @@ local conf = {
 	}
 }
 
-return conf
+return conf
diff --git a/lua/latclient/lp_handler.lua b/lua/latclient/lp_handler.lua
@@ -14,4 +14,4 @@ function provide_file(r)
 	local conf = require "latclient.conf"
 	local vm = require("latclient."..conf.lua_at_client.vm)
 	return vm.handle(r)
-end
+end
diff --git a/lua/latclient/lua51js.lua b/lua/latclient/lua51js.lua
@@ -72,4 +72,4 @@ function M.cgilua_exit(path,filename)
 		end
 end
 
-return M
+return M
diff --git a/lua/latclient/moonshine.lua b/lua/latclient/moonshine.lua
@@ -8,6 +8,7 @@ local M = {
 }
 
 local common = require "latclient.common"
+local loadstring = loadstring or load
 
 function M.get_header(s)
 	if M.js_served == false then
@@ -49,4 +50,4 @@ function M.get_modules(s)
 	return modules
 end
 
-return M
+return M
diff --git a/lua/latclient/starlight.lua b/lua/latclient/starlight.lua
@@ -13,26 +13,36 @@ function M.get_header(s)
 	if M.js_served == false then
 		M.js_served = true
 		local header = [[
-		<script src="{url}/starlight/starlight.min.js"></script>
-		<script src="{url}/starlight/parser.min.js"></script>
-		<script src="{url}/starlight/babel.min.js"></script>
-		<script src="{url}/starlight/DOMAPI.min.js"></script>
-		<script src="{url}/starlight/latclient.js"></script>
+		<!-- While target browsers don't support ES6 natively, include Babel parser -->
+		<script src="{url}/starlight/browser.5.8.34.min.js"></script>
+		<script src="{url}/starlight/starlight.js" data-run-script-tags></script>
+		<!-- Starlight! -->
 		]]
 		header = string.gsub(header, "{url}", M.js_url)
-		s = header..s
+		s = s..header
 	end
 	return s
 end
 
 
 function M.get_client_js(s)
 	local modules = M.get_modules(s)
-	s = common.js_string_escape(s)
-	s = '<script>'..modules..'(starlight.parser.parse('..s..'))();</script>'
+	s = modules..M.wrap_code(s)
 	return M.get_header(s)
 end
 
+function M.wrap_code(s,module_name)
+	local mod = module_name and table.concat{'data-modname="',module_name,'"'} or ''
+
+	return table.concat({
+		'<script type="application/x-lua"',
+		mod,
+		'>',
+		s,
+		'</script>'
+	}, '\n')
+end
+
 
 function M.get_modules(s)
 	local modules = ""
@@ -43,11 +53,7 @@ function M.get_modules(s)
 				local file = io.open(module_file,'r')
 				local file_str = file:read("*a")
 				file:close()
-				local lua_code = "rawset(package.preload, '" .. name.. [[', function(...) ]]
-				 .. file_str .. 
-				 [[ end)]]
-				lua_code = common.js_string_escape(lua_code)
-				modules = modules .. '(starlight.parser.parse('..lua_code..'))(); '
+				modules = modules..M.wrap_code(file_str,name)
 				M.modules_served[name] = true
 			end
 		end