From fcd3cf9dd7474acdf8510071b8c9527ba44b96a1 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 20 Jun 2017 15:07:11 +0100
Subject: [PATCH] In aspnet-prerendering, simply type imports/exports by
 changing PrerenderingInterfaces to a regular module (not a .d.ts file)

---
 .../npm/aspnet-prerendering/src/Prerendering.ts    |  2 +-
 ...ngInterfaces.d.ts => PrerenderingInterfaces.ts} | 14 +++++++-------
 .../npm/aspnet-prerendering/src/index.ts           |  3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)
 rename src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/{PrerenderingInterfaces.d.ts => PrerenderingInterfaces.ts} (80%)

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 15969049aa..80a025912d 100644
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts
@@ -1,8 +1,8 @@
-/// <reference path="./PrerenderingInterfaces.d.ts" />
 import * as url from 'url';
 import * as path from 'path';
 import * as domain from 'domain';
 import { run as domainTaskRun, baseUrl as domainTaskBaseUrl } from 'domain-task/main';
+import { BootFunc, BootFuncParams, BootModuleInfo, RenderToStringCallback, RenderToStringFunc } from './PrerenderingInterfaces';
 
 const defaultTimeoutMilliseconds = 30 * 1000;
 
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts
similarity index 80%
rename from src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts
rename to src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts
index 248c4e8cf1..ad32bfe3b7 100644
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts
@@ -1,26 +1,26 @@
-interface RenderToStringFunc {
+export interface RenderToStringFunc {
     (callback: RenderToStringCallback, applicationBasePath: string, bootModule: BootModuleInfo, absoluteRequestUrl: string, requestPathAndQuery: string, customDataParameter: any, overrideTimeoutMilliseconds: number, requestPathBase: string): void;
 }
 
-interface RenderToStringCallback {
+export interface RenderToStringCallback {
     (error: any, result?: RenderToStringResult): void;
 }
 
-interface RenderToStringResult {
+export interface RenderToStringResult {
     html: string;
     statusCode?: number;
     globals?: { [key: string]: any };
 }
 
-interface RedirectResult {
+export interface RedirectResult {
     redirectUrl: string;
 }
 
-interface BootFunc {
+export interface BootFunc {
     (params: BootFuncParams): Promise<RenderToStringResult>;
 }
 
-interface BootFuncParams {
+export interface BootFuncParams {
     location: any;              // e.g., Location object containing information '/some/path'
     origin: string;             // e.g., 'https://example.com:1234'
     url: string;                // e.g., '/some/path'
@@ -30,7 +30,7 @@ interface BootFuncParams {
     data: any;                  // any custom object passed through from .NET
 }
 
-interface BootModuleInfo {
+export interface BootModuleInfo {
     moduleName: string;
     exportName?: string;
     webpackConfig?: string;
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts
index 6df3ad2f19..9298e1c6bd 100644
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts
@@ -1,5 +1,4 @@
-/// <reference path="./PrerenderingInterfaces.d.ts" />
-
+import { RenderToStringResult, RedirectResult } from './PrerenderingInterfaces';
 export * from './Prerendering';
 
 export type RenderResult = RenderToStringResult | RedirectResult;