Skip to content

Commit c22d44e

Browse files
authored
Merge pull request #2028 from NativeScript/tbozhikov/fix-e2e-apps-aot
fix: local development workflow errors
2 parents 1639e65 + bb378eb commit c22d44e

File tree

15 files changed

+25
-14
lines changed

15 files changed

+25
-14
lines changed

Diff for: e2e/animation-examples/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"paths": {
1616
"*": [
1717
"./node_modules/tns-core-modules/*",
18-
"./node_modules/*"
18+
"./node_modules/*",
19+
"./node_modules/nativescript-angular/node_modules/*"
1920
],
2021
"~/*": [
2122
"app/*"

Diff for: e2e/modal-navigation-ng/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"paths": {
1616
"*": [
1717
"./node_modules/tns-core-modules/*",
18-
"./node_modules/*"
18+
"./node_modules/*",
19+
"./node_modules/nativescript-angular/node_modules/*"
1920
],
2021
"~/*": [
2122
"app/*"

Diff for: e2e/nested-router-tab-view/app/app.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { routerTraceCategory } from "nativescript-angular/trace";
1313
// addCategories(routerTraceCategory);
1414
traceEnable();
1515

16-
class MyErrorHandler implements ErrorHandler {
16+
export class MyErrorHandler implements ErrorHandler {
1717
handleError(error) {
1818
console.log("### ErrorHandler Error: " + error.toString());
1919
console.log("### ErrorHandler Stack: " + error.stack);

Diff for: e2e/nested-router-tab-view/app/modal-second/modal-second.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Label class="action-bar-title" text="Modal Second"></Label>
44
</ActionBar>
55

6-
<GridLayout #rootLayout rows="auto, auto" (loaded)="onLoaded($event)">
6+
<GridLayout #rootLayout rows="auto, auto" (loaded)="onLoaded()">
77
<Button text="Go Back(activatedRoute)" (tap)="goBack()"></Button>
88
<Button row="1" text="Close Modal" (tap)="close(rootLayout)"></Button>
99
</GridLayout>

Diff for: e2e/nested-router-tab-view/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"paths": {
1616
"*": [
1717
"./node_modules/tns-core-modules/*",
18-
"./node_modules/*"
18+
"./node_modules/*",
19+
"./node_modules/nativescript-angular/node_modules/*"
1920
],
2021
"~/*": [
2122
"app/*"

Diff for: e2e/renderer/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"paths": {
1616
"*": [
1717
"./node_modules/tns-core-modules/*",
18-
"./node_modules/*"
18+
"./node_modules/*",
19+
"./node_modules/nativescript-angular/node_modules/*"
1920
],
2021
"~/*": [
2122
"app/*"

Diff for: e2e/routable-animations/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"paths": {
1616
"*": [
1717
"./node_modules/tns-core-modules/*",
18-
"./node_modules/*"
18+
"./node_modules/*",
19+
"./node_modules/nativescript-angular/node_modules/*"
1920
],
2021
"~/*": [
2122
"app/*"

Diff for: e2e/router-tab-view/app/app.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { enable as traceEnable } from "tns-core-modules/trace";
1010
// addCategories(routerTraceCategory);
1111
traceEnable();
1212

13-
class MyErrorHandler implements ErrorHandler {
13+
export class MyErrorHandler implements ErrorHandler {
1414
handleError(error) {
1515
console.log("### ErrorHandler Error: " + error.toString());
1616
console.log("### ErrorHandler Stack: " + error.stack);

Diff for: e2e/router-tab-view/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"paths": {
1616
"*": [
1717
"./node_modules/tns-core-modules/*",
18-
"./node_modules/*"
18+
"./node_modules/*",
19+
"./node_modules/nativescript-angular/node_modules/*"
1920
],
2021
"~/*": [
2122
"app/*"

Diff for: e2e/router/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"paths": {
1616
"*": [
1717
"./node_modules/tns-core-modules/*",
18-
"./node_modules/*"
18+
"./node_modules/*",
19+
"./node_modules/nativescript-angular/node_modules/*"
1920
],
2021
"~/*": [
2122
"app/*"

Diff for: e2e/single-page/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"paths": {
1616
"*": [
1717
"./node_modules/tns-core-modules/*",
18-
"./node_modules/*"
18+
"./node_modules/*",
19+
"./node_modules/nativescript-angular/node_modules/*"
1920
],
2021
"~/*": [
2122
"app/*"

Diff for: e2e/tests-app-ng/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"paths": {
1616
"*": [
1717
"./node_modules/tns-core-modules/*",
18-
"./node_modules/*"
18+
"./node_modules/*",
19+
"./node_modules/nativescript-angular/node_modules/*"
1920
],
2021
"~/*": [
2122
"app/*"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from "@nativescript/angular/directives/templated-items-comp";

Diff for: nativescript-angular/directives/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ListViewComponent } from "./list-view-comp";
2-
import { TemplateKeyDirective, SetupItemViewArgs } from "./templated-items-comp";
2+
import { TemplateKeyDirective, SetupItemViewArgs, TemplatedItemsComponent } from "./templated-items-comp";
33
import { TabViewDirective, TabViewItemDirective } from "./tab-view";
44
import {
55
ActionBarComponent,
@@ -27,6 +27,7 @@ export {
2727
ListViewComponent,
2828
TemplateKeyDirective,
2929
SetupItemViewArgs,
30+
TemplatedItemsComponent,
3031
TabViewDirective,
3132
TabViewItemDirective,
3233
ActionBarComponent,

Diff for: ng-sample/app/app.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ const customPageFactoryProvider = {
126126
},
127127
};
128128

129-
class MyErrorHandler implements ErrorHandler {
129+
export class MyErrorHandler implements ErrorHandler {
130130
handleError(error) {
131131
console.log("### ErrorHandler Error: " + error.toString());
132132
console.log("### ErrorHandler Stack: " + error.stack);

0 commit comments

Comments
 (0)