From f8058825d8fed7564e5905485386ade93e6912a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Thu, 27 Apr 2023 16:05:49 +0200 Subject: [PATCH] FEAT: introduce bundle_assets variable and decouple it from DEBUG (#1660) --- lnbits/helpers.py | 8 ++++---- lnbits/settings.py | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lnbits/helpers.py b/lnbits/helpers.py index 3af653b87..8b40582a4 100644 --- a/lnbits/helpers.py +++ b/lnbits/helpers.py @@ -59,15 +59,15 @@ def template_renderer(additional_folders: Optional[List] = None) -> Jinja2Templa if settings.lnbits_custom_logo: t.env.globals["USE_CUSTOM_LOGO"] = settings.lnbits_custom_logo - if settings.debug: + if settings.bundle_assets: + t.env.globals["INCLUDED_JS"] = ["/static/bundle.min.js"] + t.env.globals["INCLUDED_CSS"] = ["/static/bundle.min.css"] + else: vendor_filepath = Path(settings.lnbits_path, "static", "vendor.json") with open(vendor_filepath) as vendor_file: vendor_files = json.loads(vendor_file.read()) t.env.globals["INCLUDED_JS"] = vendor_files["js"] t.env.globals["INCLUDED_CSS"] = vendor_files["css"] - else: - t.env.globals["INCLUDED_JS"] = ["/static/bundle.min.js"] - t.env.globals["INCLUDED_CSS"] = ["/static/bundle.min.css"] return t diff --git a/lnbits/settings.py b/lnbits/settings.py index e4df2772e..fcbab6296 100644 --- a/lnbits/settings.py +++ b/lnbits/settings.py @@ -227,6 +227,7 @@ class EditableSettings( class EnvSettings(LNbitsSettings): debug: bool = Field(default=False) + bundle_assets: bool = Field(default=True) host: str = Field(default="127.0.0.1") port: int = Field(default=5000) forwarded_allow_ips: str = Field(default="*")