Merge pull request #2028 from NativeScript/tbozhikov/fix-e2e-apps-aot

tbozhikov · web-flow · commit c22d44ecf0ce · 2019-10-22T18:11:38.000+03:00
fix: local development workflow errors
diff --git 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
@@ -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
@@ -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
@@ -3,7 +3,7 @@
     <Label class="action-bar-title" text="Modal Second"></Label>
 </ActionBar>
 
-<GridLayout #rootLayout rows="auto, auto" (loaded)="onLoaded($event)">
+<GridLayout #rootLayout rows="auto, auto" (loaded)="onLoaded()">
     <Button text="Go Back(activatedRoute)" (tap)="goBack()"></Button>
     <Button row="1" text="Close Modal" (tap)="close(rootLayout)"></Button>
 </GridLayout>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -15,7 +15,8 @@
         "paths": {
             "*": [
                 "./node_modules/tns-core-modules/*",
-                "./node_modules/*"
+                "./node_modules/*",
+                "./node_modules/nativescript-angular/node_modules/*"
             ],
             "~/*": [
                 "app/*"
diff --git a/nativescript-angular-package/directives/templated-items-comp.ts b/nativescript-angular-package/directives/templated-items-comp.ts
@@ -0,0 +1 @@
+export * from "@nativescript/angular/directives/templated-items-comp";
diff --git 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,
diff --git 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);
