isc30 · isc30 · May 10, 2020 · May 10, 2020 · May 10, 2020 · May 10, 2020
diff --git a/.github/workflows/publish-wiki.yml b/.github/workflows/publish-wiki.yml
@@ -1,7 +1,8 @@
 name: 'Publish Wiki'
 
 on:
-  push:
+  release:
+    types: [published, created, edited]
     branches:
       - master
 

diff --git a/demo/Demo.sln b/demo/Demo.sln
@@ -37,7 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LazyAreas", "LazyAreas", "{
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core.csproj", "{DB1AE536-72C2-4CCD-A7D9-0A79AAEEDA54}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LazyComponentFromNuget", "LazyAreas\LazyComponentFromNuget\LazyComponentFromNuget.csproj", "{A4D17AA8-D918-45FD-9CCA-3FC5ECCDBD97}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LazyComponentFromNuget", "LazyAreas\LazyComponentFromNuget\LazyComponentFromNuget.csproj", "{A4D17AA8-D918-45FD-9CCA-3FC5ECCDBD97}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Imports", "Imports", "{7B174F1E-2091-4D48-9111-B52531C1B865}"
 	ProjectSection(SolutionItems) = preProject
@@ -47,6 +47,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Imports", "Imports", "{7B17
 		BlazorLazyLoading.Wasm.props = BlazorLazyLoading.Wasm.props
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyWithStartup", "LazyAreas\AssemblyWithStartup\AssemblyWithStartup.csproj", "{DC9D8A4E-6491-4BC1-886C-C2DA94927786}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -129,18 +131,6 @@ Global
 		{B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Release|x64.Build.0 = Release|Any CPU
 		{B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Release|x86.ActiveCfg = Release|Any CPU
 		{B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Release|x86.Build.0 = Release|Any CPU
-		{9B062109-5E21-46CD-BDD1-315529E585E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B062109-5E21-46CD-BDD1-315529E585E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B062109-5E21-46CD-BDD1-315529E585E8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9B062109-5E21-46CD-BDD1-315529E585E8}.Debug|x64.Build.0 = Debug|Any CPU
-		{9B062109-5E21-46CD-BDD1-315529E585E8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9B062109-5E21-46CD-BDD1-315529E585E8}.Debug|x86.Build.0 = Debug|Any CPU
-		{9B062109-5E21-46CD-BDD1-315529E585E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B062109-5E21-46CD-BDD1-315529E585E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9B062109-5E21-46CD-BDD1-315529E585E8}.Release|x64.ActiveCfg = Release|Any CPU
-		{9B062109-5E21-46CD-BDD1-315529E585E8}.Release|x64.Build.0 = Release|Any CPU
-		{9B062109-5E21-46CD-BDD1-315529E585E8}.Release|x86.ActiveCfg = Release|Any CPU
-		{9B062109-5E21-46CD-BDD1-315529E585E8}.Release|x86.Build.0 = Release|Any CPU
 		{83419656-8137-4AEB-9A5B-74C7B85621F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{83419656-8137-4AEB-9A5B-74C7B85621F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{83419656-8137-4AEB-9A5B-74C7B85621F6}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -153,6 +143,18 @@ Global
 		{83419656-8137-4AEB-9A5B-74C7B85621F6}.Release|x64.Build.0 = Release|Any CPU
 		{83419656-8137-4AEB-9A5B-74C7B85621F6}.Release|x86.ActiveCfg = Release|Any CPU
 		{83419656-8137-4AEB-9A5B-74C7B85621F6}.Release|x86.Build.0 = Release|Any CPU
+		{9B062109-5E21-46CD-BDD1-315529E585E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B062109-5E21-46CD-BDD1-315529E585E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B062109-5E21-46CD-BDD1-315529E585E8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9B062109-5E21-46CD-BDD1-315529E585E8}.Debug|x64.Build.0 = Debug|Any CPU
+		{9B062109-5E21-46CD-BDD1-315529E585E8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9B062109-5E21-46CD-BDD1-315529E585E8}.Debug|x86.Build.0 = Debug|Any CPU
+		{9B062109-5E21-46CD-BDD1-315529E585E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B062109-5E21-46CD-BDD1-315529E585E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B062109-5E21-46CD-BDD1-315529E585E8}.Release|x64.ActiveCfg = Release|Any CPU
+		{9B062109-5E21-46CD-BDD1-315529E585E8}.Release|x64.Build.0 = Release|Any CPU
+		{9B062109-5E21-46CD-BDD1-315529E585E8}.Release|x86.ActiveCfg = Release|Any CPU
+		{9B062109-5E21-46CD-BDD1-315529E585E8}.Release|x86.Build.0 = Release|Any CPU
 		{DB1AE536-72C2-4CCD-A7D9-0A79AAEEDA54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DB1AE536-72C2-4CCD-A7D9-0A79AAEEDA54}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DB1AE536-72C2-4CCD-A7D9-0A79AAEEDA54}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -177,6 +179,18 @@ Global
 		{A4D17AA8-D918-45FD-9CCA-3FC5ECCDBD97}.Release|x64.Build.0 = Release|Any CPU
 		{A4D17AA8-D918-45FD-9CCA-3FC5ECCDBD97}.Release|x86.ActiveCfg = Release|Any CPU
 		{A4D17AA8-D918-45FD-9CCA-3FC5ECCDBD97}.Release|x86.Build.0 = Release|Any CPU
+		{DC9D8A4E-6491-4BC1-886C-C2DA94927786}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC9D8A4E-6491-4BC1-886C-C2DA94927786}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC9D8A4E-6491-4BC1-886C-C2DA94927786}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DC9D8A4E-6491-4BC1-886C-C2DA94927786}.Debug|x64.Build.0 = Debug|Any CPU
+		{DC9D8A4E-6491-4BC1-886C-C2DA94927786}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DC9D8A4E-6491-4BC1-886C-C2DA94927786}.Debug|x86.Build.0 = Debug|Any CPU
+		{DC9D8A4E-6491-4BC1-886C-C2DA94927786}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC9D8A4E-6491-4BC1-886C-C2DA94927786}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC9D8A4E-6491-4BC1-886C-C2DA94927786}.Release|x64.ActiveCfg = Release|Any CPU
+		{DC9D8A4E-6491-4BC1-886C-C2DA94927786}.Release|x64.Build.0 = Release|Any CPU
+		{DC9D8A4E-6491-4BC1-886C-C2DA94927786}.Release|x86.ActiveCfg = Release|Any CPU
+		{DC9D8A4E-6491-4BC1-886C-C2DA94927786}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -188,13 +202,14 @@ Global
 		{E3E28F5C-3F96-4634-9528-10C23F2478DF} = {2DFA918F-9417-49B8-9FDA-E2231179978C}
 		{6C5945E8-44F9-4898-AB78-FF0D85F5515B} = {2DFA918F-9417-49B8-9FDA-E2231179978C}
 		{B78FC2FE-F107-49AB-95FC-E7F4559C879A} = {2DFA918F-9417-49B8-9FDA-E2231179978C}
-		{9B062109-5E21-46CD-BDD1-315529E585E8} = {E503BF43-DE57-4DB6-AF93-A5F765C94154}
 		{83419656-8137-4AEB-9A5B-74C7B85621F6} = {2DFA918F-9417-49B8-9FDA-E2231179978C}
+		{9B062109-5E21-46CD-BDD1-315529E585E8} = {E503BF43-DE57-4DB6-AF93-A5F765C94154}
 		{E503BF43-DE57-4DB6-AF93-A5F765C94154} = {2587AE99-7624-47E4-B6B8-79EC67346F67}
 		{566D14F1-B2FB-463C-A627-C5EB23B763B7} = {2587AE99-7624-47E4-B6B8-79EC67346F67}
 		{DB1AE536-72C2-4CCD-A7D9-0A79AAEEDA54} = {2587AE99-7624-47E4-B6B8-79EC67346F67}
 		{A4D17AA8-D918-45FD-9CCA-3FC5ECCDBD97} = {566D14F1-B2FB-463C-A627-C5EB23B763B7}
 		{7B174F1E-2091-4D48-9111-B52531C1B865} = {2587AE99-7624-47E4-B6B8-79EC67346F67}
+		{DC9D8A4E-6491-4BC1-886C-C2DA94927786} = {566D14F1-B2FB-463C-A627-C5EB23B763B7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B979A335-AE81-406A-AADA-F236549D23D3}

diff --git a/demo/LazyAreas/AssemblyWithStartup/AssemblyWithStartup.csproj b/demo/LazyAreas/AssemblyWithStartup/AssemblyWithStartup.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <RazorLangVersion>3.0</RazorLangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/demo/LazyAreas/AssemblyWithStartup/Pages/AssemblyWithStartup.razor b/demo/LazyAreas/AssemblyWithStartup/Pages/AssemblyWithStartup.razor
@@ -0,0 +1,8 @@
+@page "/startup"
+
+<h1>Assembly with Startup</h1>
+<p>
+    This page is contained in <code>AssemblyWithStartup.dll</code>.<br />
+    This Assembly contains a Startup class that shows an <code>alert()</code> when it gets loaded.
+</p>
+
diff --git a/demo/LazyAreas/AssemblyWithStartup/Startup.cs b/demo/LazyAreas/AssemblyWithStartup/Startup.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.JSInterop;
+
+namespace AssemblyWithStartup
+{
+    public class Startup
+    {
+        private readonly IJSRuntime _jsRuntime;
+
+        public Startup(IJSRuntime jsRuntime)
+        {
+            _jsRuntime = jsRuntime;
+        }
+
+        public Task Configure()
+        {
+            return Alert("Hello from Startup! The assembly 'AssemblyWithStartup' has been loaded ;)");
+        }
+
+        private async Task Alert(string message)
+        {
+            // avoid crash on prerendering
+            try
+            {
+                await _jsRuntime.InvokeVoidAsync("alert", message).ConfigureAwait(false);
+            }
+            catch (Exception)
+            { }
+        }
+    }
+}
diff --git a/demo/LazyAreas/AssemblyWithStartup/_Imports.razor b/demo/LazyAreas/AssemblyWithStartup/_Imports.razor
@@ -0,0 +1 @@
+@using Microsoft.AspNetCore.Components.Web
diff --git a/demo/LazyAreas/LazyComponentFromNuget/wwwroot/.gitignore b/demo/LazyAreas/LazyComponentFromNuget/wwwroot/.gitignore
diff --git a/demo/ModulesHost/ModulesHost.csproj b/demo/ModulesHost/ModulesHost.csproj
@@ -8,12 +8,14 @@
     <ItemGroup>
         <ProjectReference Include="..\Logger\Logger.csproj" />
         <ProjectReference Include="..\LazyAreas\LazyComponentFromNuget\LazyComponentFromNuget.csproj" />
+        <ProjectReference Include="..\LazyAreas\AssemblyWithStartup\AssemblyWithStartup.csproj" />
     </ItemGroup>
 
     <!-- Extra Assemblies in the Manifest -->
     <ItemGroup>
         <BLLManifestAssemblies Include="Logger" />
         <BLLManifestAssemblies Include="LazyComponentFromNuget" />
+        <BLLManifestAssemblies Include="AssemblyWithStartup" />
     </ItemGroup>
 
     <Import Project="../BlazorLazyLoading.Module.props" />

diff --git a/demo/WasmHost/Layout/NavMenu.razor b/demo/WasmHost/Layout/NavMenu.razor
@@ -22,6 +22,11 @@
                 <span class="oi oi-plus" aria-hidden="true"></span> Lazy Component from Nuget
             </NavLink>
         </li>
+        <li class="nav-item">
+            <NavLink class="nav-link" href="startup">
+                <span class="oi oi-plus" aria-hidden="true"></span> Lazy Startup
+            </NavLink>
+        </li>
         <li class="nav-item">
             <NavLink class="nav-link" href="simple-page">
                 <span class="oi oi-list-rich" aria-hidden="true"></span> (Lazy) Simple Page

diff --git a/docs/Creating-a-Lazy-Loadable-Module.md b/docs/Creating-a-Lazy-Loadable-Module.md
@@ -2,6 +2,7 @@ A lazy loadable module is just a **.NET assembly (project)** with few extra step
 
 In order to covert your csproj to a lazy loadable module, it will require:
 - To use `Microsoft.NET.Sdk.Razor` as SDK *(RazorLib project)*.
+- To target `netstandard2.1`
 
 After checking that, just add:
 ```xml

diff --git a/docs/Startup.md b/docs/Startup.md
@@ -0,0 +1,24 @@
+There are some cases where you require to run some actions right after a lazy **Assembly** or **Module** is loaded. This section covers the **Startup** class and how to use it.
+
+# Creating a Startup (optional)
+
+In order to create a valid **Startup** for your Assembly, it just needs to include a *public class* called `Startup` with a *public* `Configure()` method:
+
+```cs
+public class Startup
+{
+    // (optional) DI constructor
+    // public Startup(...) { }
+
+    // (alternative) public void Configure()
+    public Task Configure()
+    {
+        Console.WriteLine("Startup Called!");
+        return Task.Delay(2000);
+    }
+}
+```
+
+As you might probably noticed, the `Startup` **constructor** accept parameters **injected** from the current `IServiceProvider`.
+
+That's all! The next time the assembly gets loaded it will find, construct and `await` your `Startup.Configure()` implementation.
diff --git a/docs/_Sidebar.md b/docs/_Sidebar.md
@@ -3,10 +3,11 @@
 * [Home / FAQ](https://github.com/isc30/blazor-lazy-loading/wiki)
 * [Creating a Lazy Module](Creating-a-Lazy-Loadable-Module)
   * [Migrating an existing Application](Creating-a-Lazy-Loadable-Module#creating-an-aggregated-module)
+* [Startup](Startup)
 * [Configuring Lazy Loading](Configuring-Lazy-Loading)
   * [WebAssembly](Configuring-Lazy-Loading-@-WebAssembly)
   * [Server](Configuring-Lazy-Loading-@-Server)
 * [Lazy Components](Components)
   * [&lt;Lazy&gt;](Components-@-Lazy)
   * [&lt;LazyRouter&gt;](Components-@-LazyRouter)
-* [Going Raw](Going-Raw)
+* [Going Raw](Going-Raw)
diff --git a/src/nuget/BlazorLazyLoading.Server/StartupExtensions.cs b/src/nuget/BlazorLazyLoading.Server/StartupExtensions.cs
@@ -25,11 +25,11 @@ public static IServiceCollection AddLazyLoading(
         {
             if (options.UseAssemblyIsolation)
             {
-                services.AddScoped<IAssemblyLoader, AssemblyLoader>();
+                services.AddScoped<IAssemblyLoader>(CreateAssemblyLoader);
             }
             else
             {
-                services.AddSingleton<IAssemblyLoader, AssemblyLoader>();
+                services.AddSingleton<IAssemblyLoader>(CreateAssemblyLoader);
             }
 
             services.AddSingleton<IAssemblyLoadContextFactory, DisposableAssemblyLoadContextFactory>();
@@ -68,6 +68,14 @@ public static void UseLazyLoading(
                 ContentTypeProvider = contentTypeMap,
             });
         }
+
+        private static IAssemblyLoader CreateAssemblyLoader(IServiceProvider p)
+        {
+            var assemblyLoader = ActivatorUtilities.CreateInstance<AssemblyLoader>(p);
+            assemblyLoader.SubscribeOnAssemblyLoad(a => AssemblyInitializer.ConfigureAssembly(a, p));
+
+            return assemblyLoader;
+        }
     }
 
     /// <summary>

diff --git a/src/nuget/BlazorLazyLoading.Wasm/StartupExtensions.cs b/src/nuget/BlazorLazyLoading.Wasm/StartupExtensions.cs
@@ -19,7 +19,8 @@ public static IServiceCollection AddLazyLoading(
             this IServiceCollection services,
             LazyLoadingOptions options)
         {
-            services.AddSingleton<IAssemblyLoader, AssemblyLoader>();
+            services.AddSingleton<IAssemblyLoader>(CreateAssemblyLoader);
+
             services.AddSingleton<IAssemblyLoadContextFactory, AppDomainAssemblyLoadContextFactory>();
             services.AddSingleton(typeof(IAssemblyDataLocator), options.AssemblyDataLocator ?? typeof(AssemblyDataLocator));
             services.AddSingleton<IContentFileReader, NetworkContentFileReader>();
@@ -33,6 +34,14 @@ public static IServiceCollection AddLazyLoading(
 
             return services;
         }
+
+        private static IAssemblyLoader CreateAssemblyLoader(IServiceProvider p)
+        {
+            var assemblyLoader = ActivatorUtilities.CreateInstance<AssemblyLoader>(p);
+            assemblyLoader.SubscribeOnAssemblyLoad(a => AssemblyInitializer.ConfigureAssembly(a, p));
+
+            return assemblyLoader;
+        }
     }
 
     /// <summary>

diff --git a/src/src/AssemblyLoader/Abstractions/IAssemblyDataProvider.cs b/src/src/AssemblyLoader/Abstractions/IAssemblyDataProvider.cs
@@ -4,8 +4,14 @@
 
 namespace BlazorLazyLoading.Abstractions
 {
+    /// <summary>
+    /// Returns the AssemblyData (dll + pdb) based on AssemblyName and Context
+    /// </summary>
     public interface IAssemblyDataProvider
     {
+        /// <summary>
+        /// Returns the AssemblyData (dll + pdb) based on AssemblyName and Context
+        /// </summary>
         Task<AssemblyData?> GetAssemblyDataAsync(AssemblyName assemblyName, AssemblyLoaderContext context);
     }
 }
diff --git a/src/src/AssemblyLoader/Abstractions/IAssemblyLoader.cs b/src/src/AssemblyLoader/Abstractions/IAssemblyLoader.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace BlazorLazyLoading.Abstractions
@@ -8,5 +9,9 @@ public interface IAssemblyLoader
         Assembly? GetLoadedAssemblyByName(AssemblyName assemblyName);
 
         Task<Assembly?> LoadAssemblyByNameAsync(AssemblyName assemblyName);
+
+        void SubscribeOnAssemblyLoad(Func<Assembly, Task> callback);
+
+        void UnsubscribeOnAssemblyLoad(Func<Assembly, Task> callback);
     }
 }
diff --git a/src/src/AssemblyLoader/AssemblyLoader.csproj b/src/src/AssemblyLoader/AssemblyLoader.csproj
@@ -13,6 +13,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" PrivateAssets="all" />
         <PackageReference Include="System.Reflection.Metadata" Version="1.8.0" />
     </ItemGroup>
 

diff --git a/src/src/AssemblyLoader/Services/AssemblyInitializer.cs b/src/src/AssemblyLoader/Services/AssemblyInitializer.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace BlazorLazyLoading.Services
+{
+    public static class AssemblyInitializer
+    {
+        public static Task ConfigureAssembly(Assembly assembly, IServiceProvider services)
+        {
+            var startupTypes = assembly.GetTypes()
+                .Where(t => t.Name == "Startup")
+                .Where(t => t.GetMethod("Configure", Array.Empty<Type>()) != null)
+                .ToList();
+
+            if (startupTypes.Count != 1)
+            {
+                return Task.CompletedTask;
+            }
+
+            var startupType = startupTypes.First();
+            var configureMethod = startupType.GetMethod("Configure", Array.Empty<Type>());
+
+            var startup = ActivatorUtilities.CreateInstance(services, startupType);
+            object result = configureMethod.Invoke(startup, Array.Empty<object>());
+
+            if (result is Task resultTask)
+            {
+                return resultTask;
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}