From 70cdf11f76b0eeb4dcc235665e3502b236b9f444 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 11 Jan 2019 16:14:11 +0000 Subject: [PATCH] Make Razor Components apps not use Blazor build (#6562) * Replace UseServerSideBlazor with UseRazorComponents, which doesn't require Blazor build artifacts * Make UseRazorComponents serve blazor.server.js from embedded resource ... so we don't need a build step to put it on disk somewhere. * Fix TestServer * Update ComponentsApp not to use Blazor build targets * Update ComponentsApp.App sample to use new build package * Update string constant in test * Rename blazor.*.js to components.*.js * Ensure correct build order * Update nav menu title in Components sample app * Fix remaining paths * Switch ComponentsApp.App to use Sdk="Microsoft.NET.Sdk.Razor" * Update mono.cecil version * CR: Replace FrameworkFilesProvider with EmbeddedFileProvider * CR: Use ManifestEmbeddedFileProvider --- .../wwwroot/blazor-frame.html | 2 +- .../HostedInAspNet.Client/wwwroot/index.html | 2 +- .../samples/StandaloneApp/wwwroot/index.html | 2 +- .../Microsoft.AspNetCore.Blazor.Build.csproj | 6 +- .../Microsoft.AspNetCore.Blazor.Build.nuspec | 2 +- .../ReferenceFromSource.props | 2 +- .../targets/Blazor.MonoRuntime.props | 2 +- .../Microsoft.AspNetCore.Blazor.Server.csproj | 2 +- .../wwwroot/index.html | 2 +- .../wwwroot/index.html | 2 +- ...rosoft.AspNetCore.Blazor.Build.Test.csproj | 1 - src/Components/build/dependencies.props | 1 + .../samples/ComponentsApp.App/App.cshtml | 4 +- .../ComponentsApp.App.csproj | 25 ++--- .../samples/ComponentsApp.App/Program.cs | 14 --- .../ComponentsApp.App/Shared/NavMenu.cshtml | 4 +- .../samples/ComponentsApp.Server/Startup.cs | 11 +-- .../wwwroot/css/bootstrap/bootstrap.min.css | 0 .../css/bootstrap/bootstrap.min.css.map | 0 .../wwwroot/css/open-iconic/FONT-LICENSE | 0 .../wwwroot/css/open-iconic/ICON-LICENSE | 0 .../wwwroot/css/open-iconic/README.md | 0 .../font/css/open-iconic-bootstrap.min.css | 0 .../open-iconic/font/fonts/open-iconic.eot | Bin .../open-iconic/font/fonts/open-iconic.otf | Bin .../open-iconic/font/fonts/open-iconic.svg | 0 .../open-iconic/font/fonts/open-iconic.ttf | Bin .../open-iconic/font/fonts/open-iconic.woff | Bin .../wwwroot/css/site.css | 0 .../wwwroot/index.html | 4 +- ...ft.AspNetCore.Components.Browser.JS.csproj | 8 +- .../webpack.config.js | 4 +- .../BlazorApplicationBuilderExtensions.cs | 2 +- ...rComponentsApplicationBuilderExtensions.cs | 91 ++++++++++++++++++ .../Builder/RazorComponentsOptions.cs | 23 +++++ ...rSideBlazorApplicationBuilderExtensions.cs | 76 --------------- ...rComponentsServiceCollectionExtensions.cs} | 48 +++------ ...rosoft.AspNetCore.Components.Server.csproj | 9 +- .../ServerExecutionTests/ServerSideAppTest.cs | 2 +- .../testapps/BasicTestApp/wwwroot/index.html | 6 +- .../test/testapps/TestServer/Startup.cs | 2 +- 41 files changed, 185 insertions(+), 174 deletions(-) delete mode 100644 src/Components/samples/ComponentsApp.App/Program.cs rename src/Components/samples/{ComponentsApp.App => ComponentsApp.Server}/wwwroot/css/bootstrap/bootstrap.min.css (100%) rename src/Components/samples/{ComponentsApp.App => ComponentsApp.Server}/wwwroot/css/bootstrap/bootstrap.min.css.map (100%) rename src/Components/samples/{ComponentsApp.App => ComponentsApp.Server}/wwwroot/css/open-iconic/FONT-LICENSE (100%) rename src/Components/samples/{ComponentsApp.App => ComponentsApp.Server}/wwwroot/css/open-iconic/ICON-LICENSE (100%) rename src/Components/samples/{ComponentsApp.App => ComponentsApp.Server}/wwwroot/css/open-iconic/README.md (100%) rename src/Components/samples/{ComponentsApp.App => ComponentsApp.Server}/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css (100%) rename src/Components/samples/{ComponentsApp.App => ComponentsApp.Server}/wwwroot/css/open-iconic/font/fonts/open-iconic.eot (100%) rename src/Components/samples/{ComponentsApp.App => ComponentsApp.Server}/wwwroot/css/open-iconic/font/fonts/open-iconic.otf (100%) rename src/Components/samples/{ComponentsApp.App => ComponentsApp.Server}/wwwroot/css/open-iconic/font/fonts/open-iconic.svg (100%) rename src/Components/samples/{ComponentsApp.App => ComponentsApp.Server}/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf (100%) rename src/Components/samples/{ComponentsApp.App => ComponentsApp.Server}/wwwroot/css/open-iconic/font/fonts/open-iconic.woff (100%) rename src/Components/samples/{ComponentsApp.App => ComponentsApp.Server}/wwwroot/css/site.css (100%) rename src/Components/samples/{ComponentsApp.App => ComponentsApp.Server}/wwwroot/index.html (76%) create mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/RazorComponentsApplicationBuilderExtensions.cs create mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/RazorComponentsOptions.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/ServerSideBlazorApplicationBuilderExtensions.cs rename src/Components/src/Microsoft.AspNetCore.Components.Server/DependencyInjection/{ServerSideBlazorServiceCollectionExtensions.cs => RazorComponentsServiceCollectionExtensions.cs} (70%) diff --git a/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/wwwroot/blazor-frame.html b/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/wwwroot/blazor-frame.html index 59a2dc0063..e93b5f8d82 100644 --- a/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/wwwroot/blazor-frame.html +++ b/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/wwwroot/blazor-frame.html @@ -19,6 +19,6 @@ Loading... - + diff --git a/src/Components/blazor/samples/HostedInAspNet.Client/wwwroot/index.html b/src/Components/blazor/samples/HostedInAspNet.Client/wwwroot/index.html index a47b1ad84e..7defbfa816 100644 --- a/src/Components/blazor/samples/HostedInAspNet.Client/wwwroot/index.html +++ b/src/Components/blazor/samples/HostedInAspNet.Client/wwwroot/index.html @@ -7,6 +7,6 @@ Loading... - + diff --git a/src/Components/blazor/samples/StandaloneApp/wwwroot/index.html b/src/Components/blazor/samples/StandaloneApp/wwwroot/index.html index 5da6ba26b3..663e9776c1 100644 --- a/src/Components/blazor/samples/StandaloneApp/wwwroot/index.html +++ b/src/Components/blazor/samples/StandaloneApp/wwwroot/index.html @@ -11,6 +11,6 @@ Loading... - + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj index 7d01b1095d..c68831682f 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj @@ -43,8 +43,8 @@ - - + + @@ -72,7 +72,7 @@ - + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec index 84e70c3a59..7a8a465048 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec @@ -22,6 +22,6 @@ - + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/ReferenceFromSource.props b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/ReferenceFromSource.props index 45c157f1fd..0d1f091e35 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/ReferenceFromSource.props +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/ReferenceFromSource.props @@ -13,7 +13,7 @@ true - $(MSBuildThisFileDirectory)../../../src/Microsoft.AspNetCore.Components.Browser.JS/dist/blazor.*.js + $(MSBuildThisFileDirectory)../../../src/Microsoft.AspNetCore.Components.Browser.JS/dist/components.*.js diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.props b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.props index 20b8d90fcf..d15e156b1d 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.props +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.props @@ -1,7 +1,7 @@ - $(MSBuildThisFileDirectory)../tools/blazor/blazor.*.js + $(MSBuildThisFileDirectory)../tools/blazor/components.*.js diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/Microsoft.AspNetCore.Blazor.Server.csproj b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/Microsoft.AspNetCore.Blazor.Server.csproj index f8c5cb8ae7..b69e5a6741 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/Microsoft.AspNetCore.Blazor.Server.csproj +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/Microsoft.AspNetCore.Blazor.Server.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/index.html b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/index.html index f7e0e86795..f58f6b62cb 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/index.html +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/index.html @@ -11,6 +11,6 @@ Loading... - + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/index.html b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/index.html index f0f4c327c3..88d5d43394 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/index.html +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/index.html @@ -11,6 +11,6 @@ Loading... - + diff --git a/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj index 733a46a277..8003e51a88 100644 --- a/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj +++ b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj @@ -26,7 +26,6 @@ - diff --git a/src/Components/build/dependencies.props b/src/Components/build/dependencies.props index 352039e112..ac2a0ed17d 100644 --- a/src/Components/build/dependencies.props +++ b/src/Components/build/dependencies.props @@ -12,6 +12,7 @@ 3.0.0-alpha1-10605 3.0.0-alpha1-10605 3.0.0-alpha1-10605 + 0.10.1 3.0.0-alpha1-10605 0.8.0-preview1-20181122.3 2.1.2 diff --git a/src/Components/samples/ComponentsApp.App/App.cshtml b/src/Components/samples/ComponentsApp.App/App.cshtml index c89d889f5e..adfe72aa7d 100644 --- a/src/Components/samples/ComponentsApp.App/App.cshtml +++ b/src/Components/samples/ComponentsApp.App/App.cshtml @@ -1,5 +1,5 @@ - + diff --git a/src/Components/samples/ComponentsApp.App/ComponentsApp.App.csproj b/src/Components/samples/ComponentsApp.App/ComponentsApp.App.csproj index 9c1aa725fb..6e2b68355e 100644 --- a/src/Components/samples/ComponentsApp.App/ComponentsApp.App.csproj +++ b/src/Components/samples/ComponentsApp.App/ComponentsApp.App.csproj @@ -1,20 +1,21 @@ - + - - netstandard2.0 - Exe - + + netstandard2.0 + - - - - + + - - + + + + - \ No newline at end of file + + + diff --git a/src/Components/samples/ComponentsApp.App/Program.cs b/src/Components/samples/ComponentsApp.App/Program.cs deleted file mode 100644 index e045707788..0000000000 --- a/src/Components/samples/ComponentsApp.App/Program.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace ComponentsApp.App -{ - public class Program - { - public static void Main(string[] args) - { - // TODO: Remove entry point - // Currently it's required because .Components.Build won't generate the boot JSON correctly without seeing an entrypoint - } - } -} diff --git a/src/Components/samples/ComponentsApp.App/Shared/NavMenu.cshtml b/src/Components/samples/ComponentsApp.App/Shared/NavMenu.cshtml index c2824be334..0f4a24e362 100644 --- a/src/Components/samples/ComponentsApp.App/Shared/NavMenu.cshtml +++ b/src/Components/samples/ComponentsApp.App/Shared/NavMenu.cshtml @@ -1,5 +1,5 @@ -
- Blazor app +
+ Razor Components diff --git a/src/Components/samples/ComponentsApp.Server/Startup.cs b/src/Components/samples/ComponentsApp.Server/Startup.cs index f5cacbb478..aa5fcb6945 100644 --- a/src/Components/samples/ComponentsApp.Server/Startup.cs +++ b/src/Components/samples/ComponentsApp.Server/Startup.cs @@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; -using ComponentsApp.App; namespace ComponentsApp.Server { @@ -12,11 +11,7 @@ namespace ComponentsApp.Server { public void ConfigureServices(IServiceCollection services) { - // Adds the Server-Side Blazor services, and those registered by the client startup. - services.AddServerSideBlazor(); - - // Since Blazor is running on the server, we can use an application service - // to read the forecast data. + services.AddRazorComponents(); services.AddSingleton(); } @@ -27,8 +22,8 @@ namespace ComponentsApp.Server app.UseDeveloperExceptionPage(); } - // Use component registrations and static files from the client startup. - app.UseServerSideBlazor(); + app.UseStaticFiles(); + app.UseRazorComponents(); } } } diff --git a/src/Components/samples/ComponentsApp.App/wwwroot/css/bootstrap/bootstrap.min.css b/src/Components/samples/ComponentsApp.Server/wwwroot/css/bootstrap/bootstrap.min.css similarity index 100% rename from src/Components/samples/ComponentsApp.App/wwwroot/css/bootstrap/bootstrap.min.css rename to src/Components/samples/ComponentsApp.Server/wwwroot/css/bootstrap/bootstrap.min.css diff --git a/src/Components/samples/ComponentsApp.App/wwwroot/css/bootstrap/bootstrap.min.css.map b/src/Components/samples/ComponentsApp.Server/wwwroot/css/bootstrap/bootstrap.min.css.map similarity index 100% rename from src/Components/samples/ComponentsApp.App/wwwroot/css/bootstrap/bootstrap.min.css.map rename to src/Components/samples/ComponentsApp.Server/wwwroot/css/bootstrap/bootstrap.min.css.map diff --git a/src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/FONT-LICENSE b/src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/FONT-LICENSE similarity index 100% rename from src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/FONT-LICENSE rename to src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/FONT-LICENSE diff --git a/src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/ICON-LICENSE b/src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/ICON-LICENSE similarity index 100% rename from src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/ICON-LICENSE rename to src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/ICON-LICENSE diff --git a/src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/README.md b/src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/README.md similarity index 100% rename from src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/README.md rename to src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/README.md diff --git a/src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css similarity index 100% rename from src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css rename to src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css diff --git a/src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.eot similarity index 100% rename from src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.eot rename to src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.eot diff --git a/src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.otf similarity index 100% rename from src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.otf rename to src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.otf diff --git a/src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.svg similarity index 100% rename from src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.svg rename to src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.svg diff --git a/src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf similarity index 100% rename from src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf rename to src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf diff --git a/src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.woff similarity index 100% rename from src/Components/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.woff rename to src/Components/samples/ComponentsApp.Server/wwwroot/css/open-iconic/font/fonts/open-iconic.woff diff --git a/src/Components/samples/ComponentsApp.App/wwwroot/css/site.css b/src/Components/samples/ComponentsApp.Server/wwwroot/css/site.css similarity index 100% rename from src/Components/samples/ComponentsApp.App/wwwroot/css/site.css rename to src/Components/samples/ComponentsApp.Server/wwwroot/css/site.css diff --git a/src/Components/samples/ComponentsApp.App/wwwroot/index.html b/src/Components/samples/ComponentsApp.Server/wwwroot/index.html similarity index 76% rename from src/Components/samples/ComponentsApp.App/wwwroot/index.html rename to src/Components/samples/ComponentsApp.Server/wwwroot/index.html index f384a0965c..b432fd88f8 100644 --- a/src/Components/samples/ComponentsApp.App/wwwroot/index.html +++ b/src/Components/samples/ComponentsApp.Server/wwwroot/index.html @@ -3,7 +3,7 @@ - Server Side Blazor + Razor Components @@ -11,6 +11,6 @@ Loading... - + diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.csproj b/src/Components/src/Microsoft.AspNetCore.Components.Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.csproj index e399936952..0be6f3c57f 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.csproj +++ b/src/Components/src/Microsoft.AspNetCore.Components.Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netstandard2.0 JavaScript runtime files needed for ASP.NET Core Components browser rendering. true Latest @@ -22,13 +22,13 @@ - + - - + + diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Browser.JS/webpack.config.js b/src/Components/src/Microsoft.AspNetCore.Components.Browser.JS/webpack.config.js index f216fd1cc7..14b0f6c5cb 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Browser.JS/webpack.config.js +++ b/src/Components/src/Microsoft.AspNetCore.Components.Browser.JS/webpack.config.js @@ -8,8 +8,8 @@ module.exports = (env, args) => ({ rules: [{ test: /\.ts?$/, loader: 'ts-loader' }] }, entry: { - 'blazor.webassembly': './src/Boot.WebAssembly.ts', - 'blazor.server': './src/Boot.Server.ts', + 'components.webassembly': './src/Boot.WebAssembly.ts', + 'components.server': './src/Boot.Server.ts', }, output: { path: path.join(__dirname, '/dist'), filename: '[name].js' } }); diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/BlazorApplicationBuilderExtensions.cs b/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/BlazorApplicationBuilderExtensions.cs index 7d45e243f9..e781433271 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/BlazorApplicationBuilderExtensions.cs +++ b/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/BlazorApplicationBuilderExtensions.cs @@ -135,7 +135,7 @@ namespace Microsoft.AspNetCore.Builder return null; } - private static void SetCacheHeaders(StaticFileResponseContext ctx) + internal static void SetCacheHeaders(StaticFileResponseContext ctx) { // By setting "Cache-Control: no-cache", we're allowing the browser to store // a cached copy of the response, but telling it that it must check with the diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/RazorComponentsApplicationBuilderExtensions.cs b/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/RazorComponentsApplicationBuilderExtensions.cs new file mode 100644 index 0000000000..b20efd7650 --- /dev/null +++ b/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/RazorComponentsApplicationBuilderExtensions.cs @@ -0,0 +1,91 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Components.Server; +using Microsoft.AspNetCore.Components.Server.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.FileProviders; + +namespace Microsoft.AspNetCore.Builder +{ + /// + /// Extension methods to configure an for serving interactive components. + /// + public static class RazorComponentsApplicationBuilderExtensions + { + /// + /// Adds middleware for serving interactive Razor Components. + /// + /// The . + /// A components app startup type. + /// The . + public static IApplicationBuilder UseRazorComponents( + this IApplicationBuilder builder) + { + return UseRazorComponents(builder, null); + } + + /// + /// Adds middleware for serving interactive Razor Components. + /// + /// The . + /// A callback that can be used to configure the middleware. + /// A components app startup type. + /// The . + public static IApplicationBuilder UseRazorComponents( + this IApplicationBuilder builder, + Action configure) + { + if (builder == null) + { + throw new ArgumentNullException(nameof(builder)); + } + + var options = new RazorComponentsOptions(); + configure?.Invoke(options); + + // The use case for this flag is when developers want to add their own + // SignalR middleware, e.g., when using Azure SignalR. By default we + // add SignalR and BlazorHub automatically. + if (options.UseSignalRWithBlazorHub) + { + builder.UseSignalR(route => route.MapHub(BlazorHub.DefaultPath)); + } + + // Use embedded static content for /_framework + builder.Map("/_framework", frameworkBuilder => + { + UseFrameworkFiles(frameworkBuilder); + }); + + // Use SPA fallback routing for anything else + builder.UseSpa(spa => { }); + + return builder; + } + + private static void UseFrameworkFiles(IApplicationBuilder builder) + { + builder.UseStaticFiles(new StaticFileOptions + { + FileProvider = new ManifestEmbeddedFileProvider( + typeof(RazorComponentsApplicationBuilderExtensions).Assembly, + "frameworkFiles"), + OnPrepareResponse = BlazorApplicationBuilderExtensions.SetCacheHeaders + }); + + // TODO: Remove this + // This is needed temporarily only until we implement a proper version + // of library-embedded static resources for Razor Components apps. + builder.Map("/blazor.boot.json", bootJsonBuilder => + { + bootJsonBuilder.Use(async (ctx, next) => + { + ctx.Response.ContentType = "application/json"; + await ctx.Response.WriteAsync(@"{ ""cssReferences"": [], ""jsReferences"": [] }"); + }); + }); + } + } +} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/RazorComponentsOptions.cs b/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/RazorComponentsOptions.cs new file mode 100644 index 0000000000..c8399ed5e5 --- /dev/null +++ b/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/RazorComponentsOptions.cs @@ -0,0 +1,23 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Builder; + +namespace Microsoft.AspNetCore.Components.Server.Builder +{ + /// + /// Specifies options to configure + /// + public class RazorComponentsOptions + { + /// + /// Gets or sets a flag to indicate whether to attach middleware for + /// communicating with interactive components via SignalR. Defaults + /// to true. + /// + /// If the value is set to false, the application must manually add + /// SignalR middleware with . + /// + public bool UseSignalRWithBlazorHub { get; set; } = true; + } +} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/ServerSideBlazorApplicationBuilderExtensions.cs b/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/ServerSideBlazorApplicationBuilderExtensions.cs deleted file mode 100644 index b08618d3f1..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/ServerSideBlazorApplicationBuilderExtensions.cs +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Components.Server; -using Microsoft.AspNetCore.Http; - -namespace Microsoft.AspNetCore.Builder -{ - /// - /// Extension methods to configure an for Server-Side Blazor. - /// These are just shorthand for combining UseSignalR with UseBlazor. - /// - public static class ServerSideBlazorApplicationBuilderExtensions - { - /// - /// Registers Server-Side Blazor in the pipeline. - /// - /// The . - /// A Blazor startup type. - /// The . - public static IApplicationBuilder UseServerSideBlazor( - this IApplicationBuilder builder) - { - if (builder == null) - { - throw new ArgumentNullException(nameof(builder)); - } - - // WARNING: Don't add extra setup logic here. It's important for - // UseServerSideBlazor just to be shorthand for UseSignalR+UseBlazor, - // so that people who want to call those two manually instead can - // also do so. That's needed for people using Azure SignalR. - - // TODO: Also allow configuring the endpoint path. - return UseSignalRWithBlazorHub(builder, BlazorHub.DefaultPath) - .UseBlazor(); - } - - /// - /// Registers Server-Side Blazor in the pipeline. - /// - /// The . - /// A instance used to configure the Blazor file provider. - /// The . - public static IApplicationBuilder UseServerSideBlazor( - this IApplicationBuilder builder, - BlazorOptions options) - { - if (builder == null) - { - throw new ArgumentNullException(nameof(builder)); - } - - if (options == null) - { - throw new ArgumentNullException(nameof(options)); - } - - // WARNING: Don't add extra setup logic here. It's important for - // UseServerSideBlazor just to be shorthand for UseSignalR+UseBlazor, - // so that people who want to call those two manually instead can - // also do so. That's needed for people using Azure SignalR. - - // TODO: Also allow configuring the endpoint path. - return UseSignalRWithBlazorHub(builder, BlazorHub.DefaultPath) - .UseBlazor(options); - } - - private static IApplicationBuilder UseSignalRWithBlazorHub( - IApplicationBuilder builder, PathString path) - { - return builder.UseSignalR(route => route.MapHub(BlazorHub.DefaultPath)); - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Server/DependencyInjection/ServerSideBlazorServiceCollectionExtensions.cs b/src/Components/src/Microsoft.AspNetCore.Components.Server/DependencyInjection/RazorComponentsServiceCollectionExtensions.cs similarity index 70% rename from src/Components/src/Microsoft.AspNetCore.Components.Server/DependencyInjection/ServerSideBlazorServiceCollectionExtensions.cs rename to src/Components/src/Microsoft.AspNetCore.Components.Server/DependencyInjection/RazorComponentsServiceCollectionExtensions.cs index 8b103a9c6f..c563ceef93 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Server/DependencyInjection/ServerSideBlazorServiceCollectionExtensions.cs +++ b/src/Components/src/Microsoft.AspNetCore.Components.Server/DependencyInjection/RazorComponentsServiceCollectionExtensions.cs @@ -12,33 +12,17 @@ using Microsoft.JSInterop; namespace Microsoft.Extensions.DependencyInjection { /// - /// Extension methods to configure an for Server-Side Blazor. + /// Extension methods to configure an for interactive components. /// - public static class ServerSideBlazorServiceCollectionExtensions + public static class RazorComponentsServiceCollectionExtensions { /// - /// Adds Server-Side Blazor services to the service collection. + /// Adds Razor Component services to the service collection. /// /// The . + /// A Razor Components project startup type. /// The . - public static IServiceCollection AddServerSideBlazor( - this IServiceCollection services) - { - if (services == null) - { - throw new ArgumentNullException(nameof(services)); - } - - return AddServerSideBlazor(services, null); - } - - /// - /// Adds Server-Side Blazor services to the service collection. - /// - /// The . - /// A Blazor startup type. - /// The . - public static IServiceCollection AddServerSideBlazor( + public static IServiceCollection AddRazorComponents( this IServiceCollection services, Type startupType) { @@ -52,16 +36,16 @@ namespace Microsoft.Extensions.DependencyInjection throw new ArgumentNullException(nameof(startupType)); } - return AddServerSideBlazorCore(services, startupType); + return AddRazorComponentsCore(services, startupType); } /// - /// Adds Server-Side Blazor services to the service collection. + /// Adds Razor Component app services to the service collection. /// /// The . - /// A Blazor startup type. + /// A Components app startup type. /// The . - public static IServiceCollection AddServerSideBlazor( + public static IServiceCollection AddRazorComponents( this IServiceCollection services) { if (services == null) @@ -69,14 +53,14 @@ namespace Microsoft.Extensions.DependencyInjection throw new ArgumentNullException(nameof(services)); } - return AddServerSideBlazorCore(services, typeof(TStartup)); + return AddRazorComponentsCore(services, typeof(TStartup)); } - private static IServiceCollection AddServerSideBlazorCore( + private static IServiceCollection AddRazorComponentsCore( IServiceCollection services, Type startupType) { - AddStandardServerSideBlazorServices(services); + AddStandardRazorComponentsServices(services); if (startupType != null) { @@ -94,7 +78,7 @@ namespace Microsoft.Extensions.DependencyInjection if (circuitFactoryOptions.StartupActions.ContainsKey(endpoint)) { throw new InvalidOperationException( - "Multiple Server Side Blazor entries are configured to use " + + "Multiple Components app entries are configured to use " + $"the same endpoint '{endpoint}'."); } @@ -108,11 +92,11 @@ namespace Microsoft.Extensions.DependencyInjection return services; } - private static void AddStandardServerSideBlazorServices(IServiceCollection services) + private static void AddStandardRazorComponentsServices(IServiceCollection services) { // Here we add a bunch of services that don't vary in any way based on the // user's configuration. So even if the user has multiple independent server-side - // Blazor entrypoints, this lot is the same and repeated registrations are a no-op. + // Components entrypoints, this lot is the same and repeated registrations are a no-op. services.TryAddSingleton(); services.TryAddScoped(); services.TryAddScoped(s => s.GetRequiredService().Circuit); @@ -122,7 +106,7 @@ namespace Microsoft.Extensions.DependencyInjection // We've discussed with the SignalR team and believe it's OK to have repeated // calls to AddSignalR (making the nonfirst ones no-ops). If we want to change - // this in the future, we could change AddServerSideBlazor to be an extension + // this in the future, we could change AddComponents to be an extension // method on ISignalRServerBuilder so the developer always has to chain it onto // their own AddSignalR call. For now we're keeping it like this because it's // simpler for developers in common cases. diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Components.Server.csproj index 1c9b8cee42..759f6c2c5e 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Components.Server.csproj +++ b/src/Components/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Components.Server.csproj @@ -4,6 +4,7 @@ netstandard2.0 Runtime server features for ASP.NET Core Components. true + true @@ -16,11 +17,17 @@ - + + + + + + + diff --git a/src/Components/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/ServerSideAppTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/ServerSideAppTest.cs index 433f7c1550..8824f96c68 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/ServerSideAppTest.cs +++ b/src/Components/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/ServerSideAppTest.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests [Fact] public void HasTitle() { - Assert.Equal("Server Side Blazor", Browser.Title); + Assert.Equal("Razor Components", Browser.Title); } [Fact] diff --git a/src/Components/test/testapps/BasicTestApp/wwwroot/index.html b/src/Components/test/testapps/BasicTestApp/wwwroot/index.html index a7bbf503e3..bf671c987a 100644 --- a/src/Components/test/testapps/BasicTestApp/wwwroot/index.html +++ b/src/Components/test/testapps/BasicTestApp/wwwroot/index.html @@ -18,12 +18,12 @@ } (function () { - // Load either blazor.webassembly.js or blazor.server.js depending + // Load either components.webassembly.js or components.server.js depending // on the hash part of the URL. This is just to give a way for the // test runner to make the selection. var src = location.hash === '#server' - ? 'blazor.server.js' - : 'blazor.webassembly.js'; + ? 'components.server.js' + : 'components.webassembly.js'; document.write(' diff --git a/src/Components/test/testapps/TestServer/Startup.cs b/src/Components/test/testapps/TestServer/Startup.cs index 25c12a9084..9a37d334ee 100644 --- a/src/Components/test/testapps/TestServer/Startup.cs +++ b/src/Components/test/testapps/TestServer/Startup.cs @@ -23,7 +23,7 @@ namespace TestServer { options.AddPolicy("AllowAll", _ => { /* Controlled below */ }); }); - services.AddServerSideBlazor(); + services.AddRazorComponents(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.