From 2ac013b0e39a6c7380b14e887ce04b7460db3ad5 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Fri, 16 Sep 2016 20:41:32 -0400
Subject: [PATCH] Fixed bug introduced from the last merge from seed, managed
to upgrate nativescript to use typescript 2.x int he process.
---
nativescript/package.json | 4 ++--
nativescript/tsconfig.json | 24 ++++++++++++++++--------
package.json | 38 +++++++++++++++++++-------------------
3 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/nativescript/package.json b/nativescript/package.json
index 6c997e0d..6ff5560e 100644
--- a/nativescript/package.json
+++ b/nativescript/package.json
@@ -50,6 +50,6 @@
"lazy": "1.0.11",
"nativescript-dev-typescript": "^0.3.2",
"shelljs": "^0.7.0",
- "typescript": "^1.8.10"
+ "typescript": "^2.0.2"
}
-}
\ No newline at end of file
+}
diff --git a/nativescript/tsconfig.json b/nativescript/tsconfig.json
index 972fb4d7..2ba2811d 100644
--- a/nativescript/tsconfig.json
+++ b/nativescript/tsconfig.json
@@ -1,15 +1,23 @@
{
"compilerOptions": {
- "module": "commonjs",
- "target": "es5",
- "sourceMap": true,
- "emitDecoratorMetadata": true,
- "experimentalDecorators": true,
- "noEmitHelpers": true,
- "noEmitOnError": true
+ "target": "es5",
+ "module": "commonjs",
+ "declaration": false,
+ "removeComments": true,
+ "noLib": false,
+ "emitDecoratorMetadata": true,
+ "experimentalDecorators": true,
+ "sourceMap": true,
+ "pretty": true,
+ "allowUnreachableCode": false,
+ "allowUnusedLabels": false,
+ "noImplicitAny": true,
+ "noImplicitReturns": true,
+ "noImplicitUseStrict": false,
+ "noFallthroughCasesInSwitch": true
},
"exclude": [
"node_modules",
"platforms"
]
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index bdf72931..f3247646 100644
--- a/package.json
+++ b/package.json
@@ -157,25 +157,25 @@
"@angular/platform-browser-dynamic": "2.0.0",
"@angular/router": "3.0.0",
"@ngrx/core": "^1.2.0",
- "@angular2-material/button": "2.0.0-alpha.8-1",
- "@angular2-material/button-toggle": "2.0.0-alpha.8-1",
- "@angular2-material/card": "2.0.0-alpha.8-1",
- "@angular2-material/checkbox": "2.0.0-alpha.8-1",
- "@angular2-material/core": "2.0.0-alpha.8-1",
- "@angular2-material/grid-list": "2.0.0-alpha.8-1",
- "@angular2-material/icon": "2.0.0-alpha.8-1",
- "@angular2-material/input": "2.0.0-alpha.8-1",
- "@angular2-material/list": "2.0.0-alpha.8-1",
- "@angular2-material/menu": "2.0.0-alpha.8-1",
- "@angular2-material/progress-bar": "2.0.0-alpha.8-1",
- "@angular2-material/progress-circle": "2.0.0-alpha.8-1",
- "@angular2-material/radio": "2.0.0-alpha.8-1",
- "@angular2-material/sidenav": "2.0.0-alpha.8-1",
- "@angular2-material/slide-toggle": "2.0.0-alpha.8-1",
- "@angular2-material/slider": "2.0.0-alpha.8-1",
- "@angular2-material/tabs": "2.0.0-alpha.8-1",
- "@angular2-material/toolbar": "2.0.0-alpha.8-1",
- "@angular2-material/tooltip": "2.0.0-alpha.8-1",
+ "@angular2-material/button": "2.0.0-alpha.8-2",
+ "@angular2-material/button-toggle": "2.0.0-alpha.8-2",
+ "@angular2-material/card": "2.0.0-alpha.8-2",
+ "@angular2-material/checkbox": "2.0.0-alpha.8-2",
+ "@angular2-material/core": "2.0.0-alpha.8-2",
+ "@angular2-material/grid-list": "2.0.0-alpha.8-2",
+ "@angular2-material/icon": "2.0.0-alpha.8-2",
+ "@angular2-material/input": "2.0.0-alpha.8-2",
+ "@angular2-material/list": "2.0.0-alpha.8-2",
+ "@angular2-material/menu": "2.0.0-alpha.8-2",
+ "@angular2-material/progress-bar": "2.0.0-alpha.8-2",
+ "@angular2-material/progress-circle": "2.0.0-alpha.8-2",
+ "@angular2-material/radio": "2.0.0-alpha.8-2",
+ "@angular2-material/sidenav": "2.0.0-alpha.8-2",
+ "@angular2-material/slide-toggle": "2.0.0-alpha.8-2",
+ "@angular2-material/slider": "2.0.0-alpha.8-2",
+ "@angular2-material/tabs": "2.0.0-alpha.8-2",
+ "@angular2-material/toolbar": "2.0.0-alpha.8-2",
+ "@angular2-material/tooltip": "2.0.0-alpha.8-2",
"@ngrx/store": "^2.1.2",
"angulartics2": "^1.1.5",
"es-module-loader": "^1.0.0",
--
GitLab