PR feedback

Author: MackinnonBuck

src/Components/WebAssembly/DevServer/src/Server/Startup.cs

@@ -35,18 +35,17 @@ public static void Configure(IApplicationBuilder app, IConfiguration configurati
 
         app.Use(async (ctx, next) =>
         {
-            if (ctx.Request.Path.StartsWithSegments("/_framework") && !ctx.Request.Path.StartsWithSegments("/_framework/blazor.server.js") && !ctx.Request.Path.StartsWithSegments("/_framework/blazor.web.js"))
+            if (ctx.Request.Path.StartsWithSegments("/_framework/blazor.boot.json"))
             {
                 ctx.Response.Headers.Append("Blazor-Environment", webHostEnvironment.EnvironmentName);
-
-                if (applyCopHeaders)
+            }
+            else if (applyCopHeaders && ctx.Request.Path.StartsWithSegments("/_framework") && !ctx.Request.Path.StartsWithSegments("/_framework/blazor.server.js") && !ctx.Request.Path.StartsWithSegments("/_framework/blazor.web.js"))
+            {
+                var fileExtension = Path.GetExtension(ctx.Request.Path);
+                if (string.Equals(fileExtension, ".js", StringComparison.Ordinal))
                 {
-                    var fileExtension = Path.GetExtension(ctx.Request.Path);
-                    if (string.Equals(fileExtension, ".js", StringComparison.Ordinal))
-                    {
-                        // Browser multi-threaded runtime requires cross-origin policy headers to enable SharedArrayBuffer.
-                        ApplyCrossOriginPolicyHeaders(ctx);
-                    }
+                    // Browser multi-threaded runtime requires cross-origin policy headers to enable SharedArrayBuffer.
+                    ApplyCrossOriginPolicyHeaders(ctx);
                 }
             }
 

src/Components/test/E2ETest/Tests/WebAssemblyConfigurationTest.cs

@@ -37,11 +37,11 @@ public void WebAssemblyConfiguration_Works()
         // Verify values from the default 'appsettings.json' are read.
         Browser.Equal("Default key1-value", () => _appElement.FindElement(By.Id("key1")).Text);
 
-        // Verify that the dev server always correctly serves the 'Blazor-Environment: Development' header.
-        Browser.Equal("Development", () => _appElement.FindElement(By.Id("environment")).Text);
-
         if (_serverFixture.TestTrimmedOrMultithreadingApps)
         {
+            // Verify that the environment gets detected as 'Production'.
+            Browser.Equal("Production", () => _appElement.FindElement(By.Id("environment")).Text);
+
             // Verify values overriden by an environment specific 'appsettings.$(Environment).json are read
             Assert.Equal("Prod key2-value", _appElement.FindElement(By.Id("key2")).Text);
 
@@ -50,6 +50,9 @@ public void WebAssemblyConfiguration_Works()
         }
         else
         {
+            // Verify that the dev server always correctly serves the 'Blazor-Environment: Development' header.
+            Browser.Equal("Development", () => _appElement.FindElement(By.Id("environment")).Text);
+
             // Verify values overriden by an environment specific 'appsettings.$(Environment).json are read
             Assert.Equal("Development key2-value", _appElement.FindElement(By.Id("key2")).Text);