aspnetcore/modules/JavaScriptServices

commit 0c77224f46dd6a0f3d72352a5a44d0d6abee3e22
Author: Steve Sanderson <[email protected]>
Date:   Thu Nov 9 10:44:30 2017 -0800

    Allow prerendering middleware to pass through non-prerendered responses (important when using dev middleware)

diff --git a/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/SpaPrerenderingExtensions.cs b/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/SpaPrerenderingExtensions.cs
index 554414f887f..dfb6a17712b 100644
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/SpaPrerenderingExtensions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/SpaPrerenderingExtensions.cs
@@ -113,21 +113,19 @@ namespace Microsoft.AspNetCore.Builder
                         context.Response.Body = originalResponseStream;
                     }
 
-                    // If it's not a success response, we're not going to have any template HTML
-                    // to pass to the prerenderer.
-                    if (context.Response.StatusCode < 200 || context.Response.StatusCode >= 300)
+                    // If it isn't an HTML page that we can use as the template for prerendering,
+                    //  - ... because it's not text/html
+                    //  - ... or because it's an error
+                    // then prerendering doesn't apply to this request, so just pass through the
+                    // response as-is. Note that the non-text/html case is not an error: this is
+                    // typically how the SPA dev server responses for static content are returned
+                    // in development mode.
+                    var canPrerender = IsSuccessStatusCode(context.Response.StatusCode)
+                        && IsHtmlContentType(context.Response.ContentType);
+                    if (!canPrerender)
                     {
-                        var message = $"Prerendering failed because no HTML template could be obtained. " +
-                            $"Check that your SPA is compiling without errors. " +
-                            $"The {nameof(SpaApplicationBuilderExtensions.UseSpa)}() middleware returned " +
-                            $"a response with status code {context.Response.StatusCode}.";
-                        if (outputBuffer.Length > 0)
-                        {
-                            message += " and the following content: "
-                                + Encoding.UTF8.GetString(outputBuffer.GetBuffer());
-                        }
-
-                        throw new InvalidOperationException(message);
+                        await outputBuffer.CopyToAsync(context.Response.Body);
+                        return;
                     }
 
                     // Most prerendering logic will want to know about the original, unprerendered
@@ -160,6 +158,20 @@ namespace Microsoft.AspNetCore.Builder
             });
         }
 
+        private static bool IsHtmlContentType(string contentType)
+        {
+            if (string.Equals(contentType, "text/html", StringComparison.Ordinal))
+            {
+                return true;
+            }
+
+            return contentType != null
+                && contentType.StartsWith("text/html;", StringComparison.Ordinal);
+        }
+
+        private static bool IsSuccessStatusCode(int statusCode)
+            => statusCode >= 200 && statusCode < 300;
+
         private static void RemoveConditionalRequestHeaders(HttpRequest request)
         {
             request.Headers.Remove(HeaderNames.IfMatch);