Skip to content

Commit 3fd3b14

Browse files
committed
chore: ng-sample build fail
1 parent 876ded7 commit 3fd3b14

File tree

11 files changed

+23
-82
lines changed

11 files changed

+23
-82
lines changed

Diff for: nativescript-angular/tsconfig.typedoc.json

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
"./router/private-imports",
5454
"./schema-registry.ts",
5555
"./http-client/index.ts",
56-
"./http/index.ts",
5756
"./router/index.ts",
5857
""
5958

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

-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { DOCUMENT } from "@angular/common";
77
import { Router } from "@angular/router";
88
import { NativeScriptRouterModule } from "nativescript-angular/router";
99
import { NativeScriptFormsModule } from "nativescript-angular/forms";
10-
import { NativeScriptHttpModule } from "nativescript-angular/http";
1110
import { NativeScriptHttpClientModule } from "nativescript-angular/http-client";
1211

1312
import {
@@ -42,7 +41,6 @@ import { ListTest } from "./examples/list/list-test";
4241
import { ListTemplateSelectorTest } from "./examples/list/template-selector";
4342
import { ListTestAsync, ListTestFilterAsync } from "./examples/list/list-test-async";
4443
import { ImageTest } from "./examples/image/image-test";
45-
import { HttpTest } from "./examples/http/http-test";
4644
import { HttpClientTest } from "./examples/http-client/http-client-test";
4745
import { ActionBarTest } from "./examples/action-bar/action-bar-test";
4846
import { PlatfromDirectivesTest } from "./examples/platform-directives/platform-directives-test";
@@ -73,14 +71,12 @@ import { AnimationStatesMultiTest } from "./examples/animation/animation-states-
7371
imports: [
7472
NativeScriptModule,
7573
NativeScriptFormsModule,
76-
NativeScriptHttpModule,
7774
NativeScriptHttpClientModule,
7875
NativeScriptRouterModule,
7976
],
8077
exports: [
8178
NativeScriptModule,
8279
NativeScriptFormsModule,
83-
NativeScriptHttpModule,
8480
NativeScriptHttpClientModule,
8581
NativeScriptRouterModule,
8682
],
@@ -146,7 +142,6 @@ class MyErrorHandler implements ErrorHandler {
146142
platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ListTestAsync));
147143
// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ImageTest));
148144
// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ModalTest));
149-
// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(HttpTest));
150145
// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(HttpClientTest));
151146
// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(PlatfromDirectivesTest));
152147
// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(ActionBarTest));

Diff for: ng-sample/app/examples/http-client/http-client-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export class HttpClientTest {
7070
}
7171

7272
public loadLocal() {
73-
this.http.get<DataResults<LocalData>>("~/examples/http/data.json")
73+
this.http.get<DataResults<LocalData>>("~/examples/http-client/data.json")
7474
.subscribe((response) => {
7575
let user = response.results[0];
7676
this.onSuccess(user.title, user.description);

Diff for: ng-sample/app/examples/http/data.json

-8
This file was deleted.

Diff for: ng-sample/app/examples/http/http-test.ts

-56
This file was deleted.

Diff for: ng-sample/app/examples/list/list-test-async.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { combineLatest } from "rxjs/operators";
55

66
@Component({
77
selector: "list-test-async",
8-
styleUrls: ["examples/list/styles.css"],
8+
styleUrls: ["./styles.css"],
99
providers: [DataService],
1010
changeDetection: ChangeDetectionStrategy.OnPush,
1111
template: `
@@ -58,7 +58,7 @@ export class ListTestAsync {
5858

5959
@Component({
6060
selector: "list-test-async-filter",
61-
styleUrls: ["examples/list/styles.css"],
61+
styleUrls: ["./styles.css"],
6262
providers: [DataService],
6363
changeDetection: ChangeDetectionStrategy.OnPush,
6464
template: `

Diff for: ng-sample/app/examples/list/list-test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class DataItem {
88

99
@Component({
1010
selector: "item-component",
11-
styleUrls: ["examples/list/styles.css"],
11+
styleUrls: ["./styles.css"],
1212
changeDetection: ChangeDetectionStrategy.OnPush,
1313
template: `
1414
<StackLayout [class.odd]="odd" [class.even]="even">
@@ -35,7 +35,7 @@ export class ItemComponent implements AfterViewChecked, DoCheck {
3535

3636
@Component({
3737
selector: "list-test",
38-
styleUrls: ["examples/list/styles.css"],
38+
styleUrls: ["./styles.css"],
3939
changeDetection: ChangeDetectionStrategy.OnPush,
4040
template: `
4141
<GridLayout rows="auto * auto">

Diff for: ng-sample/app/examples/list/template-selector.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class DataItem {
1010

1111
@Component({
1212
selector: "item-component",
13-
styleUrls: ["examples/list/styles.css"],
13+
styleUrls: ["./styles.css"],
1414
changeDetection: ChangeDetectionStrategy.OnPush,
1515
template: `<Label class="item" [text]='"[" + data.id +"]" + data.name'></Label>`
1616
})
@@ -21,7 +21,7 @@ export class ItemComponent implements DoCheck {
2121

2222
@Component({
2323
selector: "header-component",
24-
styleUrls: ["examples/list/styles.css"],
24+
styleUrls: ["./styles.css"],
2525
changeDetection: ChangeDetectionStrategy.OnPush,
2626
template: `<Label class="header" [text]='data.name'></Label>`
2727
})
@@ -32,7 +32,7 @@ export class HeaderComponent implements DoCheck {
3232

3333
@Component({
3434
selector: "list-test",
35-
styleUrls: ["examples/list/styles.css"],
35+
styleUrls: ["./styles.css"],
3636
changeDetection: ChangeDetectionStrategy.OnPush,
3737
template: `
3838
<GridLayout rows="auto * auto">

Diff for: ng-sample/app/examples/router/page-router-outlet-test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { map } from "rxjs/operators";
77

88
@Component({
99
selector: "first",
10-
styleUrls: ["examples/router/styles.css"],
10+
styleUrls: ["./styles.css"],
1111
template: `
1212
<StackLayout>
1313
<Label text="First component" class="title"></Label>
@@ -34,7 +34,7 @@ export class FirstComponent implements OnInit, OnDestroy {
3434

3535
@Component({
3636
selector: "second",
37-
styleUrls: ["examples/router/styles.css"],
37+
styleUrls: ["./styles.css"],
3838
template: `
3939
<StackLayout>
4040
<Label [text]="'Second component: ' + (id | async)" class="title"></Label>
@@ -68,7 +68,7 @@ export class SecondComponent implements OnInit, OnDestroy {
6868

6969
@Component({
7070
selector: "third",
71-
styleUrls: ["examples/router/styles.css"],
71+
styleUrls: ["./styles.css"],
7272
template: `
7373
<StackLayout>
7474
<Label [text]="'Third component: ' + (id | async)" class="title"></Label>

Diff for: ng-sample/package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,14 @@
4141
"zone.js": "^0.9.1"
4242
},
4343
"devDependencies": {
44+
"@angular/compiler-cli": "~8.2.0",
45+
"@ngtools/webpack": "~8.2.0",
4446
"babel-traverse": "6.9.0",
4547
"babel-types": "6.10.0",
4648
"babylon": "6.8.1",
4749
"filewalker": "0.1.2",
4850
"lazy": "1.0.11",
49-
"nativescript-dev-typescript": "next",
51+
"nativescript-dev-webpack": "~1.0.1",
5052
"shelljs": "^0.7.0",
5153
"tslint": "^4.5.1",
5254
"typescript": "~3.5.3"

Diff for: ng-sample/tsconfig.json

+9
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,19 @@
2020
"*": [
2121
"./node_modules/tns-core-modules/*",
2222
"./node_modules/*"
23+
],
24+
"~/*": [
25+
"app/*"
2326
]
2427
},
2528
},
29+
"include": [
30+
"../nativescript-angular",
31+
"**/*"
32+
],
2633
"exclude": [
34+
"../nativescript-angular/node_modules",
35+
"../nativescript-angular/**/*.d.ts",
2736
"node_modules",
2837
"platforms"
2938
]

0 commit comments

Comments
 (0)