From dc130adc91b5b9c87494162a5ea0b6ac553374b0 Mon Sep 17 00:00:00 2001
From: SteveSandersonMS <stevesa@microsoft.com>
Date: Thu, 1 Dec 2016 14:32:54 +0000
Subject: [PATCH] Update aspnet-prerendering to reference baseUrl in
 domain-task's main module, not domain-task/fetch. Goal is to avoid Webpack
 having to bundle isomorphic-fetch on server unless you're actually using it.

---
 .../npm/aspnet-prerendering/package.json                     | 4 ++--
 .../npm/aspnet-prerendering/src/Prerendering.ts              | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json
index 301d6a2..6f459ab 100644
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aspnet-prerendering",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Helpers for server-side rendering of JavaScript applications in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,7 @@
     "url": "https://github.com/aspnet/JavaScriptServices.git"
   },
   "dependencies": {
-    "domain-task": "^2.0.1"
+    "domain-task": "^2.0.2"
   },
   "devDependencies": {
     "@types/node": "^6.0.42",
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts
index 9afd211..89deeed 100644
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts
@@ -2,8 +2,7 @@
 import * as url from 'url';
 import * as path from 'path';
 import * as domain from 'domain';
-import { run as domainTaskRun } from 'domain-task/main';
-import { baseUrl } from 'domain-task/fetch';
+import { run as domainTaskRun, baseUrl as domainTaskBaseUrl } from 'domain-task/main';
 
 const defaultTimeoutMilliseconds = 30 * 1000;
 
@@ -33,7 +32,7 @@ export function createServerRenderer(bootFunc: BootFunc): RenderToStringFunc {
             bindPromiseContinuationsToDomain(domainTaskCompletionPromise, domain['active']);
 
             // Make the base URL available to the 'domain-tasks/fetch' helper within this execution context
-            baseUrl(absoluteRequestUrl);
+            domainTaskBaseUrl(absoluteRequestUrl);
 
             // Begin rendering, and apply a timeout
             const bootFuncPromise = bootFunc(params);