diff --git a/.gitignore b/.gitignore
index 10e6e9e51..4a3bae58e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -287,3 +287,6 @@ __pycache__/
*.odx.cs
*.xsd.cs
/BTCPayServer/Build/dockerfiles
+
+# Bundling JS/CSS
+BTCPayServer/wwwroot/bundles/
diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj
index 4492aff71..709351af0 100644
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@@ -7,9 +7,13 @@
+
+
+
+
@@ -104,8 +108,6 @@
-
-
diff --git a/BTCPayServer/Views/Shared/_Layout.cshtml b/BTCPayServer/Views/Shared/_Layout.cshtml
index 4a895bff9..119d24e53 100644
--- a/BTCPayServer/Views/Shared/_Layout.cshtml
+++ b/BTCPayServer/Views/Shared/_Layout.cshtml
@@ -17,10 +17,10 @@
BTCPay Server
@* CSS *@
-
+
@* JS *@
-
+
diff --git a/BTCPayServer/Views/Shared/_ValidationScriptsPartial.cshtml b/BTCPayServer/Views/Shared/_ValidationScriptsPartial.cshtml
index 4d169afd3..6f5cf492b 100644
--- a/BTCPayServer/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/BTCPayServer/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -1,3 +1,3 @@
@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
-
+
diff --git a/BTCPayServer/bundleconfig.json b/BTCPayServer/bundleconfig.json
index 9580071d4..04bfaca25 100644
--- a/BTCPayServer/bundleconfig.json
+++ b/BTCPayServer/bundleconfig.json
@@ -1,6 +1,6 @@
[
{
- "outputFileName": "wwwroot/bundles/main/bundle.min.css",
+ "outputFileName": "wwwroot/bundles/main-bundle.min.css",
"inputFiles": [
"wwwroot/vendor/bootstrap/css/bootstrap.css",
"wwwroot/vendor/magnific-popup/magnific-popup.css",
@@ -10,7 +10,7 @@
]
},
{
- "outputFileName": "wwwroot/bundles/main/bundle.min.js",
+ "outputFileName": "wwwroot/bundles/main-bundle.min.js",
"inputFiles": [
"wwwroot/vendor/jquery/jquery.js",
"wwwroot/vendor/popper/popper.js",
@@ -22,7 +22,7 @@
]
},
{
- "outputFileName": "wwwroot/bundles/jqueryvalidate/bundle.min.js",
+ "outputFileName": "wwwroot/bundles/jqueryvalidate-bundle.min.js",
"inputFiles": [
"wwwroot/vendor/jquery-validate/jquery.validate.js",
"wwwroot/vendor/jquery-validate-unobtrusive/jquery.validate.unobtrusive.js"