Demo of Module with Static Resources

isc30 · isc30 · commit 19d46584a638 · 2020-05-22T21:37:27.000+02:00
diff --git a/demo/Demo.sln b/demo/Demo.sln
@@ -50,6 +50,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Imports", "Imports", "{7B17
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyWithStartup", "LazyAreas\AssemblyWithStartup\AssemblyWithStartup.csproj", "{DC9D8A4E-6491-4BC1-886C-C2DA94927786}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StaticResources", "LazyAreas\StaticResources\StaticResources.csproj", "{373D2F66-EE78-402B-AA85-E9896ABA2E7F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -192,6 +194,18 @@ Global
 		{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
+		{373D2F66-EE78-402B-AA85-E9896ABA2E7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{373D2F66-EE78-402B-AA85-E9896ABA2E7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{373D2F66-EE78-402B-AA85-E9896ABA2E7F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{373D2F66-EE78-402B-AA85-E9896ABA2E7F}.Debug|x64.Build.0 = Debug|Any CPU
+		{373D2F66-EE78-402B-AA85-E9896ABA2E7F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{373D2F66-EE78-402B-AA85-E9896ABA2E7F}.Debug|x86.Build.0 = Debug|Any CPU
+		{373D2F66-EE78-402B-AA85-E9896ABA2E7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{373D2F66-EE78-402B-AA85-E9896ABA2E7F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{373D2F66-EE78-402B-AA85-E9896ABA2E7F}.Release|x64.ActiveCfg = Release|Any CPU
+		{373D2F66-EE78-402B-AA85-E9896ABA2E7F}.Release|x64.Build.0 = Release|Any CPU
+		{373D2F66-EE78-402B-AA85-E9896ABA2E7F}.Release|x86.ActiveCfg = Release|Any CPU
+		{373D2F66-EE78-402B-AA85-E9896ABA2E7F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -211,6 +225,7 @@ Global
 		{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}
+		{373D2F66-EE78-402B-AA85-E9896ABA2E7F} = {566D14F1-B2FB-463C-A627-C5EB23B763B7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B979A335-AE81-406A-AADA-F236549D23D3}
diff --git a/demo/LazyAreas/StaticResources/ModuleWithStaticResources.razor b/demo/LazyAreas/StaticResources/ModuleWithStaticResources.razor
@@ -0,0 +1,11 @@
+﻿@page "/static-resources"
+
+<link rel="stylesheet" href="_content/StaticResources/styles.css" />
+
+<h1>Module with StaticWebAssets</h1>
+
+<p class="my-component">
+    This component is rendered using a CSS stored in the Lazy Module <b>StaticResources</b>.<br />
+    This way we can defer static resources (such as CSS and Images) and download them only when required.
+</p>
+
diff --git a/demo/LazyAreas/StaticResources/StaticResources.csproj b/demo/LazyAreas/StaticResources/StaticResources.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/StaticResources/_Imports.razor b/demo/LazyAreas/StaticResources/_Imports.razor
@@ -0,0 +1 @@
+﻿@using Microsoft.AspNetCore.Components.Web
diff --git a/demo/LazyAreas/StaticResources/wwwroot/background.png b/demo/LazyAreas/StaticResources/wwwroot/background.png
diff --git a/demo/LazyAreas/StaticResources/wwwroot/styles.css b/demo/LazyAreas/StaticResources/wwwroot/styles.css
@@ -0,0 +1,11 @@
+﻿/*
+    This file is to show how CSS and other static resources (such as images) can be
+    used from a library project/package.
+*/
+
+.my-component {
+    border: 2px dashed red;
+    padding: 1em;
+    margin: 1em 0;
+    background-image: url('background.png');
+}
diff --git a/demo/ModulesHost/ModulesHost.csproj b/demo/ModulesHost/ModulesHost.csproj
@@ -9,13 +9,16 @@
         <ProjectReference Include="..\Logger\Logger.csproj" />
         <ProjectReference Include="..\LazyAreas\LazyComponentFromNuget\LazyComponentFromNuget.csproj" />
         <ProjectReference Include="..\LazyAreas\AssemblyWithStartup\AssemblyWithStartup.csproj" />
+        <ProjectReference Include="..\LazyAreas\StaticResources\StaticResources.csproj" />
+        <ProjectReference Include="..\LazyAreas\StaticResources\StaticResources.csproj" />
     </ItemGroup>
 
     <!-- Extra Assemblies in the Manifest -->
     <ItemGroup>
         <BLLManifestAssemblies Include="Logger" />
         <BLLManifestAssemblies Include="LazyComponentFromNuget" />
         <BLLManifestAssemblies Include="AssemblyWithStartup" />
+        <BLLManifestAssemblies Include="StaticResources" />
     </ItemGroup>
 
     <Import Project="../BlazorLazyLoading.Module.props" />
diff --git a/demo/WasmHost/Layout/NavMenu.razor b/demo/WasmHost/Layout/NavMenu.razor
@@ -18,6 +18,11 @@
                 <span class="oi oi-plus" aria-hidden="true"></span> &lt;Lazy /&gt;
             </NavLink>
         </li>
+        <li class="nav-item">
+            <NavLink class="nav-link" href="static-resources">
+                <span class="oi oi-plus" aria-hidden="true"></span> Module with StaticWebAssets
+            </NavLink>
+        </li>
         <li class="nav-item">
             <NavLink class="nav-link" href="lazy-component-from-nuget">
                 <span class="oi oi-plus" aria-hidden="true"></span> Lazy Component from Nuget
diff --git a/demo/WasmHost/Pages/Counter.razor b/demo/WasmHost/Pages/Counter.razor
@@ -24,9 +24,9 @@
 </Lazy>
 
 <Lazy
-      Name="Parametrized"
-      Parameters='new Dictionary<string, object> { { "Name", "Ivan" }, { "Adjective", "awesome" } }'
-      OnBeforeLoadAsync="Delay(500, 2500)">
+    Name="Parametrized"
+    Parameters='new Dictionary<string, object> { { "Name", "Ivan" }, { "Adjective", "awesome" } }'
+    OnBeforeLoadAsync="Delay(500, 2500)">
 
     <Loading>
         <LazyPlaceholder />
diff --git a/demo/WasmHost/Pages/Index.razor b/demo/WasmHost/Pages/Index.razor
@@ -6,17 +6,37 @@
 
 Welcome to your new app.
 
+<p>
+    Pass NoAssemblyAvailableFromStart: @_noAssemblyAvailableFromStart<br/>
+    Pass AssemblyLoadedLater: @_assemblyLoadedLater
+</p>
+
 <SurveyPrompt Title="How is Blazor working for you?" />
 
 @code
-{ 
+{
+    [Inject]
+    private IAssemblyLoader AssemblyLoader { get; set; }
+
     [Inject]
-    public IAssemblyLoader AssemblyLoader { get; set; }
+    private IAssemblyLoadContext AssemblyLoadContext { get; set; }
+
+    private bool? _noAssemblyAvailableFromStart = null;
+    private bool? _assemblyLoadedLater = null;
 
     protected override async Task OnInitializedAsync()
     {
         await base.OnInitializedAsync();
 
+        var assembly = AssemblyLoadContext.Load(new AssemblyName
+        {
+            Name = "Logger",
+            Version = null,
+        });
+
+        _noAssemblyAvailableFromStart = assembly == null;
+        StateHasChanged();
+
         var a = await AssemblyLoader
             .LoadAssemblyByNameAsync(new AssemblyName
             {
@@ -26,10 +46,14 @@ Welcome to your new app.
 
         if (a == null)
         {
+            _assemblyLoadedLater = false;
             Console.Error.WriteLine("Assembly 'Logger' failed to load");
+
             return;
         }
 
+        _assemblyLoadedLater = true;
+
         a.GetType("MyLogger.Logger").GetMethod("Log").Invoke(null, new[] { "Lazy! Oh Yeah!" });
     }
 }
diff --git a/demo/WasmHost/wwwroot/css/site.css b/demo/WasmHost/wwwroot/css/site.css
@@ -163,8 +163,8 @@ app {
     }
 
     .sidebar {
-        width: 250px;
-        height: 100vh;
+        width: 300px;
+        min-height: 100vh;
         position: sticky;
         top: 0;
     }
diff --git a/src/nuget/BlazorLazyLoading.Server/StartupExtensions.cs b/src/nuget/BlazorLazyLoading.Server/StartupExtensions.cs
@@ -26,13 +26,14 @@ public static IServiceCollection AddLazyLoading(
             if (options.UseAssemblyIsolation)
             {
                 services.AddScoped<IAssemblyLoader>(CreateAssemblyLoader);
+                services.AddScoped<IAssemblyLoadContext, DisposableAssemblyLoadContext>();
             }
             else
             {
                 services.AddSingleton<IAssemblyLoader>(CreateAssemblyLoader);
+                services.AddSingleton<IAssemblyLoadContext, DisposableAssemblyLoadContext>();
             }
 
-            services.AddSingleton<IAssemblyLoadContextFactory, DisposableAssemblyLoadContextFactory>();
             services.AddSingleton<IAssemblyDataProvider, AssemblyDataProvider>();
             services.AddSingleton(typeof(IAssemblyDataLocator), options.AssemblyDataLocator ?? typeof(AssemblyDataLocator));
 
diff --git a/src/nuget/BlazorLazyLoading.Wasm/StartupExtensions.cs b/src/nuget/BlazorLazyLoading.Wasm/StartupExtensions.cs
@@ -20,8 +20,7 @@ public static IServiceCollection AddLazyLoading(
             LazyLoadingOptions options)
         {
             services.AddSingleton<IAssemblyLoader>(CreateAssemblyLoader);
-
-            services.AddSingleton<IAssemblyLoadContextFactory, AppDomainAssemblyLoadContextFactory>();
+            services.AddSingleton<IAssemblyLoadContext, AppDomainAssemblyLoadContext>();
             services.AddSingleton(typeof(IAssemblyDataLocator), options.AssemblyDataLocator ?? typeof(AssemblyDataLocator));
             services.AddSingleton<IContentFileReader, NetworkContentFileReader>();
             services.AddSingleton<IAssemblyDataProvider, AssemblyDataProvider>();
diff --git a/src/src/AssemblyLoader.Server/Services/DisposableAssemblyLoadContext.cs b/src/src/AssemblyLoader.Server/Services/DisposableAssemblyLoadContext.cs
@@ -43,15 +43,14 @@ public ICollection<Assembly> AllAssemblies
             }
         }
 
-        public DisposableAssemblyLoadContext(
-            string name)
+        public DisposableAssemblyLoadContext()
         {
             // visual studio crashes randomly when unloading assemblies with the debugger attached
             // https://github.com/dotnet/runtime/issues/535
             _canBeUnloaded = !Debugger.IsAttached;
 
             _assemblyLoadContext = new AssemblyLoadContext(
-                name: name,
+                name: Guid.NewGuid().ToString(),
                 isCollectible: _canBeUnloaded);
         }
 
diff --git a/src/src/AssemblyLoader.Server/Services/DisposableAssemblyLoadContextFactory.cs b/src/src/AssemblyLoader.Server/Services/DisposableAssemblyLoadContextFactory.cs
diff --git a/src/src/AssemblyLoader.Wasm/Services/AppDomainAssemblyLoadContext.cs b/src/src/AssemblyLoader.Wasm/Services/AppDomainAssemblyLoadContext.cs
@@ -9,19 +9,19 @@
 
 namespace BlazorLazyLoading.Wasm.Services
 {
-    internal sealed class AppDomainAssemblyLoadContext : IAssemblyLoadContext
+    public sealed class AppDomainAssemblyLoadContext : IAssemblyLoadContext
     {
         private readonly object _domainLock = new object();
         private readonly AppDomain _baseDomain;
         private AppDomain? _domain;
 
-        public AppDomainAssemblyLoadContext(string name)
+        public AppDomainAssemblyLoadContext()
         {
             _baseDomain = AppDomain.CurrentDomain;
 
             try
             {
-                _domain = AppDomain.CreateDomain(name);
+                _domain = AppDomain.CreateDomain(Guid.NewGuid().ToString());
             }
             catch
             {
diff --git a/src/src/AssemblyLoader.Wasm/Services/AppDomainAssemblyLoadContextFactory.cs b/src/src/AssemblyLoader.Wasm/Services/AppDomainAssemblyLoadContextFactory.cs
diff --git a/src/src/AssemblyLoader/Abstractions/IAssemblyLoadContextFactory.cs b/src/src/AssemblyLoader/Abstractions/IAssemblyLoadContextFactory.cs
diff --git a/src/src/AssemblyLoader/Services/AssemblyLoader.cs b/src/src/AssemblyLoader/Services/AssemblyLoader.cs
@@ -14,7 +14,7 @@
 
 namespace BlazorLazyLoading.Services
 {
-    public sealed class AssemblyLoader : IAssemblyLoader, IDisposable
+    public sealed class AssemblyLoader : IAssemblyLoader
     {
         private readonly IAssemblyDataProvider _assemblyDataProvider;
 
@@ -24,10 +24,10 @@ public sealed class AssemblyLoader : IAssemblyLoader, IDisposable
 
         public AssemblyLoader(
             IAssemblyDataProvider assemblyDataProvider,
-            IAssemblyLoadContextFactory assemblyLoadContextFactory)
+            IAssemblyLoadContext assemblyLoadContext)
         {
             _assemblyDataProvider = assemblyDataProvider;
-            _assemblyLoadContext = assemblyLoadContextFactory.Create(Guid.NewGuid().ToString());
+            _assemblyLoadContext = assemblyLoadContext;
 
             _loadingAssemblies = new ConcurrentDictionary<AssemblyName, Task<Assembly?>>(
                 AssemblyByNameAndVersionComparer.Default);
@@ -43,15 +43,6 @@ public void UnsubscribeOnAssemblyLoad(Func<Assembly, Task> callback)
             _onAssemblyLoad.Remove(callback);
         }
 
-        public void Dispose()
-        {
-            if (_assemblyLoadContext != null)
-            {
-                _assemblyLoadContext.Dispose();
-                _assemblyLoadContext = null;
-            }
-        }
-
         public Assembly? GetLoadedAssemblyByName(AssemblyName assemblyName)
         {
             IAssemblyComparer comparer = GetAssemblyNameComparer(assemblyName);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+@using Microsoft.AspNetCore.Components.Web`
Original file line number	Diff line number	Diff line change
`@@ -163,8 +163,8 @@ app {`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`.sidebar {`
`166`		`- width: 250px;`
`167`		`- height: 100vh;`
	`166`	`+ width: 300px;`
	`167`	`+ min-height: 100vh;`
`168`	`168`	`position: sticky;`
`169`	`169`	`top: 0;`
`170`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,14 @@ public static IServiceCollection AddLazyLoading(`
`26`	`26`	`if (options.UseAssemblyIsolation)`
`27`	`27`	`{`
`28`	`28`	`services.AddScoped<IAssemblyLoader>(CreateAssemblyLoader);`
	`29`	`+ services.AddScoped<IAssemblyLoadContext, DisposableAssemblyLoadContext>();`
`29`	`30`	`}`
`30`	`31`	`else`
`31`	`32`	`{`
`32`	`33`	`services.AddSingleton<IAssemblyLoader>(CreateAssemblyLoader);`
	`34`	`+ services.AddSingleton<IAssemblyLoadContext, DisposableAssemblyLoadContext>();`
`33`	`35`	`}`
`34`	`36`
`35`		`- services.AddSingleton<IAssemblyLoadContextFactory, DisposableAssemblyLoadContextFactory>();`
`36`	`37`	`services.AddSingleton<IAssemblyDataProvider, AssemblyDataProvider>();`
`37`	`38`	`services.AddSingleton(typeof(IAssemblyDataLocator), options.AssemblyDataLocator ?? typeof(AssemblyDataLocator));`
`38`	`39`
Original file line number	Diff line number	Diff line change
`@@ -43,15 +43,14 @@ public ICollection<Assembly> AllAssemblies`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`		`- public DisposableAssemblyLoadContext(`
`47`		`- string name)`
	`46`	`+ public DisposableAssemblyLoadContext()`
`48`	`47`	`{`
`49`	`48`	`// visual studio crashes randomly when unloading assemblies with the debugger attached`
`50`	`49`	`// https://github.com/dotnet/runtime/issues/535`
`51`	`50`	`_canBeUnloaded = !Debugger.IsAttached;`
`52`	`51`
`53`	`52`	`_assemblyLoadContext = new AssemblyLoadContext(`
`54`		`- name: name,`
	`53`	`+ name: Guid.NewGuid().ToString(),`
`55`	`54`	`isCollectible: _canBeUnloaded);`
`56`	`55`	`}`
`57`	`56`
Original file line number	Diff line number	Diff line change
`@@ -9,19 +9,19 @@`
`9`	`9`
`10`	`10`	`namespace BlazorLazyLoading.Wasm.Services`
`11`	`11`	`{`
`12`		`- internal sealed class AppDomainAssemblyLoadContext : IAssemblyLoadContext`
	`12`	`+ public sealed class AppDomainAssemblyLoadContext : IAssemblyLoadContext`
`13`	`13`	`{`
`14`	`14`	`private readonly object _domainLock = new object();`
`15`	`15`	`private readonly AppDomain _baseDomain;`
`16`	`16`	`private AppDomain? _domain;`
`17`	`17`
`18`		`- public AppDomainAssemblyLoadContext(string name)`
	`18`	`+ public AppDomainAssemblyLoadContext()`
`19`	`19`	`{`
`20`	`20`	`_baseDomain = AppDomain.CurrentDomain;`
`21`	`21`
`22`	`22`	`try`
`23`	`23`	`{`
`24`		`- _domain = AppDomain.CreateDomain(name);`
	`24`	`+ _domain = AppDomain.CreateDomain(Guid.NewGuid().ToString());`
`25`	`25`	`}`
`26`	`26`	`catch`
`27`	`27`	`{`