github/JavaScriptServices
1
1
Fork 0
mirror of https://github.com/aspnet/JavaScriptServices.git synced 2025-12-22 17:47:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update templates to TypeScript 2.2.1 and fix whatwg-fetch related errors. Fixes #705

Browse Source
This commit is contained in:
Steve Sanderson
2017-02-23 10:07:03 +00:00
parent 627ea78e72
commit 689f106181
11 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
{
"name": "domain-task",
"version": "2.0.3",
"version": "3.0.0",
"description": "Tracks outstanding operations for a logical thread of execution",
"main": "index.js",
"scripts": {
@@ -22,8 +22,7 @@
},
"devDependencies": {
"@types/node": "^6.0.42",
"@types/whatwg-fetch": "0.0.31",
"rimraf": "^2.5.4",
"typescript": "^2.0.0"
"typescript": "^2.2.1"
}
}

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

@@ -10,7 +10,7 @@ function issueRequest(baseUrl: string, req: string | Request, init?: RequestInit
if (baseUrl) {
if (req instanceof Request) {
const reqAsRequest = req as Request;
reqAsRequest.url = url.resolve(baseUrl, reqAsRequest.url);
(reqAsRequest as any).url = url.resolve(baseUrl, reqAsRequest.url);
} else {
req = url.resolve(baseUrl, req as string);
}

2
templates/Angular2Spa/package.json
View File

@@ -40,7 +40,7 @@
"rxjs": "^5.0.1",
"style-loader": "^0.13.1",
"to-string-loader": "^1.1.5",
"typescript": "^2.0.3",
"typescript": "^2.2.1",
"url-loader": "^0.5.7",
"webpack": "^2.2.0",
"webpack-hot-middleware": "^2.12.2",

4
templates/AureliaSpa/ClientApp/app/components/fetchdata/fetchdata.ts
View File

@@ -1,7 +1,3 @@
// The following line is a workaround for aurelia-fetch-client requiring the type UrlSearchParams
// to exist in global scope, but that type not being declared in any public @types/* package.
/// <reference path="../../../../node_modules/aurelia-fetch-client/doc/url.d.ts" />
import { HttpClient } from 'aurelia-fetch-client';
import { inject } from 'aurelia-framework';

3
templates/AureliaSpa/package.json
View File

@@ -22,7 +22,6 @@
},
"devDependencies": {
"@types/node": "^6.0.45",
"@types/whatwg-fetch": "0.0.32",
"aspnet-webpack": "^1.0.11",
"aurelia-webpack-plugin": "^1.1.0",
"copy-webpack-plugin": "^3.0.1",
@@ -38,7 +37,7 @@
"style-loader": "^0.13.1",
"to-string-loader": "^1.1.5",
"ts-loader": "^0.8.2",
"typescript": "^2.0.0",
"typescript": "^2.2.1",
"url-loader": "^0.5.7",
"webpack": "2.1.0-beta.25",
"webpack-hot-middleware": "^2.10.0"

2
templates/AureliaSpa/tsconfig.json
View File

@@ -7,7 +7,7 @@
"emitDecoratorMetadata": true,
"skipDefaultLibCheck": true,
"lib": [ "es6", "dom" ],
"types": [ "node", "whatwg-fetch" ]
"types": [ "node" ]
},
"exclude": [ "bin", "node_modules" ],
"atom": { "rewriteTsconfig": false }

3
templates/KnockoutSpa/package.json
View File

@@ -11,7 +11,6 @@
"@types/react-router": "^2.0.37",
"@types/requirejs": "^2.1.26",
"@types/signals": "0.0.16",
"@types/whatwg-fetch": "0.0.30",
"aspnet-webpack": "^1.0.27",
"awesome-typescript-loader": "3.0.0-beta.13 || ^3.0.0",
"bootstrap": "^3.3.6",
@@ -28,7 +27,7 @@
"knockout": "^3.4.0",
"raw-loader": "^0.5.1",
"style-loader": "^0.13.1",
"typescript": "^2.0.3",
"typescript": "^2.2.1",
"url-loader": "^0.5.7",
"webpack": "^2.2.0",
"webpack-hot-middleware": "^2.12.2"

2
templates/KnockoutSpa/tsconfig.json
View File

@@ -4,7 +4,7 @@
"target": "es5",
"sourceMap": true,
"skipDefaultLibCheck": true,
"types": ["es6-promise", "history", "requirejs", "whatwg-fetch"]
"types": ["es6-promise", "history", "requirejs"]
},
"exclude": [
"bin",

5
templates/ReactReduxSpa/package.json
View File

@@ -11,7 +11,6 @@
"@types/redux": "3.5.27",
"@types/webpack": "^2.2.0",
"@types/webpack-env": "^1.13.0",
"@types/whatwg-fetch": "0.0.28",
"aspnet-prerendering": "^2.0.0",
"aspnet-webpack": "^1.0.27",
"aspnet-webpack-react": "^1.0.4",
@@ -22,7 +21,7 @@
"babel-preset-react": "^6.5.0",
"bootstrap": "^3.3.6",
"css-loader": "^0.23.1",
"domain-task": "^2.0.1",
"domain-task": "^3.0.0",
"event-source-polyfill": "^0.0.7",
"extract-text-webpack-plugin": "^2.0.0-rc",
"file-loader": "^0.8.5",
@@ -37,7 +36,7 @@
"redux": "^3.6.0",
"redux-thunk": "^2.2.0",
"style-loader": "^0.13.0",
"typescript": "^2.0.3",
"typescript": "^2.2.1",
"url-loader": "^0.5.7",
"webpack": "^2.2.0",
"webpack-hot-middleware": "^2.12.2",

2
templates/ReactReduxSpa/tsconfig.json
View File

@@ -8,7 +8,7 @@
"sourceMap": true,
"skipDefaultLibCheck": true,
"lib": ["es6", "dom"],
"types": [ "webpack-env", "whatwg-fetch" ],
"types": [ "webpack-env" ],
"paths": {
// Fix "Duplicate identifier" errors caused by multiple dependencies fetching their own copies of type definitions.
// We tell TypeScript which type definitions module to treat as the canonical one (instead of combining all of them).

3
templates/ReactSpa/package.json
View File

@@ -3,7 +3,6 @@
"version": "0.0.0",
"devDependencies": {
"@types/history": "^2.0.39",
"@types/isomorphic-fetch": "0.0.31",
"@types/react": "^0.14.38",
"@types/react-dom": "^0.14.17",
"@types/react-router": "^2.0.38",
@@ -26,7 +25,7 @@
"react-dom": "^15.3.2",
"react-router": "^2.8.1",
"style-loader": "^0.13.1",
"typescript": "^2.0.3",
"typescript": "^2.2.1",
"url-loader": "^0.5.7",
"webpack": "^2.2.0",
"webpack-hot-middleware": "^2.12.2"