From 7448fe54c582f1c2535c3a41bfb51ac4e00161a6 Mon Sep 17 00:00:00 2001 From: s-ol Date: Mon, 7 Oct 2019 14:17:58 +0000 Subject: SQL import and loading --- Tupfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Tupfile') diff --git a/Tupfile b/Tupfile index f3e300b..edb8b62 100644 --- a/Tupfile +++ b/Tupfile @@ -4,12 +4,12 @@ include_rules !sassc = |> ^ SCSS %b^ sassc @(SASS_ARGS) %f %o |> | %o.map # download fengari dependencies -: |> !download |> root/fengari-web.js -: |> !download |> root/fengari-web.js.map -: static/* |> cp %f root/ |> root/%b +: |> !download |> out/fengari-web.js +: |> !download |> out/fengari-web.js.map +: static/* |> cp %f out/ |> out/%b # render stylesheet -: scss/main.scss |> !sassc |> root/main.css +: scss/main.scss |> !sassc |> out/main.css # bundle for client loading -: mmm/.bundle.lua | |> ^ WRAP %d^ moon &(build)/bundle_module.moon %o --wrap %f |> root/mmm.bundle.lua +: mmm/.bundle.lua | |> ^ WRAP %d^ moon &(build)/bundle_module.moon %o --wrap %f |> out/mmm.bundle.lua -- cgit v1.2.3 From d63e8f54a87076cfbd3cb458c3e2128f46a9038d Mon Sep 17 00:00:00 2001 From: s-ol Date: Tue, 8 Oct 2019 13:24:24 +0200 Subject: serve static assets from as ?... --- Tupfile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'Tupfile') diff --git a/Tupfile b/Tupfile index edb8b62..4c8ab29 100644 --- a/Tupfile +++ b/Tupfile @@ -3,13 +3,15 @@ include_rules !download = |> ^ DOWNLOAD %O^ curl -L https://github.com/fengari-lua/fengari-web/releases/download/@(FENGARI_VERSION)/`basename %o` > %o |> !sassc = |> ^ SCSS %b^ sassc @(SASS_ARGS) %f %o |> | %o.map -# download fengari dependencies -: |> !download |> out/fengari-web.js -: |> !download |> out/fengari-web.js.map -: static/* |> cp %f out/ |> out/%b - # render stylesheet -: scss/main.scss |> !sassc |> out/main.css +: scss/main.scss |> !sassc |> static/main.css + +# download fengari dependencies +: |> !download |> static/fengari-web.js +: |> !download |> static/fengari-web.js.map # bundle for client loading -: mmm/.bundle.lua | |> ^ WRAP %d^ moon &(build)/bundle_module.moon %o --wrap %f |> out/mmm.bundle.lua +: mmm/.bundle.lua | |> ^ 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 -- cgit v1.2.3 From 7f261ca5fe336d3d3a0ab9147fd7a5feecdaf36c Mon Sep 17 00:00:00 2001 From: s-ol Date: Tue, 8 Oct 2019 14:46:16 +0200 Subject: change static path to work with static content --- Tupfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Tupfile') diff --git a/Tupfile b/Tupfile index 4c8ab29..29388cf 100644 --- a/Tupfile +++ b/Tupfile @@ -14,4 +14,4 @@ include_rules : mmm/.bundle.lua | |> ^ 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 -- cgit v1.2.3 From 005cc9b3914128267017620984aee921999e173f Mon Sep 17 00:00:00 2001 From: s-ol Date: Thu, 10 Oct 2019 20:54:42 +0200 Subject: move static files into root/ --- Tupfile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'Tupfile') diff --git a/Tupfile b/Tupfile index 29388cf..0d771d1 100644 --- a/Tupfile +++ b/Tupfile @@ -1,17 +1,9 @@ include_rules -!download = |> ^ DOWNLOAD %O^ curl -L https://github.com/fengari-lua/fengari-web/releases/download/@(FENGARI_VERSION)/`basename %o` > %o |> -!sassc = |> ^ SCSS %b^ sassc @(SASS_ARGS) %f %o |> | %o.map +!sassc = |> ^ SCSS %b^ sassc @(SASS_ARGS) %f '%o' |> # render stylesheet -: scss/main.scss |> !sassc |> static/main.css - -# download fengari dependencies -: |> !download |> static/fengari-web.js -: |> !download |> static/fengari-web.js.map +: scss/main.scss |> !sassc |> root/static/style/text$css.css # bundle for client loading -: mmm/.bundle.lua | |> ^ WRAP %d^ moon &(build)/bundle_module.moon %o --wrap %f |> static/mmm.bundle.lua - -# copy for static builds -: foreach static/* |> cp %f out/.static/ |> out/.static/%b +: mmm/.bundle.lua | |> ^ WRAP %d^ moon &(build)/bundle_module.moon '%o' --wrap %f |> root/static/mmm/application$lua.lua -- cgit v1.2.3 From 6c3836ec3553819a0dda95efd0855910682fc518 Mon Sep 17 00:00:00 2001 From: s-ol Date: Fri, 11 Oct 2019 16:04:36 +0200 Subject: fix browser nav issues, fs default sorting --- Tupfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Tupfile') diff --git a/Tupfile b/Tupfile index 0d771d1..9e5cbac 100644 --- a/Tupfile +++ b/Tupfile @@ -6,4 +6,4 @@ include_rules : scss/main.scss |> !sassc |> root/static/style/text$css.css # bundle for client loading -: mmm/.bundle.lua | |> ^ WRAP %d^ moon &(build)/bundle_module.moon '%o' --wrap %f |> root/static/mmm/application$lua.lua +: mmm/.bundle.lua | |> ^ WRAP %d^ moon &(build)/bundle_module.moon '%o' --wrap %f |> root/static/mmm/text$lua.lua -- cgit v1.2.3