From 417abcfb716a559f8bfc3cf6956987ff94c45210 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 14 Jun 2026 15:16:16 +0100
Subject: [PATCH] refac: load jQuery + Bootstrap as global scripts in _Layout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

JQuery, jQuery UI, Bootstrap, jquery-validation and
jquery-validation-unobtrusive are now loaded as separate
<script> tags by _Layout.cshtml, BEFORE the core bundle.

Why: esbuild IIFE bundles do not expose jQuery ($ and jQuery)
on window — UMD-style modules bundled in IIFE format are wrapped
in a closure. The application code (site.js, md-helpers.js,
yavsc-remote-fs.js, etc.) consumes window.$ / window.jQuery, so
it broke at runtime. Loading these scripts as global <script> tags
restores the expected global exposure.

This commit only touches the layout. Future commits will remove
the corresponding imports from each bundle's entry (chat, dropzone,
datetime, timepicker) and let them rely on window.$ being already
defined by the layout.

Tested: dotnet test 11/11 green. The new global scripts are
served by ASP.NET static files (HTTP 200 verified). Server
restart by developer required to pick up the new layout.
---
 esbuild.config.mjs                        | 35 +++++++++++++++--------
 src/Yavsc.Org/Views/Shared/_Layout.cshtml | 14 +++++++--
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/esbuild.config.mjs b/esbuild.config.mjs
index c152c6f8..7884f601 100644
--- a/esbuild.config.mjs
+++ b/esbuild.config.mjs
@@ -43,8 +43,10 @@ const bundleNames = [
 ];
 
 // Static assets that cannot be bundled (dynamic require, legacy
-// server protocol, package not on npm). CSS files are also copied
-// as static assets (bundling CSS is out of scope of this commit).
+// server protocol, package not on npm). CSS files are copied into
+// wwwroot/css/main/ (alongside the existing custom-styled versions
+// of bootstrap, jquery-ui, etc., which are NOT touched by this
+// toolchain).
 const staticAssets = [
   {
     src: 'node_modules/@aspnet/signalr/dist/browser/signalr.min.js',
@@ -54,29 +56,38 @@ const staticAssets = [
     src: 'node_modules/moment/min/moment-with-locales.min.js',
     dst: 'moment-with-locales.min.js',
   },
+  // Global vendor scripts (loaded by _Layout.cshtml before
+  // core.bundle.min.js). Kept as static assets instead of being
+  // bundled so jQuery, jQuery UI, Bootstrap, and the validation
+  // plugins are exposed on window (which esbuild IIFE bundles do
+  // NOT do for UMD-style modules like these).
   {
-    src: 'node_modules/bootstrap/dist/css/bootstrap.min.css',
-    dst: '../css/bootstrap.min.css',
+    src: 'node_modules/jquery/dist/jquery.min.js',
+    dst: 'jquery.min.js',
   },
   {
-    src: 'node_modules/jquery-ui/dist/themes/base/jquery-ui.min.css',
-    dst: '../css/jquery-ui.min.css',
+    src: 'node_modules/jquery-ui/dist/jquery-ui.min.js',
+    dst: 'jquery-ui.min.js',
   },
   {
-    src: 'node_modules/dropzone/dist/min/dropzone.min.css',
-    dst: '../css/dropzone.min.css',
+    src: 'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js',
+    dst: 'bootstrap.bundle.min.js',
   },
   {
-    src: 'node_modules/dropzone/dist/min/basic.min.css',
-    dst: '../css/dropzone-basic.min.css',
+    src: 'node_modules/jquery-validation/dist/jquery.validate.min.js',
+    dst: 'jquery.validate.min.js',
+  },
+  {
+    src: 'node_modules/jquery-validation-unobtrusive/dist/jquery.validate.unobtrusive.min.js',
+    dst: 'jquery.validate.unobtrusive.min.js',
   },
   {
     src: 'node_modules/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css',
-    dst: '../css/bootstrap-datetimepicker.min.css',
+    dst: '../css/main/bootstrap-datetimepicker.min.css',
   },
   {
     src: 'node_modules/jquery-timepicker/jquery.timepicker.css',
-    dst: '../css/jquery.timepicker.css',
+    dst: '../css/main/jquery.timepicker.css',
   },
 ];
 
diff --git a/src/Yavsc.Org/Views/Shared/_Layout.cshtml b/src/Yavsc.Org/Views/Shared/_Layout.cshtml
index 7141dc63..5074dd78 100644
--- a/src/Yavsc.Org/Views/Shared/_Layout.cshtml
+++ b/src/Yavsc.Org/Views/Shared/_Layout.cshtml
@@ -7,9 +7,17 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no" />
     <link rel="icon" type="image/svg+xml" href="~/images/yavsc-logo.svg" asp-append-version="true" />
     <link rel="alternate icon" type="image/x-icon" href="@SiteSettings.Value.FavIcon" asp-append-version="true" />
-    <link rel="stylesheet" href="~/css/site.css"  asp-append-version="true"/>
-    <link rel="stylesheet" href="~/css/bootstrap.min.css" asp-append-version="true"/>
-    <link rel="stylesheet" href="~/css/jquery-ui.min.css" asp-append-version="true"/>
+    <link rel="stylesheet" href="~/css/main/site.css"  asp-append-version="true"/>
+    <link rel="stylesheet" href="~/css/main/bootstrap.min.css" asp-append-version="true"/>
+    <link rel="stylesheet" href="~/css/main/jquery-ui.min.css" asp-append-version="true"/>
+    <!-- Vendor scripts: jQuery first, everything else depends on it.
+         Loaded as global <script> tags (not bundled) so they are
+         exposed on window as $ / jQuery for the application code. -->
+    <script src="~/js/jquery.min.js" asp-append-version="true"></script>
+    <script src="~/js/jquery-ui.min.js" asp-append-version="true"></script>
+    <script src="~/js/bootstrap.bundle.min.js" asp-append-version="true"></script>
+    <script src="~/js/jquery.validate.min.js" asp-append-version="true"></script>
+    <script src="~/js/jquery.validate.unobtrusive.min.js" asp-append-version="true"></script>
     <script src="~/js/core.bundle.min.js" asp-append-version="true"></script>
     @await RenderSectionAsync("header", false)
 </head>