Skip to content

Commit ec586d1

Browse files
author
VladimirAmiorkov
committed
chore: upgrade app to latest versions and webpack
1 parent 68248ab commit ec586d1

File tree

7 files changed

+31
-13
lines changed

7 files changed

+31
-13
lines changed

tests/app/snippets/gestures.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import {
99

1010
@Component({
1111
selector: "gestures",
12-
templateUrl: "snippets/gestures.component.html",
12+
moduleId: module.id,
13+
templateUrl: "gestures.component.html",
1314
styles: ["label { font-size: 32; margin: 2; background-color: lightgreen;}"]
1415
})
1516
export class GestureComponent {

tests/app/snippets/icon-font.component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import {Component} from "@angular/core";
44
@Component({
55
// >> (hide)
66
selector: "icon-font",
7-
templateUrl: "snippets/icon-font.component.html",
8-
styleUrls: ["snippets/icon-font.component.css"]
7+
moduleId: module.id,
8+
templateUrl: "icon-font.component.html",
9+
styleUrls: ["icon-font.component.css"]
910
// << (hide)
1011
// ...
1112
})

tests/app/snippets/layouts.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import {Component} from "@angular/core";
22

33
@Component({
44
selector: "gestures",
5-
templateUrl: "snippets/layouts.component.html",
5+
moduleId: module.id,
6+
templateUrl: "layouts.component.html",
67
styles: [
78
"Image { background-color: coral }",
89
".title { margin: 10; horizontal-align: center; font-size: 32 }",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = require("nativescript-unit-test-runner/lib/after-prepare");
1+
module.exports = require("nativescript-unit-test-runner/./lib/after-prepare.js");

tests/nsconfig.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"useLegacyWorkflow": false,
3+
"appPath": "app",
4+
"appResourcesPath": "app/App_Resources"
5+
}

tests/package.json

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
"nativescript": {
33
"id": "org.nativescript.ngtests",
44
"tns-ios": {
5-
"version": "next"
5+
"version": "6.0.0-2019-06-06-144931-01"
66
},
77
"tns-android": {
8-
"version": "next"
8+
"version": "6.0.0-2019-06-10-092203-01"
99
}
1010
},
1111
"name": "ngtests",
12-
"main": "app.js",
1312
"version": "1.0.0",
1413
"author": "Telerik <[email protected]>",
1514
"description": "Angular tests",
@@ -36,28 +35,33 @@
3635
"@angular/platform-browser-dynamic": "8.0.0",
3736
"@angular/router": "8.0.0",
3837
"nativescript-angular": "../nativescript-angular",
39-
"nativescript-unit-test-runner": "^0.3.4",
38+
"nativescript-unit-test-runner": "~0.6.3",
4039
"rxjs": "~6.3.3",
4140
"tns-core-modules": "next",
4241
"zone.js": "^0.8.4"
4342
},
4443
"devDependencies": {
44+
"@angular/compiler-cli": "8.0.0",
45+
"@ngtools/webpack": "8.0.0",
4546
"@types/chai": "^4.1.4",
46-
"@types/mocha": "^5.2.4",
47+
"@types/karma-chai": "0.1.1",
48+
"@types/mocha": "5.2.6",
4749
"@types/sinon": "^7.0.11",
4850
"babel-traverse": "6.8.0",
4951
"babel-types": "6.8.1",
5052
"babylon": "6.8.0",
51-
"chai": "4.1.2",
52-
"karma": "2.0.4",
53+
"chai": "4.2.0",
54+
"karma": "4.1.0",
5355
"karma-chai": "0.1.0",
5456
"karma-mocha": "1.3.0",
5557
"karma-mocha-reporter": "2.2.5",
5658
"karma-nativescript-launcher": "0.4.0",
5759
"karma-sinon": "^1.0.5",
60+
"karma-webpack": "3.0.5",
5861
"lazy": "1.0.11",
59-
"mocha": "5.2.0",
62+
"mocha": "6.1.4",
6063
"nativescript-dev-typescript": "next",
64+
"nativescript-dev-webpack": "~0.25.0-webpack-2019-06-06-120047-02",
6165
"sinon": "^7.3.2",
6266
"tslint": "^4.5.1",
6367
"typescript": "~3.4.5"

tests/tsconfig.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@
2222
]
2323
}
2424
},
25+
"include": [
26+
"../nativescript-angular",
27+
"**/*"
28+
],
2529
"exclude": [
30+
"../nativescript-angular/node_modules",
31+
"../nativescript-angular/**/*.d.ts",
2632
"node_modules",
2733
"platforms",
2834
"**/*.aot",

0 commit comments

Comments
 (0)