From d920997ad570c8684202a5e79ed527957ed10e45 Mon Sep 17 00:00:00 2001 From: Dan Bock Date: Fri, 26 Oct 2018 14:19:26 -0400 Subject: [PATCH 1/4] fix: don't crash on startup due to tslib not being found --- apps/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/package.json b/apps/package.json index 70c68f9843..5d2c104610 100644 --- a/apps/package.json +++ b/apps/package.json @@ -13,7 +13,8 @@ } }, "dependencies": { - "tns-core-modules": "*" + "tns-core-modules": "*", + "tslib": "^1.9.3" }, "devDependencies": { "babel-traverse": "6.10.4", From c9d96de10ad9256aa7c42b1db55b5117443e2027 Mon Sep 17 00:00:00 2001 From: Dan Bock Date: Fri, 26 Oct 2018 14:31:20 -0400 Subject: [PATCH 2/4] fix: prevent error 'sourceMap' cannot be specified with option 'inlineSourceMap' --- tsconfig.shared.json | 1 - 1 file changed, 1 deletion(-) diff --git a/tsconfig.shared.json b/tsconfig.shared.json index eea37a566c..fb2944e0da 100644 --- a/tsconfig.shared.json +++ b/tsconfig.shared.json @@ -10,7 +10,6 @@ "removeComments": true, "experimentalDecorators": true, "diagnostics": true, - "sourceMap": true, "jsx": "react", "reactNamespace": "UIBuilder", "lib": [ From fc809acfffd54aa0ca7f54c43c5add0708f71a8d Mon Sep 17 00:00:00 2001 From: Vasil Chimev Date: Thu, 1 Nov 2018 14:39:05 +0200 Subject: [PATCH 3/4] Revert "fix: prevent error 'sourceMap' cannot be specified with option 'inlineSourceMap'" This reverts commit c9d96de10ad9256aa7c42b1db55b5117443e2027. --- tsconfig.shared.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tsconfig.shared.json b/tsconfig.shared.json index fb2944e0da..eea37a566c 100644 --- a/tsconfig.shared.json +++ b/tsconfig.shared.json @@ -10,6 +10,7 @@ "removeComments": true, "experimentalDecorators": true, "diagnostics": true, + "sourceMap": true, "jsx": "react", "reactNamespace": "UIBuilder", "lib": [ From cc645a37fcdc7961586fd49c8bc94cee099d9d71 Mon Sep 17 00:00:00 2001 From: Vasil Chimev Date: Thu, 1 Nov 2018 15:32:50 +0200 Subject: [PATCH 4/4] chore: updates tsconfig.json file --- apps/tsconfig.json | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/apps/tsconfig.json b/apps/tsconfig.json index 4f5d9b3d1f..ac7907a6fb 100644 --- a/apps/tsconfig.json +++ b/apps/tsconfig.json @@ -1,23 +1,28 @@ { - "extends": "../tsconfig.shared", - "exclude": [ - "node_modules", - "platforms" - ], "compilerOptions": { + "module": "commonjs", + "target": "es5", + "experimentalDecorators": true, + "emitDecoratorMetadata": true, + "noEmitHelpers": true, + "noEmitOnError": true, + "lib": [ + "es6", + "dom" + ], "baseUrl": ".", "paths": { + "~/*": [ + "app/*" + ], "*": [ "./node_modules/tns-core-modules/*", "./node_modules/*" - ], - "~/*": [ - "app/*" ] - }, - "lib": [ - "es6", - "dom" - ] - } + } + }, + "exclude": [ + "node_modules", + "platforms" + ] } \ No newline at end of file