Skip to content

Commit 694cb16

Browse files
committed
fix: serve arizona JS via copy script, use single static route
1 parent 2e97a04 commit 694cb16

File tree

1 file changed

+25
-6
lines changed

1 file changed

+25
-6
lines changed

src/rebar3_nova_new.erl

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -622,10 +622,7 @@ generate_router(Name, #{arizona := true}) ->
622622
Name,
623623
"_main_controller:index/1, #{methods => [get]}},\n",
624624
" {\"/heartbeat\", fun(_) -> {status, 200} end, #{methods => [get]}},\n",
625-
" %% App static assets (priv/static/assets/)\n",
626-
" {\"/assets/[...]\", \"static/assets\"},\n",
627-
" %% Arizona JS from arizona_core priv\n",
628-
" {\"/arizona/[...]\", {priv_dir, arizona_core, \"static/assets\"}}\n",
625+
" {\"/assets/[...]\", \"static/assets\"}\n",
629626
" ]\n",
630627
" }\n",
631628
" ].\n"
@@ -696,7 +693,7 @@ generate_controller(Name, #{arizona := true}) ->
696693
"</h1>\"\n",
697694
" \"<p>Powered by Nova + Arizona</p></div>\"\n",
698695
" \"<script type=\\\"module\\\">\"\n",
699-
" \"import Arizona from '/arizona/js/arizona.min.js';\"\n",
696+
" \"import Arizona from '/assets/js/arizona.min.js';\"\n",
700697
" \"globalThis.arizona = new Arizona();\"\n",
701698
" \"arizona.connect('/live');\"\n",
702699
" \"</script>\"\n",
@@ -1137,7 +1134,8 @@ generate_docker_compose(Name) ->
11371134

11381135
maybe_generate_arizona(Name, #{arizona := true}) ->
11391136
generate_home_view(Name),
1140-
generate_app_css(Name);
1137+
generate_app_css(Name),
1138+
generate_arizona_copy_script(Name);
11411139
maybe_generate_arizona(_Name, _Flags) ->
11421140
ok.
11431141

@@ -1216,6 +1214,20 @@ generate_app_css(Name) ->
12161214
],
12171215
rebar3_nova_utils:write_file(Path, Content).
12181216

1217+
generate_arizona_copy_script(Name) ->
1218+
Path = filename:join([Name, "copy_arizona_assets.sh"]),
1219+
Content = [
1220+
"#!/bin/sh\n",
1221+
"# Copy Arizona JS assets from arizona_core dep to app priv\n",
1222+
"SRC=_build/default/lib/arizona_core/priv/static/assets/js\n",
1223+
"DEST=priv/static/assets/js\n",
1224+
"mkdir -p \"$DEST\"\n",
1225+
"cp \"$SRC/arizona.min.js\" \"$DEST/arizona.min.js\"\n",
1226+
"echo \"Copied Arizona JS to $DEST\"\n"
1227+
],
1228+
rebar3_nova_utils:write_file(Path, Content),
1229+
file:change_mode(Path, 8#755).
1230+
12191231
%%======================================================================
12201232
%% maybe_generate_ci
12211233
%%======================================================================
@@ -1290,4 +1302,11 @@ print_summary(Name, Flags) ->
12901302
false ->
12911303
ok
12921304
end,
1305+
case maps:get(arizona, Flags) of
1306+
true ->
1307+
rebar_api:info(" rebar3 compile~n", []),
1308+
rebar_api:info(" ./copy_arizona_assets.sh~n", []);
1309+
false ->
1310+
ok
1311+
end,
12931312
rebar_api:info(" rebar3 nova serve~n", []).

0 commit comments

Comments
 (0)