[Blazor] Opt-in to use dotnet.boot.js (#60751)

maraf · web-flow · commit e88f8d63b134 · 2025-03-13T20:03:06.000+01:00
diff --git a/src/Components/WebAssembly/Directory.Build.props b/src/Components/WebAssembly/Directory.Build.props
@@ -4,4 +4,8 @@
     <!-- Avoid source build issues with WebAssembly -->
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <WasmBootConfigFileName>dotnet.boot.js</WasmBootConfigFileName>
+  </PropertyGroup>
 </Project>
diff --git a/src/Components/WebAssembly/testassets/CustomBasePathApp/wwwroot/index.html b/src/Components/WebAssembly/testassets/CustomBasePathApp/wwwroot/index.html
@@ -9,6 +9,7 @@
 </head>
 <body>
     <app>Loading...</app>
+    <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>
     <script src="_framework/blazor.webassembly.js"></script>
 </body>
 </html>
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/wwwroot/index.html b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/wwwroot/index.html
@@ -7,6 +7,7 @@
 <body>
     <app>Loading...</app>
     <script src="customJsFileForTests.js"></script>
+    <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>
     <script src="_framework/blazor.webassembly.js" autostart="false"></script>
 
     <!--
@@ -16,7 +17,7 @@
     <script>
         Blazor.start({
             loadBootResource: function (type, name, defaultUri, integrity) {
-                return type === 'dotnetjs'
+                return type === 'dotnetjs' || type === 'manifest'
                     ? `${defaultUri}?customizedbootresource=true`
                     : fetch(defaultUri, { integrity: integrity, cache: 'no-cache', headers: { 'customizedbootresource': 'true' } });
             },
diff --git a/src/Components/WebAssembly/testassets/StandaloneApp/wwwroot/index.html b/src/Components/WebAssembly/testassets/StandaloneApp/wwwroot/index.html
@@ -19,6 +19,7 @@
         <a class="dismiss">🗙</a>
     </div>
 
+    <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>
     <script src="_framework/blazor.webassembly.js" autostart="false"></script>
     <script>
         (function(){
diff --git a/src/Components/WebAssembly/testassets/ThreadingApp.Server/Components/App.razor b/src/Components/WebAssembly/testassets/ThreadingApp.Server/Components/App.razor
@@ -19,6 +19,7 @@
         <a class="dismiss">🗙</a>
     </div>
 
+    <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>
     <script src="@Assets["_framework/blazor.web.js"]"></script>
 </body>
 
diff --git a/src/Components/WebAssembly/testassets/ThreadingApp/wwwroot/index.html b/src/Components/WebAssembly/testassets/ThreadingApp/wwwroot/index.html
@@ -18,6 +18,7 @@
         <a class="dismiss">🗙</a>
     </div>
 
+    <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>
     <script src="_framework/blazor.webassembly.js" autostart="false"></script>
     <script>
         (function(){
diff --git a/src/Components/WebAssembly/testassets/Wasm.Prerendered.Server/Pages/_Layout.cshtml b/src/Components/WebAssembly/testassets/Wasm.Prerendered.Server/Pages/_Layout.cshtml
@@ -13,6 +13,7 @@
 <body>
     @RenderBody()
 
+    <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>
     <script src="_framework/blazor.webassembly.js" autostart="false"></script>
     <script>
         function start() {
diff --git a/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs b/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs
@@ -43,7 +43,7 @@ public void CachesResourcesAfterFirstLoad()
         Navigate("/");
         WaitUntilLoaded();
         var initialResourcesRequested = GetAndClearRequestedPaths();
-        Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/blazor.boot.json", StringComparison.Ordinal)));
+        Assert.NotEmpty(initialResourcesRequested.Where(path => path.Contains(".boot.js", StringComparison.Ordinal)));
         Assert.NotEmpty(initialResourcesRequested.Where(path =>
             path.Contains("/dotnet.native.", StringComparison.Ordinal) &&
             path.EndsWith(".wasm", StringComparison.Ordinal)));
@@ -52,14 +52,14 @@ public void CachesResourcesAfterFirstLoad()
             !path.Contains("/dotnet.native.", StringComparison.Ordinal) &&
             path.EndsWith(".wasm", StringComparison.Ordinal)));
 
-        // On subsequent loads, we skip the items referenced from blazor.boot.json
+        // On subsequent loads, we skip the items referenced from blazor.boot.json or dotnet.boot.js
         // which includes .wasm (original .dll) files and dotnet.native.[fingerprint].wasm
         Navigate("about:blank");
         Browser.Equal(string.Empty, () => Browser.Title);
         Navigate("/");
         WaitUntilLoaded();
         var subsequentResourcesRequested = GetAndClearRequestedPaths();
-        Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/blazor.boot.json", StringComparison.Ordinal)));
+        Assert.NotEmpty(initialResourcesRequested.Where(path => path.Contains(".boot.js", StringComparison.Ordinal)));
         Assert.DoesNotContain(subsequentResourcesRequested, path =>
             path.Contains("/dotnet.native.", StringComparison.Ordinal) &&
             path.EndsWith(".wasm", StringComparison.Ordinal));
diff --git a/src/Components/test/testassets/BasicTestApp/wwwroot/index.html b/src/Components/test/testassets/BasicTestApp/wwwroot/index.html
@@ -53,6 +53,7 @@
             return Blazor.runtime.runtimeBuildInfo.buildConfiguration;
         }
     </script>
+    <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>
     <script src="_framework/blazor.webassembly.js" autostart="false"></script>
 
     <script>
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/Client/MultipleComponentsLayout.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/Client/MultipleComponentsLayout.cshtml
@@ -33,6 +33,7 @@
 
     <button id="load-boot-script" onclick="start()">Load boot script</button>
 
+    <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>
     <script src="_framework/blazor.webassembly.js" autostart="false"></script>
     <script src="js/jsRootComponentInitializers.js"></script>
     <script>
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml
@@ -40,7 +40,7 @@
                 <component render-mode="ServerPrerendered" type="typeof(PreserveStateComponent)" param-State="@state1"></component>
                 @* State can change after a component has rendered, when this happens the output will not be updated during prerendering
                    and will have to wait until the app restarts in interactive mode.
-                *@ 
+                *@
                 PreserveService.NewState();
                 <component render-mode="ServerPrerendered" type="typeof(PreserveStateComponent)" param-State="@state2"></component>
                 break;
@@ -57,7 +57,7 @@
 
         @* This is just to show that the state of a service can still change after the component has rendered and it's the component
            responsibility to deal with updates after the initial render
-        *@ 
+        *@
         <p>
             Service state after components have rendered: <span id="service-state">@PreserveService.Guid</span>
         </p>
@@ -66,7 +66,7 @@
 
         PreserveService.NewState();
 
-        @* This is just to show that this state will be lost and not restored since the state was persisted before *@ 
+        @* This is just to show that this state will be lost and not restored since the state was persisted before *@
         <p>
             Service state after state has been persisted: <span id="service-state-after">@PreserveService.Guid</span>
         </p>
@@ -128,6 +128,7 @@
     }
     else
     {
+        <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>
         <script src="_framework/blazor.webassembly.js" autostart="false"></script>
     }
 
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
@@ -23,6 +23,7 @@
             elementToFocus.focus();
         }
     </script>
+    <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>
     <script src="@Assets["_framework/blazor.web.js"]" autostart="false" suppress-error="BL9992"></script>
     <script src="_content/TestContentPackage/counterInterop.js"></script>
     <script src="js/circuitContextTest.js"></script>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/GlobalInteractivityApp.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/GlobalInteractivityApp.razor
@@ -7,6 +7,7 @@
 </head>
 <body>
     <Components.WasmMinimal.Routes @rendermode="@PageRenderMode" />
+    <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>
     <script src="@Assets["_framework/blazor.web.js"]" autostart="false"></script>
     <script>
         Blazor.start({
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor
@@ -10,6 +10,7 @@
 <body>
     <h1 id="ready">Form test cases</h1>
     <NamedFormContextNoFormContextLayout />
+    <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>
     <script src="@Assets["_framework/blazor.web.js"]" suppress-error="BL9992"></script>
 </body>
 </html>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor
@@ -10,6 +10,7 @@
 
 <body>
     <Components.WasmRemoteAuthentication.Routes @rendermode="new InteractiveWebAssemblyRenderMode(prerender: false)" />
+    <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>
     <script src="@Assets["_framework/blazor.web.js"]" autostart="false"></script>
     <script src="_content/Microsoft.AspNetCore.Components.WebAssembly.Authentication/AuthenticationService.js"></script>
     <script>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor
@@ -11,6 +11,7 @@
 <body>
     <ServerApp @rendermode="@RenderMode.InteractiveServer" />
 
+    <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>
     <script src="@Assets["_framework/blazor.web.js"]" autostart="false"></script>
     <script>
         const suppressEnhancedNavigation = sessionStorage.getItem('suppress-enhanced-navigation') === 'true';
diff --git a/src/Components/test/testassets/Directory.Build.props b/src/Components/test/testassets/Directory.Build.props
@@ -19,4 +19,8 @@
       <_Parameter2>true</_Parameter2>
     </AssemblyAttribute>
   </ItemGroup>
+
+  <PropertyGroup>
+    <WasmBootConfigFileName>dotnet.boot.js</WasmBootConfigFileName>
+  </PropertyGroup>
 </Project>
diff --git a/src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html b/src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html
@@ -7,6 +7,7 @@
 <body>
     <div id="blazor-error-ui">Error</div>
     <app>Loading...</app>
+    <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>
     <script src="_framework/blazor.webassembly.js" autostart="false"></script>
     <script>
         (function(){

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@`
`53`	`53`	`return Blazor.runtime.runtimeBuildInfo.buildConfiguration;`
`54`	`54`	`}`
`55`	`55`	`</script>`
	`56`	`+ <script>window["__DOTNET_INTERNAL_BOOT_CONFIG_SRC"] = "dotnet.boot.js";</script>`
`56`	`57`	`<script src="_framework/blazor.webassembly.js" autostart="false"></script>`
`57`	`58`
`58`	`59`	`<script>`