diff --git a/.gitignore b/.gitignore
index bb8f5d00..25fb814a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ __bundle__
coverage.xml
node_modules
lnbits/static/bundle.js
+lnbits/static/bundle-components.js
lnbits/static/bundle.css
lnbits/static/bundle.min.js.old
lnbits/static/bundle.min.css.old
diff --git a/.prettierignore b/.prettierignore
index 97a304b4..67454f94 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -10,6 +10,7 @@
**/lnbits/static/vendor
**/lnbits/static/bundle.*
+**/lnbits/static/bundle-components.*
**/lnbits/static/css/*
flake.lock
diff --git a/Makefile b/Makefile
index 1bcc0c9c..1763604b 100644
--- a/Makefile
+++ b/Makefile
@@ -103,24 +103,21 @@ sass:
bundle:
npm install
- npm run sass
- npm run vendor_copy
- npm run vendor_json
+ npm run bundle
poetry run ./node_modules/.bin/prettier -w ./lnbits/static/vendor.json
- npm run vendor_bundle_css
- npm run vendor_minify_css
- npm run vendor_bundle_js
- npm run vendor_minify_js
checkbundle:
cp lnbits/static/bundle.min.js lnbits/static/bundle.min.js.old
cp lnbits/static/bundle.min.css lnbits/static/bundle.min.css.old
+ cp lnbits/static/bundle-components.min.js lnbits/static/bundle-components.min.js.old
make bundle
diff -q lnbits/static/bundle.min.js lnbits/static/bundle.min.js.old || exit 1
diff -q lnbits/static/bundle.min.css lnbits/static/bundle.min.css.old || exit 1
+ diff -q lnbits/static/bundle-components.min.js lnbits/static/bundle-components.min.js.old || exit 1
@echo "Bundle is OK"
rm lnbits/static/bundle.min.js.old
rm lnbits/static/bundle.min.css.old
+ rm lnbits/static/bundle-components.min.js.old
install-pre-commit-hook:
@echo "Installing pre-commit hook to git"
diff --git a/lnbits/core/templates/core/extensions.html b/lnbits/core/templates/core/extensions.html
index 1d88755e..042a3f79 100644
--- a/lnbits/core/templates/core/extensions.html
+++ b/lnbits/core/templates/core/extensions.html
@@ -901,7 +901,7 @@
{% endblock %} {% block scripts %} {{ window_vars(user) }}
- {% block scripts %}{% endblock %}
+ {% block scripts %}{% endblock %} {% for url in INCLUDED_COMPONENTS %}
+
+ {% endfor %}