Address feedback

Author: captainsafia

src/Components/Endpoints/src/DependencyInjection/RazorComponentsServiceCollectionExtensions.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics.CodeAnalysis;
+using System.Reflection.Metadata;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Endpoints;
 using Microsoft.AspNetCore.Components.Endpoints.DependencyInjection;
@@ -45,7 +46,10 @@ public static IRazorComponentsBuilder AddRazorComponents(this IServiceCollection
         // Endpoints
         services.TryAddSingleton<RazorComponentEndpointDataSourceFactory>();
         services.TryAddSingleton<RazorComponentEndpointFactory>();
-        services.TryAddSingleton<HotReloadService>();
+        if (MetadataUpdater.IsSupported)
+        {
+            services.TryAddSingleton<HotReloadService>();
+        }
         services.TryAddScoped<IRazorComponentEndpointInvoker, RazorComponentEndpointInvoker>();
 
         // Common services required for components server side rendering

src/Components/Web.JS/dist/Release/blazor.server.js

@@ -18,6 +18,7 @@ import { attachStreamingRenderingListener } from './Rendering/StreamingRendering
 import { attachProgressivelyEnhancedNavigationListener } from './Services/NavigationEnhancement';
 import { WebRootComponentManager } from './Services/WebRootComponentManager';
 import { attachComponentDescriptorHandler, registerAllComponentDescriptors } from './Rendering/DomMerging/DomSync';
+import { hasProgrammaticEnhancedNavigationHandler, performProgrammaticEnhancedNavigation } from './Services/NavigationUtils';
 
 let started = false;
 const rootComponentManager = new WebRootComponentManager();
@@ -30,6 +31,14 @@ function boot(options?: Partial<WebStartOptions>) : Promise<void> {
   started = true;
 
   Blazor._internal.loadWebAssemblyQuicklyTimeout = 3000;
+  // Definedh ere to avoid inadvertently imported enhanced navigation
+  // related APIs in WebAssembly or Blazor Server contexts.
+  Blazor._internal.hotReloadApplied = () => {
+    if (hasProgrammaticEnhancedNavigationHandler())
+    {
+      performProgrammaticEnhancedNavigation(location.href, false);
+    }
+  }
 
   setCircuitOptions(options?.circuit);
   setWebAssemblyOptions(options?.webAssembly);

src/Components/Web.JS/dist/Release/blazor.web.js

@@ -18,7 +18,6 @@ import { RootComponentsFunctions } from './Rendering/JSRootComponents';
 import { attachWebRendererInterop } from './Rendering/WebRendererInteropMethods';
 import { WebStartOptions } from './Platform/WebStartOptions';
 import { RuntimeAPI } from 'dotnet';
-import { hasProgrammaticEnhancedNavigationHandler, performProgrammaticEnhancedNavigation } from './Services/NavigationUtils';
 
 // TODO: It's kind of hard to tell which .NET platform(s) some of these APIs are relevant to.
 // It's important to know this information when dealing with the possibility of mulitple .NET platforms being available.
@@ -87,8 +86,7 @@ interface IBlazor {
     // APIs invoked by hot reload
     applyHotReload?: (id: string, metadataDelta: string, ilDelta: string, pdbDelta: string | undefined) => void;
     getApplyUpdateCapabilities?: () => string;
-    performProgrammaticEnhancedNavigation: (absoluteInternalHref: string, replace: boolean) => void;
-    hasProgrammaticEnhancedNavigationHandler: () => boolean;
+    hotReloadApplied?: () => void;
   }
 }
 
@@ -106,9 +104,7 @@ export const Blazor: IBlazor = {
     InputFile,
     NavigationLock,
     getJSDataStreamChunk: getNextChunk,
-    attachWebRendererInterop,
-    performProgrammaticEnhancedNavigation,
-    hasProgrammaticEnhancedNavigationHandler
+    attachWebRendererInterop
   },
 };