Remove _NorthwindLayout, use esbuild's css import system, remove Nort…

…hwind/index.css, use Html.ModulePageInit extension so that css files are also included automatically

.gitignore

@@ -8,6 +8,8 @@ out/
 .vs/
 /build/.nupkg/
 node_modules/
+/src/*/dist/index.css
+/src/*/dist/index.css.map
 /src/*/dist/index.js
 /src/*/dist/index.min.js
 /src/*/dist/index.js.map

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Dialogs/ChartInDialog/Index.cshtml

@@ -20,7 +20,4 @@
 <div id="SampleRoot">
 </div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("ChartInDialogPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.ChartInDialogPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Dialogs/CloneableEntityDialog/Index.cshtml

@@ -29,7 +29,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("CloneableEntityDialogPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.CloneableEntityDialogPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Dialogs/DefaultValuesInNewDialog/Index.cshtml

@@ -22,7 +22,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("DefaultValuesInNewDialogPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.DefaultValuesInNewDialogPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Dialogs/DialogBoxes/Index.cshtml

@@ -20,7 +20,4 @@
 
 <div id="SampleRoot" class="d-flex gap-1"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("DialogBoxesPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.DialogBoxesPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Dialogs/EntityDialogAsPanel/Index.cshtml

@@ -29,7 +29,4 @@
 
 <div id="DialogDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("EntityDialogAsPanelPage.js"))';
-    pageInit(@Json.Serialize(Model));
-</script>
+@Html.ModulePageInit(ESM.EntityDialogAsPanelPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Dialogs/GetInsertedRecordId/Index.cshtml

@@ -1,4 +1,4 @@
-@{
+@{
     ViewData["Title"] = "Get Inserted Record Id From Dialog";
 }
 
@@ -26,7 +26,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("GetInsertedRecordIdPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.GetInsertedRecordIdPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Dialogs/OtherFormInTab/Index.cshtml

@@ -21,7 +21,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("OtherFormInTabPage.js"))';
-    pageInit();
-</script>
+@HTML.ModulePageInit(ESM.OtherFormInTabPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Dialogs/OtherFormInTabOneBar/Index.cshtml

@@ -23,7 +23,4 @@
 <div id="GridDiv"></div>
 
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("OtherFormInTabOneBarPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.OtherFormInTabOneBarPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Dialogs/PopulateLinkedData/Index.cshtml

@@ -21,7 +21,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("PopulateLinkedDataPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.PopulateLinkedDataPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Dialogs/ReadOnlyDialog/Index.cshtml

@@ -19,7 +19,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("ReadOnlyDialogPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.ReadOnlyDialogPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Dialogs/SerialAutoNumber/Index.cshtml

@@ -1,4 +1,4 @@
-@{
+@{
     ViewData["Title"] = "Serial Auto Numbering";
 }
 
@@ -28,9 +28,7 @@
     </p>
 </div>
 
+
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("SerialAutoNumberPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.SerialAutoNumberPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Editors/ChangingLookupText/Index.cshtml

@@ -20,7 +20,4 @@
     </p>
 </div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("ChangingLookupTextPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.ChangingLookupTextPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Editors/FilteredLookupInDetail/Index.cshtml

@@ -25,7 +25,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("FilteredLookupInDetailPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.FilteredLookupInDetailPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Editors/LookupFilterByMultipleValues/Index.cshtml

@@ -30,7 +30,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("LookupFilterByMultipleValuesPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.LookupFilterByMultipleValuesPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Editors/SelectWithHardcodedValues/Index.cshtml

@@ -27,7 +27,4 @@
     <input type="hidden" />
 </div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("SelectWithHardcodedValuesPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.SelectWithHardcodedValuesPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Editors/StaticTextBlock/Index.cshtml

@@ -20,7 +20,4 @@
     </p>
 </div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("StaticTextBlockPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.StaticTextBlockPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Grids/CustomLinksInGrid/Index.cshtml

@@ -27,7 +27,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("CustomLinksInGridPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.CustomLinksInGridPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Grids/EnablingRowSelection/Index.cshtml

@@ -30,7 +30,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("EnablingRowSelectionPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.EnablingRowSelectionPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Grids/GridFilteredByCriteria/Index.cshtml

@@ -28,7 +28,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("GridFilteredByCriteriaPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.GridFilteredByCriteriaPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Grids/GroupingAndSummariesInGrid/Index.cshtml

@@ -1,4 +1,4 @@
-@{
+@{
     ViewData["Title"] = "Grouping and Summaries In Grid";
 }
 
@@ -19,7 +19,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("GroupingAndSummariesInGridPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.GroupingAndSummariesInGridPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Grids/InitialValuesForQuickFilters/Index.cshtml

@@ -21,7 +21,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("InitialValuesForQuickFiltersPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.InitialValuesForQuickFiltersPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Grids/InlineActionButtons/Index.cshtml

@@ -20,7 +20,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("InlineActionButtonsPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.InlineActionButtonsPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Grids/InlineImageInGrid/Index.cshtml

@@ -19,7 +19,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("InlineImageInGridPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.InlineImageInGridPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Grids/RemovingAddButton/Index.cshtml

@@ -23,7 +23,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("RemovingAddButtonPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.RemovingAddButtonPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Grids/ViewWithoutID/Index.cshtml

@@ -19,7 +19,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("ViewWithoutIDPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.ViewWithoutIDPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/Grids/WrappedHeaders/Index.cshtml

@@ -25,7 +25,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(Html.BasicSamplesModuleFile("WrappedHeadersPage.js"))';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.WrappedHeadersPage)

src/Serenity.Demo.BasicSamples/Areas/Serenity.Demo.BasicSamples/_ViewStart.cshtml

@@ -1,5 +1,4 @@
 @{
     Layout = "_Layout";
 }
-@Html.Stylesheet("~/Serenity.Demo.Northwind/index.css")
 @Html.Stylesheet("~/Serenity.Demo.BasicSamples/index.css")

src/Serenity.Demo.BasicSamples/Modules/Dialogs/SerialAutoNumber/SerialAutoNumberPage.ts

@@ -1,5 +1,6 @@
 import { Decorators, gridPageInit } from "@serenity-is/corelib";
 import { CustomerDialog, CustomerGrid, CustomerService } from "@serenity-is/demo.northwind";
+import "@serenity-is/demo.northwind/dist/index.css";
 
 export default () => gridPageInit(SerialAutoNumberGrid);
 

src/Serenity.Demo.Northwind/Areas/Serenity.Demo.Northwind/Order/OrderIndex.cshtml

@@ -17,7 +17,4 @@
 
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(ESM.OrderPage)';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.OrderPage)

src/Serenity.Demo.Northwind/Areas/Serenity.Demo.Northwind/Product/ProductIndex.cshtml

@@ -9,7 +9,4 @@
 }
 <div id="GridDiv"></div>
 
-<script type="module">
-    import pageInit from '@Html.ResolveWithHash(ESM.ProductPage)';
-    pageInit();
-</script>
+@Html.ModulePageInit(ESM.ProductPage)

src/Serenity.Demo.Northwind/Areas/Serenity.Demo.Northwind/_ViewStart.cshtml

@@ -1,4 +1,3 @@
-@{
+@{
     Layout = "_Layout";
 }
-@Html.Stylesheet("~/Serenity.Demo.Northwind/index.css")

src/Serenity.Demo.Northwind/Imports/MVC/MVC.cs

@@ -3,7 +3,6 @@ namespace Serenity.Demo.Northwind.MVC;
 
 public static class Views
 {
-    public const string _NorthwindLayout = "~/Areas/Serenity.Demo.Northwind/_NorthwindLayout.cshtml";
     public static class Order
     {
         public const string OrderDetailReport = "~/Areas/Serenity.Demo.Northwind/Order/OrderDetailReport.cshtml";

src/Serenity.Demo.Northwind/Modules/Category/CategoryPage.cs

@@ -8,6 +8,6 @@ public class CategoryPage : Controller
     [Route("Northwind/Category")]
     public ActionResult Index()
     {
-        return this.GridPage<CategoryRow>(ESM.CategoryPage, layout: MVC.Views._NorthwindLayout);
+        return this.GridPage<CategoryRow>(ESM.CategoryPage);
     }
 }

src/Serenity.Demo.Northwind/Modules/Customer/CustomerDialog.css

@@ -0,0 +1,3 @@
+.s-Demo-Northwind-CustomerDialog .s-NotesEditor {
+  flex: 1 1 auto;
+}

src/Serenity.Demo.Northwind/Modules/Customer/CustomerDialog.tsx

@@ -2,6 +2,7 @@ import { CustomerForm, CustomerRow, CustomerService } from "../ServerTypes/Demo"
 import { Decorators, EntityDialog, TabsExtensions, WidgetProps, htmlEncode, localText, reloadLookup } from "@serenity-is/corelib";
 import { DialogUtils } from "@serenity-is/extensions";
 import { CustomerOrdersGrid } from "./CustomerOrdersGrid";
+import "./CustomerDialog.css";
 
 @Decorators.registerClass('Serenity.Demo.Northwind.CustomerDialog')
 export class CustomerDialog<P = {}> extends EntityDialog<CustomerRow, P> {

src/Serenity.Demo.Northwind/Modules/Customer/CustomerPage.cs

@@ -8,7 +8,7 @@ public class CustomerPage : Controller
     [Route("Northwind/Customer")]
     public ActionResult Index()
     {
-        return this.GridPage<CustomerRow>(ESM.CustomerPage, layout: MVC.Views._NorthwindLayout);
+        return this.GridPage<CustomerRow>(ESM.CustomerPage);
     }
 }