From 09bf9baabe2b4734880f54141ac1a954174380e7 Mon Sep 17 00:00:00 2001 From: tbozhikov Date: Tue, 22 Oct 2019 15:08:10 +0300 Subject: [PATCH 1/3] fix: local development workflow errors --- e2e/animation-examples/tsconfig.json | 3 ++- e2e/modal-navigation-ng/tsconfig.json | 3 ++- e2e/nested-router-tab-view/app/app.module.ts | 2 +- .../app/modal-second/modal-second.component.html | 2 +- e2e/nested-router-tab-view/tsconfig.json | 3 ++- e2e/renderer/tsconfig.json | 3 ++- e2e/routable-animations/tsconfig.json | 3 ++- e2e/router-tab-view/app/app.module.ts | 2 +- e2e/router-tab-view/tsconfig.json | 3 ++- e2e/router/tsconfig.json | 3 ++- e2e/single-page/tsconfig.json | 3 ++- e2e/tests-app-ng/tsconfig.json | 3 ++- ng-sample/app/app.ts | 2 +- 13 files changed, 22 insertions(+), 13 deletions(-) diff --git a/e2e/animation-examples/tsconfig.json b/e2e/animation-examples/tsconfig.json index 65295d0f2..eee1eca47 100644 --- a/e2e/animation-examples/tsconfig.json +++ b/e2e/animation-examples/tsconfig.json @@ -15,7 +15,8 @@ "paths": { "*": [ "./node_modules/tns-core-modules/*", - "./node_modules/*" + "./node_modules/*", + "./node_modules/nativescript-angular/node_modules/*" ], "~/*": [ "app/*" diff --git a/e2e/modal-navigation-ng/tsconfig.json b/e2e/modal-navigation-ng/tsconfig.json index 65295d0f2..eee1eca47 100644 --- a/e2e/modal-navigation-ng/tsconfig.json +++ b/e2e/modal-navigation-ng/tsconfig.json @@ -15,7 +15,8 @@ "paths": { "*": [ "./node_modules/tns-core-modules/*", - "./node_modules/*" + "./node_modules/*", + "./node_modules/nativescript-angular/node_modules/*" ], "~/*": [ "app/*" diff --git a/e2e/nested-router-tab-view/app/app.module.ts b/e2e/nested-router-tab-view/app/app.module.ts index 2be80e9fd..1c406632a 100644 --- a/e2e/nested-router-tab-view/app/app.module.ts +++ b/e2e/nested-router-tab-view/app/app.module.ts @@ -13,7 +13,7 @@ import { routerTraceCategory } from "nativescript-angular/trace"; // addCategories(routerTraceCategory); traceEnable(); -class MyErrorHandler implements ErrorHandler { +export class MyErrorHandler implements ErrorHandler { handleError(error) { console.log("### ErrorHandler Error: " + error.toString()); console.log("### ErrorHandler Stack: " + error.stack); diff --git a/e2e/nested-router-tab-view/app/modal-second/modal-second.component.html b/e2e/nested-router-tab-view/app/modal-second/modal-second.component.html index 9c6b4052e..27a997c2f 100644 --- a/e2e/nested-router-tab-view/app/modal-second/modal-second.component.html +++ b/e2e/nested-router-tab-view/app/modal-second/modal-second.component.html @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/e2e/nested-router-tab-view/tsconfig.json b/e2e/nested-router-tab-view/tsconfig.json index 65295d0f2..eee1eca47 100644 --- a/e2e/nested-router-tab-view/tsconfig.json +++ b/e2e/nested-router-tab-view/tsconfig.json @@ -15,7 +15,8 @@ "paths": { "*": [ "./node_modules/tns-core-modules/*", - "./node_modules/*" + "./node_modules/*", + "./node_modules/nativescript-angular/node_modules/*" ], "~/*": [ "app/*" diff --git a/e2e/renderer/tsconfig.json b/e2e/renderer/tsconfig.json index 65295d0f2..eee1eca47 100644 --- a/e2e/renderer/tsconfig.json +++ b/e2e/renderer/tsconfig.json @@ -15,7 +15,8 @@ "paths": { "*": [ "./node_modules/tns-core-modules/*", - "./node_modules/*" + "./node_modules/*", + "./node_modules/nativescript-angular/node_modules/*" ], "~/*": [ "app/*" diff --git a/e2e/routable-animations/tsconfig.json b/e2e/routable-animations/tsconfig.json index 65295d0f2..eee1eca47 100644 --- a/e2e/routable-animations/tsconfig.json +++ b/e2e/routable-animations/tsconfig.json @@ -15,7 +15,8 @@ "paths": { "*": [ "./node_modules/tns-core-modules/*", - "./node_modules/*" + "./node_modules/*", + "./node_modules/nativescript-angular/node_modules/*" ], "~/*": [ "app/*" diff --git a/e2e/router-tab-view/app/app.module.ts b/e2e/router-tab-view/app/app.module.ts index 532eb125e..632cdf76b 100644 --- a/e2e/router-tab-view/app/app.module.ts +++ b/e2e/router-tab-view/app/app.module.ts @@ -10,7 +10,7 @@ import { enable as traceEnable } from "tns-core-modules/trace"; // addCategories(routerTraceCategory); traceEnable(); -class MyErrorHandler implements ErrorHandler { +export class MyErrorHandler implements ErrorHandler { handleError(error) { console.log("### ErrorHandler Error: " + error.toString()); console.log("### ErrorHandler Stack: " + error.stack); diff --git a/e2e/router-tab-view/tsconfig.json b/e2e/router-tab-view/tsconfig.json index 65295d0f2..eee1eca47 100644 --- a/e2e/router-tab-view/tsconfig.json +++ b/e2e/router-tab-view/tsconfig.json @@ -15,7 +15,8 @@ "paths": { "*": [ "./node_modules/tns-core-modules/*", - "./node_modules/*" + "./node_modules/*", + "./node_modules/nativescript-angular/node_modules/*" ], "~/*": [ "app/*" diff --git a/e2e/router/tsconfig.json b/e2e/router/tsconfig.json index 65295d0f2..eee1eca47 100644 --- a/e2e/router/tsconfig.json +++ b/e2e/router/tsconfig.json @@ -15,7 +15,8 @@ "paths": { "*": [ "./node_modules/tns-core-modules/*", - "./node_modules/*" + "./node_modules/*", + "./node_modules/nativescript-angular/node_modules/*" ], "~/*": [ "app/*" diff --git a/e2e/single-page/tsconfig.json b/e2e/single-page/tsconfig.json index 65295d0f2..eee1eca47 100644 --- a/e2e/single-page/tsconfig.json +++ b/e2e/single-page/tsconfig.json @@ -15,7 +15,8 @@ "paths": { "*": [ "./node_modules/tns-core-modules/*", - "./node_modules/*" + "./node_modules/*", + "./node_modules/nativescript-angular/node_modules/*" ], "~/*": [ "app/*" diff --git a/e2e/tests-app-ng/tsconfig.json b/e2e/tests-app-ng/tsconfig.json index d93d819b4..943dcd002 100644 --- a/e2e/tests-app-ng/tsconfig.json +++ b/e2e/tests-app-ng/tsconfig.json @@ -15,7 +15,8 @@ "paths": { "*": [ "./node_modules/tns-core-modules/*", - "./node_modules/*" + "./node_modules/*", + "./node_modules/nativescript-angular/node_modules/*" ], "~/*": [ "app/*" diff --git a/ng-sample/app/app.ts b/ng-sample/app/app.ts index 86b2aaad2..b3a6ccad9 100644 --- a/ng-sample/app/app.ts +++ b/ng-sample/app/app.ts @@ -126,7 +126,7 @@ const customPageFactoryProvider = { }, }; -class MyErrorHandler implements ErrorHandler { +export class MyErrorHandler implements ErrorHandler { handleError(error) { console.log("### ErrorHandler Error: " + error.toString()); console.log("### ErrorHandler Stack: " + error.stack); From d7c6f907449122a2e3fdefaf6e860918d9209fe8 Mon Sep 17 00:00:00 2001 From: tbozhikov Date: Tue, 22 Oct 2019 17:15:59 +0300 Subject: [PATCH 2/3] fix: expose missing export for TemplatedItemsComponent --- nativescript-angular/directives/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nativescript-angular/directives/index.ts b/nativescript-angular/directives/index.ts index 57efac10f..4fd2966f5 100644 --- a/nativescript-angular/directives/index.ts +++ b/nativescript-angular/directives/index.ts @@ -1,5 +1,5 @@ import { ListViewComponent } from "./list-view-comp"; -import { TemplateKeyDirective, SetupItemViewArgs } from "./templated-items-comp"; +import { TemplateKeyDirective, SetupItemViewArgs, TemplatedItemsComponent } from "./templated-items-comp"; import { TabViewDirective, TabViewItemDirective } from "./tab-view"; import { ActionBarComponent, @@ -27,6 +27,7 @@ export { ListViewComponent, TemplateKeyDirective, SetupItemViewArgs, + TemplatedItemsComponent, TabViewDirective, TabViewItemDirective, ActionBarComponent, From bb378eb90b821a7ddc52fd301a55a82e5091ff8f Mon Sep 17 00:00:00 2001 From: tbozhikov Date: Tue, 22 Oct 2019 17:39:26 +0300 Subject: [PATCH 3/3] fix: add additional path for export of templated-items-comp --- nativescript-angular-package/directives/templated-items-comp.ts | 1 + 1 file changed, 1 insertion(+) create mode 100644 nativescript-angular-package/directives/templated-items-comp.ts diff --git a/nativescript-angular-package/directives/templated-items-comp.ts b/nativescript-angular-package/directives/templated-items-comp.ts new file mode 100644 index 000000000..cdb635ff4 --- /dev/null +++ b/nativescript-angular-package/directives/templated-items-comp.ts @@ -0,0 +1 @@ +export * from "@nativescript/angular/directives/templated-items-comp"; \ No newline at end of file