aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authors-ol <s-ol@users.noreply.github.com>2018-10-19 12:56:38 +0000
committers-ol <s-ol@users.noreply.github.com>2018-10-19 12:56:38 +0000
commit4691334ecf6db3c626987bb8842ef253e61f840d (patch)
tree668b921e4a1b7aa3d3d47fce82867da1c9010c71
parentmake noom cache weak table (diff)
downloadmmm-4691334ecf6db3c626987bb8842ef253e61f840d.tar.gz
mmm-4691334ecf6db3c626987bb8842ef253e61f840d.zip
fix client init
-rw-r--r--Tupfile14
m---------dist0
-rw-r--r--render.moon5
-rw-r--r--scss/main.scss3
4 files changed, 15 insertions, 7 deletions
diff --git a/Tupfile b/Tupfile
index 0a14a98..6ad6817 100644
--- a/Tupfile
+++ b/Tupfile
@@ -1,8 +1,10 @@
.gitignore
-!download = |> ^ DOWNLOAD %o^ curl -L https://github.com/fengari-lua/fengari-web/releases/download/@(FENGARI_VERSION)/`basename %o` > %o |>
-!moonc = |> ^ CC %o^ moonc -o %o %f |> dist/%f.lua
-!render = |> ^ RNDR %o^ moon render.moon %B > %o |> dist/%B.html
+!download = |> ^ DOWNLOAD %O^ curl -L https://github.com/fengari-lua/fengari-web/releases/download/@(FENGARI_VERSION)/`basename %o` > %o |>
+# !render = |> ^ HTML %b^ moon render.moon > %o %B |>
+!render = |> ^ HTML %b^ moon render.moon > %o %B |> dist/%B.html
+!moonc = |> ^ MOON %b^ moonc -o %o %f |> dist/%f.lua
+!sassc = |> ^ SCSS %b^ sassc -mauto %f %o |> | %o.map
preload app app/tags lib
@@ -21,5 +23,9 @@ PAGES += app/tags
# compile client imports
: foreach $(CLIENT) |> !moonc |>
-# render static content
+# render stylesheet
+: scss/main.scss |> !sassc |> dist/main.css
+
+# # render static content
: foreach $(PAGES) |> !render |>
+# run moon find.moon
diff --git a/dist b/dist
-Subproject 23385318986b083adfb1c2b6d5c25f2848515b9
+Subproject eebe79c04907788f8df1f86f0a477d691385e7c
diff --git a/render.moon b/render.moon
index af6b60b..00f4946 100644
--- a/render.moon
+++ b/render.moon
@@ -1,6 +1,4 @@
package.moonpath = './?.shared.moon;./?.server.moon;' .. package.moonpath
-
-import to_lua from require 'moonscript.base'
import flush from require 'lib.init'
error "please specify the module to build as an argumnet" unless arg[1]
@@ -17,10 +15,11 @@ print "<!DOCTYPE html>
<head>
<meta charset=\"UTF-8\">
<title>MMM: lunar low-gravity scripting playground</title>
+ <link rel=\"stylesheet\" type=\"text/css\" href=\"main.css\" />
</head>
<body>
<script src=\"fengari-web.js\"></script>
- <script src=\"lib/init.client.lua\"></script>
+ <script type=\"application/lua\" src=\"lib/init.client.moon.lua\"></script>
#{flush!}
</body>
</html>"
diff --git a/scss/main.scss b/scss/main.scss
new file mode 100644
index 0000000..9d23ceb
--- /dev/null
+++ b/scss/main.scss
@@ -0,0 +1,3 @@
+body {
+ font-family: sans-serif;
+}