Update aspnet-prerendering to use TS 2.0 and @types

SteveSandersonMS · SteveSandersonMS · commit f13c2595b8a6 · 2016-10-05T13:58:55.000+01:00
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json
@@ -4,7 +4,7 @@
   "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": {
-    "prepublish": "rimraf *.d.ts && tsd update && tsc && echo 'Finished building NPM package \"aspnet-prerendering\"'",
+    "prepublish": "rimraf *.d.ts && tsc && echo 'Finished building NPM package \"aspnet-prerendering\"'",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "Microsoft",
@@ -21,6 +21,8 @@
     "es6-promise": "^3.1.2"
   },
   "devDependencies": {
+    "@types/node": "^6.0.42",
+    "@types/whatwg-fetch": "0.0.31",
     "rimraf": "^2.5.4",
     "typescript": "^2.0.0"
   }
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts
@@ -174,7 +174,7 @@ function findBootFunc(applicationBasePath: string, bootModule: BootModuleInfo, c
 
 function bindPromiseContinuationsToDomain(promise: Promise<any>, domainInstance: domain.Domain) {
     const originalThen = promise.then;
-    promise.then = function then(resolve, reject) {
+    promise.then = (function then(resolve, reject) {
         if (typeof resolve === 'function') {
             resolve = domainInstance.bind(resolve);
         }
@@ -184,5 +184,5 @@ function bindPromiseContinuationsToDomain(promise: Promise<any>, domainInstance:
         }
 
         return originalThen.call(this, resolve, reject);
-    };
+    }) as any;
 }
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/tsconfig.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/tsconfig.json
@@ -4,8 +4,12 @@
     "module": "commonjs",
     "target": "es5",
     "declaration": true,
-    "outDir": "."
+    "outDir": ".",
+    "lib": ["es2015", "dom"]
   },
+  "files": [
+    "src/index.ts"
+  ],
   "exclude": [
     "node_modules"
   ]
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/tsd.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/tsd.json

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ function findBootFunc(applicationBasePath: string, bootModule: BootModuleInfo, c`
`174`	`174`
`175`	`175`	`function bindPromiseContinuationsToDomain(promise: Promise<any>, domainInstance: domain.Domain) {`
`176`	`176`	`const originalThen = promise.then;`
`177`		`- promise.then = function then(resolve, reject) {`
	`177`	`+ promise.then = (function then(resolve, reject) {`
`178`	`178`	`if (typeof resolve === 'function') {`
`179`	`179`	`resolve = domainInstance.bind(resolve);`
`180`	`180`	`}`
`@@ -184,5 +184,5 @@ function bindPromiseContinuationsToDomain(promise: Promise<any>, domainInstance:`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`return originalThen.call(this, resolve, reject);`
`187`		`- };`
	`187`	`+ }) as any;`
`188`	`188`	`}`