diff options
| author | s-ol <s-ol@users.noreply.github.com> | 2019-10-08 12:46:16 +0000 |
|---|---|---|
| committer | s-ol <s-ol@users.noreply.github.com> | 2019-10-08 12:46:16 +0000 |
| commit | 7f261ca5fe336d3d3a0ab9147fd7a5feecdaf36c (patch) | |
| tree | 38ef477665eba7cd27c17de2c8244ca6ce158c6c | |
| parent | fix conversion pattern escapes (diff) | |
| download | mmm-7f261ca5fe336d3d3a0ab9147fd7a5feecdaf36c.tar.gz mmm-7f261ca5fe336d3d3a0ab9147fd7a5feecdaf36c.zip | |
change static path to work with static content
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Tupfile | 2 | ||||
| -rw-r--r-- | build/server.moon | 4 | ||||
| -rw-r--r-- | mmm/Tupdefault | 1 | ||||
| -rw-r--r-- | mmm/mmmfs/layout.moon | 8 |
5 files changed, 7 insertions, 9 deletions
@@ -5,4 +5,3 @@ db.sqlite3 .tup /.gitignore /out -/static @@ -14,4 +14,4 @@ include_rules : mmm/.bundle.lua | <modules> |> ^ WRAP %d^ moon &(build)/bundle_module.moon %o --wrap %f |> static/mmm.bundle.lua # copy for static builds -: foreach static/* |> cp %f out/ |> out/%b +: foreach static/* |> cp %f out/.static/ |> out/.static/%b diff --git a/build/server.moon b/build/server.moon index 4749736..a9b8431 100644 --- a/build/server.moon +++ b/build/server.moon @@ -77,7 +77,7 @@ class Server 501, "not implemented" handle_static: (method, path, stream) => - path = path\match '^/%?static/(.*)' + path = path\match '^/%.static/(.*)' return unless path respond = (code, type, body) -> @@ -93,7 +93,7 @@ class Server respond '405', 'text/plain', "can only GET/HEAD static resources" return true - if path\match '^%.' or path\match '^%~' + if path\match '%.%.' or path\match '^%~' respond '404', 'text/plain', "not found" return diff --git a/mmm/Tupdefault b/mmm/Tupdefault index 3a0783f..8035ed5 100644 --- a/mmm/Tupdefault +++ b/mmm/Tupdefault @@ -1,5 +1,4 @@ include_rules - : foreach *.moon |> ^ MOON %f^ moonc -p > %o %f |> %B.lua <modules> : <modules> |> ^ BNDL %d^ moon &(build)/bundle_module.moon %o %d %<modules> |> .bundle.lua ../<modules> diff --git a/mmm/mmmfs/layout.moon b/mmm/mmmfs/layout.moon index 7312cb5..0fbf553 100644 --- a/mmm/mmmfs/layout.moon +++ b/mmm/mmmfs/layout.moon @@ -129,7 +129,7 @@ render = (content, fileder, opts={}) -> <!DOCTYPE html> <html> <head> - <link rel="stylesheet" type="text/css" href="/?static/main.css" /> + <link rel="stylesheet" type="text/css" href="/.static/main.css" /> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,400" /> ]] buf ..= " @@ -143,12 +143,12 @@ render = (content, fileder, opts={}) -> #{footer} " buf ..= [[ - <script type="application/javascript" src="/?static/highlight.pack.js"></script> + <script type="application/javascript" src="/.static/highlight.pack.js"></script> <script type="application/javascript" src="//cdnjs.cloudflare.com/ajax/libs/marked/0.5.1/marked.min.js"></script> <script type="application/javascript" src="//cdnjs.cloudflare.com/ajax/libs/svg.js/2.6.6/svg.min.js"></script> <script type="application/javascript" src="//platform.twitter.com/widgets.js" charset="utf-8"></script> - <script type="application/javascript" src="/?static/fengari-web.js"></script> - <script type="application/lua" src="/?static/mmm.bundle.lua"></script> + <script type="application/javascript" src="/.static/fengari-web.js"></script> + <script type="application/lua" src="/.static/mmm.bundle.lua"></script> <script type="application/lua">require 'mmm'</script> ]] |