github/JavaScriptServices
1
1
Fork 0
mirror of https://github.com/aspnet/JavaScriptServices.git synced 2025-12-25 02:57:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make prerenderer code not rely on a specific process.cwd()

Browse Source
This commit is contained in:
SteveSandersonMS
2016-03-01 15:28:06 +00:00
parent 4dcf63dab4
commit 444475ef16
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Microsoft.AspNet.SpaServices/Prerendering/PrerenderTagHelper.cs
View File

@@ -28,21 +28,23 @@ namespace Microsoft.AspNet.SpaServices.Prerendering
[HtmlAttributeName(PrerenderWebpackConfigAttributeName)]
public string WebpackConfigPath { get; set; }
private string applicationBasePath;
private IHttpContextAccessor contextAccessor;
private INodeServices nodeServices;
public PrerenderTagHelper(IServiceProvider serviceProvider, IHttpContextAccessor contextAccessor)
{
var appEnv = (IApplicationEnvironment)serviceProvider.GetService(typeof(IApplicationEnvironment));
this.contextAccessor = contextAccessor;
this.nodeServices = (INodeServices)serviceProvider.GetService(typeof (INodeServices)) ?? fallbackNodeServices;
this.applicationBasePath = appEnv.ApplicationBasePath;
// Consider removing the following. Having it means you can get away with not putting app.AddNodeServices()
// in your startup file, but then again it might be confusing that you don't need to.
if (this.nodeServices == null) {
var appEnv = (IApplicationEnvironment)serviceProvider.GetService(typeof(IApplicationEnvironment));
this.nodeServices = fallbackNodeServices = Configuration.CreateNodeServices(new NodeServicesOptions {
HostingModel = NodeHostingModel.Http,
ProjectPath = appEnv.ApplicationBasePath
ProjectPath = this.applicationBasePath
});
}
}
@@ -51,6 +53,7 @@ namespace Microsoft.AspNet.SpaServices.Prerendering
{
var request = this.contextAccessor.HttpContext.Request;
var result = await Prerenderer.RenderToString(
applicationBasePath: this.applicationBasePath,
nodeServices: this.nodeServices,
bootModule: new JavaScriptModuleExport(this.ModuleName) {
exportName = this.ExportName,

3
src/Microsoft.AspNet.SpaServices/Prerendering/Prerenderer.cs
View File

@@ -16,8 +16,9 @@ namespace Microsoft.AspNet.SpaServices.Prerendering
});
}
public static async Task<RenderToStringResult> RenderToString(INodeServices nodeServices, JavaScriptModuleExport bootModule, string requestAbsoluteUrl, string requestPathAndQuery) {
public static async Task<RenderToStringResult> RenderToString(string applicationBasePath, INodeServices nodeServices, JavaScriptModuleExport bootModule, string requestAbsoluteUrl, string requestPathAndQuery) {
return await nodeServices.InvokeExport<RenderToStringResult>(nodeScript.Value.FileName, "renderToString",
applicationBasePath,
bootModule,
requestAbsoluteUrl,
requestPathAndQuery);