In aspnet-prerendering, fix type definitions to satisfy TypeScript 2.4.0. Fixes #1034

SteveSandersonMS · SteveSandersonMS · commit d007a3fbbaf7 · 2017-06-20T15:10:29.000+01:00
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts
@@ -3,7 +3,7 @@ export interface RenderToStringFunc {
 }
 
 export interface RenderToStringCallback {
-    (error: any, result?: RenderToStringResult): void;
+    (error: any, result?: RenderResult): void;
 }
 
 export interface RenderToStringResult {
@@ -16,8 +16,10 @@ export interface RedirectResult {
     redirectUrl: string;
 }
 
+export type RenderResult = RenderToStringResult | RedirectResult;
+
 export interface BootFunc {
-    (params: BootFuncParams): Promise<RenderToStringResult>;
+    (params: BootFuncParams): Promise<RenderResult>;
 }
 
 export interface BootFuncParams {
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts
@@ -1,4 +1,2 @@
-import { RenderToStringResult, RedirectResult } from './PrerenderingInterfaces';
 export * from './Prerendering';
-
-export type RenderResult = RenderToStringResult | RedirectResult;
+export * from './PrerenderingInterfaces';

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ export interface RenderToStringFunc {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`export interface RenderToStringCallback {`
`6`		`- (error: any, result?: RenderToStringResult): void;`
	`6`	`+ (error: any, result?: RenderResult): void;`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`export interface RenderToStringResult {`
`@@ -16,8 +16,10 @@ export interface RedirectResult {`
`16`	`16`	`redirectUrl: string;`
`17`	`17`	`}`
`18`	`18`
	`19`	`+export type RenderResult = RenderToStringResult \| RedirectResult;`
	`20`	`+`
`19`	`21`	`export interface BootFunc {`
`20`		`- (params: BootFuncParams): Promise<RenderToStringResult>;`
	`22`	`+ (params: BootFuncParams): Promise<RenderResult>;`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`export interface BootFuncParams {`