Skip to content
This repository was archived by the owner on Apr 8, 2020. It is now read-only.

adding support to pass Env param to webpack #1324

Closed
jrmcdona wants to merge 8 commits into from
Closed

adding support to pass Env param to webpack #1324

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c47d5bf
Add SPA middleware APIs to support new templates
SteveSandersonMS Sep 29, 2017
5bdb771
In SpaPrerenderingExtensions, don't assume that an IHttpContextAccess…
SteveSandersonMS Oct 2, 2017
d466cdb
Use built-in GetRequiredService<T>
khellang Oct 2, 2017
fe900f7
Use AddHttpContextAccessor method added in aspnet/HttpAbstractions#947
khellang Oct 2, 2017
52c69d8
Update to newer API designs
SteveSandersonMS Oct 5, 2017
e12c0ee
Swap order of params for UseAngularCliServer. Makes usage look neater.
SteveSandersonMS Oct 5, 2017
8d33fa5
Avoid the need to pass urlPrefix/defaultPage to any middleware but on…
SteveSandersonMS Oct 5, 2017
c970a2e
adding support to pass Env param to webpack
Oct 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use built-in GetRequiredService<T>
  • Loading branch information
@khellang @SteveSandersonMS
khellang authored and SteveSandersonMS committed Oct 4, 2017
commit d466cdb1d7ae395f8548f5644769895587f6b68d
11 changes: 3 additions & 8 deletions src/Microsoft.AspNetCore.SpaServices/Prerendering/SpaPrerenderingExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.AspNetCore.NodeServices;
using Microsoft.AspNetCore.SpaServices;
using Microsoft.AspNetCore.SpaServices.Prerendering;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Threading.Tasks;

Expand Down Expand Up @@ -41,9 +42,9 @@ public static void UsePrerendering(
var appBuilder = spaBuilder.AppBuilder;
var serviceProvider = appBuilder.ApplicationServices;
var nodeServices = GetNodeServices(serviceProvider);
var applicationStoppingToken = GetRequiredService<IApplicationLifetime>(serviceProvider)
var applicationStoppingToken = serviceProvider.GetRequiredService<IApplicationLifetime>()
.ApplicationStopping;
var applicationBasePath = GetRequiredService<IHostingEnvironment>(serviceProvider)
var applicationBasePath = serviceProvider.GetRequiredService<IHostingEnvironment>()
.ContentRootPath;
var moduleExport = new JavaScriptModuleExport(entryPoint);

Expand Down Expand Up @@ -92,12 +93,6 @@ public static void UsePrerendering(
});
}

private static T GetRequiredService<T>(IServiceProvider serviceProvider) where T: class
{
return (T)serviceProvider.GetService(typeof(T))
?? throw new Exception($"Could not resolve service of type {typeof(T).FullName} in service provider.");
}

private static async Task ApplyRenderResult(HttpContext context, RenderToStringResult renderResult)
{
if (!string.IsNullOrEmpty(renderResult.RedirectUrl))
Expand Down