From 2c589d09f4ad433db476bdbd28e60ef3c09be8c2 Mon Sep 17 00:00:00 2001 From: Sebastiaan Dammann Date: Wed, 31 Jan 2018 22:48:22 +0100 Subject: [PATCH] Typescript 2.7 release upgrade - blocked currently due to Microsoft/TypeScript/issues/21517 --- src/App/js/App/Pages/Archive/SheetEntry/EditPage.ts | 2 +- src/App/package.json | 4 ++-- src/App/yarn.lock | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/App/js/App/Pages/Archive/SheetEntry/EditPage.ts b/src/App/js/App/Pages/Archive/SheetEntry/EditPage.ts index 6c467290..9c3d9cc8 100644 --- a/src/App/js/App/Pages/Archive/SheetEntry/EditPage.ts +++ b/src/App/js/App/Pages/Archive/SheetEntry/EditPage.ts @@ -190,7 +190,7 @@ export default { { name: 'now.add', path: '/add', - canActivate:router => { + canActivate: router => { return (toState: State) => { if (toState.name !== 'now.add') { // Derived route - always OK diff --git a/src/App/package.json b/src/App/package.json index 5b3d1937..5dd6613b 100644 --- a/src/App/package.json +++ b/src/App/package.json @@ -40,9 +40,9 @@ "sass-loader": "6.0.6", "serviceworker-webpack-plugin": "^0.2.3", "style-loader": "0.20.1", - "ts-loader": "3.3.1", + "ts-loader": "3.4.0", "tslint": "5.9.1", - "typescript": "2.6.2", + "typescript": "2.7.1", "uglifyjs-webpack-plugin": "1.1.7", "url-loader": "0.6.2", "webpack": "3.10.0", diff --git a/src/App/yarn.lock b/src/App/yarn.lock index 5dd886c5..d859a680 100644 --- a/src/App/yarn.lock +++ b/src/App/yarn.lock @@ -6124,9 +6124,9 @@ trim-newlines@^1.0.0: dependencies: glob "^6.0.4" -ts-loader@3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-3.3.1.tgz#5d24b425876cfed094f8da95375c9fd1e598faec" +ts-loader@3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-3.4.0.tgz#c376bc0538d4c441ea8790c3fd841ebfdbfb99d0" dependencies: chalk "^2.3.0" enhanced-resolve "^3.0.0" @@ -6212,9 +6212,9 @@ typescript@1.8.10: version "1.8.10" resolved "https://registry.yarnpkg.com/typescript/-/typescript-1.8.10.tgz#b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e" -typescript@2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4" +typescript@2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.1.tgz#bb3682c2c791ac90e7c6210b26478a8da085c359" uglify-es@^3.3.4: version "3.3.9"