Skip to content

Commit 689f106

Browse files
Update templates to TypeScript 2.2.1 and fix whatwg-fetch related errors. Fixes aspnet#705
1 parent 627ea78 commit 689f106

File tree

11 files changed

+12
-21
lines changed

11 files changed

+12
-21
lines changed

src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "domain-task",
3-
"version": "2.0.3",
3+
"version": "3.0.0",
44
"description": "Tracks outstanding operations for a logical thread of execution",
55
"main": "index.js",
66
"scripts": {
@@ -22,8 +22,7 @@
2222
},
2323
"devDependencies": {
2424
"@types/node": "^6.0.42",
25-
"@types/whatwg-fetch": "0.0.31",
2625
"rimraf": "^2.5.4",
27-
"typescript": "^2.0.0"
26+
"typescript": "^2.2.1"
2827
}
2928
}

src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/fetch.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function issueRequest(baseUrl: string, req: string | Request, init?: RequestInit
1010
if (baseUrl) {
1111
if (req instanceof Request) {
1212
const reqAsRequest = req as Request;
13-
reqAsRequest.url = url.resolve(baseUrl, reqAsRequest.url);
13+
(reqAsRequest as any).url = url.resolve(baseUrl, reqAsRequest.url);
1414
} else {
1515
req = url.resolve(baseUrl, req as string);
1616
}

templates/Angular2Spa/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"rxjs": "^5.0.1",
4141
"style-loader": "^0.13.1",
4242
"to-string-loader": "^1.1.5",
43-
"typescript": "^2.0.3",
43+
"typescript": "^2.2.1",
4444
"url-loader": "^0.5.7",
4545
"webpack": "^2.2.0",
4646
"webpack-hot-middleware": "^2.12.2",

templates/AureliaSpa/ClientApp/app/components/fetchdata/fetchdata.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
// The following line is a workaround for aurelia-fetch-client requiring the type UrlSearchParams
2-
// to exist in global scope, but that type not being declared in any public @types/* package.
3-
/// <reference path="../../../../node_modules/aurelia-fetch-client/doc/url.d.ts" />
4-
51
import { HttpClient } from 'aurelia-fetch-client';
62
import { inject } from 'aurelia-framework';
73

templates/AureliaSpa/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
},
2323
"devDependencies": {
2424
"@types/node": "^6.0.45",
25-
"@types/whatwg-fetch": "0.0.32",
2625
"aspnet-webpack": "^1.0.11",
2726
"aurelia-webpack-plugin": "^1.1.0",
2827
"copy-webpack-plugin": "^3.0.1",
@@ -38,7 +37,7 @@
3837
"style-loader": "^0.13.1",
3938
"to-string-loader": "^1.1.5",
4039
"ts-loader": "^0.8.2",
41-
"typescript": "^2.0.0",
40+
"typescript": "^2.2.1",
4241
"url-loader": "^0.5.7",
4342
"webpack": "2.1.0-beta.25",
4443
"webpack-hot-middleware": "^2.10.0"

templates/AureliaSpa/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"emitDecoratorMetadata": true,
88
"skipDefaultLibCheck": true,
99
"lib": [ "es6", "dom" ],
10-
"types": [ "node", "whatwg-fetch" ]
10+
"types": [ "node" ]
1111
},
1212
"exclude": [ "bin", "node_modules" ],
1313
"atom": { "rewriteTsconfig": false }

templates/KnockoutSpa/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"@types/react-router": "^2.0.37",
1212
"@types/requirejs": "^2.1.26",
1313
"@types/signals": "0.0.16",
14-
"@types/whatwg-fetch": "0.0.30",
1514
"aspnet-webpack": "^1.0.27",
1615
"awesome-typescript-loader": "3.0.0-beta.13 || ^3.0.0",
1716
"bootstrap": "^3.3.6",
@@ -28,7 +27,7 @@
2827
"knockout": "^3.4.0",
2928
"raw-loader": "^0.5.1",
3029
"style-loader": "^0.13.1",
31-
"typescript": "^2.0.3",
30+
"typescript": "^2.2.1",
3231
"url-loader": "^0.5.7",
3332
"webpack": "^2.2.0",
3433
"webpack-hot-middleware": "^2.12.2"

templates/KnockoutSpa/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"target": "es5",
55
"sourceMap": true,
66
"skipDefaultLibCheck": true,
7-
"types": ["es6-promise", "history", "requirejs", "whatwg-fetch"]
7+
"types": ["es6-promise", "history", "requirejs"]
88
},
99
"exclude": [
1010
"bin",

templates/ReactReduxSpa/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"@types/redux": "3.5.27",
1212
"@types/webpack": "^2.2.0",
1313
"@types/webpack-env": "^1.13.0",
14-
"@types/whatwg-fetch": "0.0.28",
1514
"aspnet-prerendering": "^2.0.0",
1615
"aspnet-webpack": "^1.0.27",
1716
"aspnet-webpack-react": "^1.0.4",
@@ -22,7 +21,7 @@
2221
"babel-preset-react": "^6.5.0",
2322
"bootstrap": "^3.3.6",
2423
"css-loader": "^0.23.1",
25-
"domain-task": "^2.0.1",
24+
"domain-task": "^3.0.0",
2625
"event-source-polyfill": "^0.0.7",
2726
"extract-text-webpack-plugin": "^2.0.0-rc",
2827
"file-loader": "^0.8.5",
@@ -37,7 +36,7 @@
3736
"redux": "^3.6.0",
3837
"redux-thunk": "^2.2.0",
3938
"style-loader": "^0.13.0",
40-
"typescript": "^2.0.3",
39+
"typescript": "^2.2.1",
4140
"url-loader": "^0.5.7",
4241
"webpack": "^2.2.0",
4342
"webpack-hot-middleware": "^2.12.2",

templates/ReactReduxSpa/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"sourceMap": true,
99
"skipDefaultLibCheck": true,
1010
"lib": ["es6", "dom"],
11-
"types": [ "webpack-env", "whatwg-fetch" ],
11+
"types": [ "webpack-env" ],
1212
"paths": {
1313
// Fix "Duplicate identifier" errors caused by multiple dependencies fetching their own copies of type definitions.
1414
// We tell TypeScript which type definitions module to treat as the canonical one (instead of combining all of them).

0 commit comments

Comments
 (0)