From 189cb87a4af6fdfcec0fbb8bcc942a579ccb2f1c Mon Sep 17 00:00:00 2001 From: Darius Kohen Date: Fri, 27 Sep 2024 16:08:53 +0200 Subject: [PATCH] [FEAT] keep the hardcoded components folder but let the src_folder config variable change the path --- priv/commonjs_reaxt/client_entry_addition.js | 3 ++- priv/commonjs_reaxt/react_server.js | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/priv/commonjs_reaxt/client_entry_addition.js b/priv/commonjs_reaxt/client_entry_addition.js index 449bb4c..2eee099 100644 --- a/priv/commonjs_reaxt/client_entry_addition.js +++ b/priv/commonjs_reaxt/client_entry_addition.js @@ -6,7 +6,8 @@ function default_client_render(props,render,param){ } window.reaxt_render = function(module,submodule,props,param){ - return import(`./../../components/${module}`).then((module)=>{ + let src_folder = props.src_folder || "components" + return import(`./../../${src_folder}/${module}`).then((module)=>{ module = module.default submodule = (submodule) ? module[submodule] :module submodule.reaxt_client_render = submodule.reaxt_client_render || default_client_render diff --git a/priv/commonjs_reaxt/react_server.js b/priv/commonjs_reaxt/react_server.js index a5ad7dc..c229342 100644 --- a/priv/commonjs_reaxt/react_server.js +++ b/priv/commonjs_reaxt/react_server.js @@ -57,7 +57,9 @@ Server(function(term,from,state,done){ done("reply",Bert.tuple(Bert.atom("error"),Bert.tuple(Bert.atom("handler_error"),module,submodule,args,"timeout",Bert.atom("nil")))) },timeout) - import(`./../../components/${module}`).then((handler)=>{ + let src_folder = args.src_folder || "components" + + import(`./../../${src_folder}/${module}`).then((handler)=>{ handler = handler.default submodule = (submodule == "nil") ? undefined : submodule handler = (!submodule) ? handler : handler[submodule]