Skip to content

Commit 72fc731

Browse files
hypery2khypery2k
authored
Merge branch 'master' into travis_improvement
2 parents deedae9 + 040e0e3 commit 72fc731

File tree

8 files changed

+97
-80
lines changed

8 files changed

+97
-80
lines changed

‎CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
<a name="5.2.0"></a>
2+
# [5.2.0](https://github.com/NativeScript/nativescript-angular/compare/5.0.0...5.2.0) (2018-01-17)
3+
4+
5+
### Features
6+
7+
* add support for Angular 5.2 ([#1154](https://github.com/NativeScript/nativescript-angular/issues/1154)) ([faa690](https://github.com/NativeScript/nativescript-angular/commit/faa690))
8+
9+
* enable typescript 2.6 ([#1156](https://github.com/NativeScript/nativescript-angular/issues/1156)) ([2a5742b](https://github.com/NativeScript/nativescript-angular/commit/2a5742b))
10+
11+
12+
13+
<a name="5.1.0"></a>
14+
# [5.1.0](https://github.com/NativeScript/nativescript-angular/compare/5.0.0...5.1.0) (2018-01-10)
15+
16+
17+
### Features
18+
19+
* add support for Angular 5.1 ([#1134](https://github.com/NativeScript/nativescript-angular/issues/1134)) ([2e944a8](https://github.com/NativeScript/nativescript-angular/commit/2e944a8))
20+
21+
122
<a name="5.0.0"></a>
223
# [5.0.0](https://github.com/NativeScript/nativescript-angular/compare/5.0.0-rc.0...v5.0.0) (2017-12-20)
324

‎e2e/renderer/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
}
1111
},
1212
"dependencies": {
13-
"@angular/common": "~5.0.0",
14-
"@angular/compiler": "~5.0.0",
15-
"@angular/core": "~5.0.0",
16-
"@angular/forms": "~5.0.0",
17-
"@angular/http": "~5.0.0",
18-
"@angular/platform-browser": "~5.0.0",
19-
"@angular/platform-browser-dynamic": "~5.0.0",
20-
"@angular/router": "~5.0.0",
13+
"@angular/common": "~5.2.0",
14+
"@angular/compiler": "~5.2.0",
15+
"@angular/core": "~5.2.0",
16+
"@angular/forms": "~5.2.0",
17+
"@angular/http": "~5.2.0",
18+
"@angular/platform-browser": "~5.2.0",
19+
"@angular/platform-browser-dynamic": "~5.2.0",
20+
"@angular/router": "~5.2.0",
2121
"nativescript-angular": "file:../../nativescript-angular",
2222
"nativescript-intl": "^3.0.0",
2323
"reflect-metadata": "~0.1.8",
@@ -42,11 +42,11 @@
4242
"nativescript-dev-appium": "next",
4343
"nativescript-dev-typescript": "~0.4.0",
4444
"tslib": "^1.7.1",
45-
"typescript": "~2.4.2"
45+
"typescript": "~2.6.2"
4646
},
4747
"scripts": {
4848
"e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
4949
"compile-tests-w": "tsc -p e2e --watch",
5050
"update-app-ng-deps": "update-app-ng-deps"
5151
}
52-
}
52+
}

‎e2e/router/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "~4.4.1",
17-
"@angular/common": "~5.0.0",
18-
"@angular/compiler": "~5.0.0",
19-
"@angular/core": "~5.0.0",
20-
"@angular/forms": "~5.0.0",
21-
"@angular/http": "~5.0.0",
22-
"@angular/platform-browser": "~5.0.0",
23-
"@angular/platform-browser-dynamic": "~5.0.0",
24-
"@angular/router": "~5.0.0",
16+
"@angular/animations": "~5.2.0",
17+
"@angular/common": "~5.2.0",
18+
"@angular/compiler": "~5.2.0",
19+
"@angular/core": "~5.2.0",
20+
"@angular/forms": "~5.2.0",
21+
"@angular/http": "~5.2.0",
22+
"@angular/platform-browser": "~5.2.0",
23+
"@angular/platform-browser-dynamic": "~5.2.0",
24+
"@angular/router": "~5.2.0",
2525
"nativescript-angular": "file:../../nativescript-angular",
2626
"nativescript-intl": "^3.0.0",
2727
"reflect-metadata": "~0.1.8",
@@ -46,7 +46,7 @@
4646
"nativescript-dev-appium": "next",
4747
"nativescript-dev-typescript": "~0.4.0",
4848
"tslib": "^1.7.1",
49-
"typescript": "~2.4.2"
49+
"typescript": "~2.6.2"
5050
},
5151
"scripts": {
5252
"e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",

‎nativescript-angular/package.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "nativescript-angular",
4-
"version": "5.0.0",
4+
"version": "5.2.0",
55
"description": "An Angular renderer that lets you build mobile apps with NativeScript.",
66
"homepage": "https://www.nativescript.org/",
77
"bugs": "https://github.com/NativeScript/nativescript-angular/issues",
@@ -43,35 +43,35 @@
4343
"reflect-metadata": "^0.1.8"
4444
},
4545
"peerDependencies": {
46-
"@angular/platform-browser-dynamic": "~5.1.0",
47-
"@angular/common": "~5.1.0",
48-
"@angular/compiler": "~5.1.0",
49-
"@angular/core": "~5.1.0",
50-
"@angular/forms": "~5.1.0",
51-
"@angular/http": "~5.1.0",
52-
"@angular/platform-browser": "~5.1.0",
53-
"@angular/router": "~5.1.0",
46+
"@angular/platform-browser-dynamic": "~5.2.0",
47+
"@angular/common": "~5.2.0",
48+
"@angular/compiler": "~5.2.0",
49+
"@angular/core": "~5.2.0",
50+
"@angular/forms": "~5.2.0",
51+
"@angular/http": "~5.2.0",
52+
"@angular/platform-browser": "~5.2.0",
53+
"@angular/router": "~5.2.0",
5454
"rxjs": "^5.5.0",
55-
"tns-core-modules": "^3.1.0 || >3.4.0-",
55+
"tns-core-modules": "^3.4.0 || >4.0.0-",
5656
"zone.js": "^0.8.4",
57-
"typescript": "~2.4.2"
57+
"typescript": "~2.6.2"
5858
},
5959
"devDependencies": {
60-
"@angular/platform-browser-dynamic": "~5.1.0",
61-
"@angular/animations": "~5.1.0",
62-
"@angular/common": "~5.1.0",
63-
"@angular/compiler": "~5.1.0",
64-
"@angular/compiler-cli": "~5.1.0",
65-
"@angular/core": "~5.1.0",
66-
"@angular/forms": "~5.1.0",
67-
"@angular/http": "~5.1.0",
68-
"@angular/platform-browser": "~5.1.0",
69-
"@angular/router": "~5.1.0",
60+
"@angular/platform-browser-dynamic": "~5.2.0",
61+
"@angular/animations": "~5.2.0",
62+
"@angular/common": "~5.2.0",
63+
"@angular/compiler": "~5.2.0",
64+
"@angular/compiler-cli": "~5.2.0",
65+
"@angular/core": "~5.2.0",
66+
"@angular/forms": "~5.2.0",
67+
"@angular/http": "~5.2.0",
68+
"@angular/platform-browser": "~5.2.0",
69+
"@angular/router": "~5.2.0",
7070
"codelyzer": "^4.0.0",
7171
"rxjs": "^5.5.0",
7272
"tns-core-modules": "next",
7373
"tslint": "^5.5.0",
74-
"typescript": "~2.4.2",
74+
"typescript": "~2.6.2",
7575
"zone.js": "^0.8.12"
7676
}
7777
}

‎nativescript-angular/platform-common.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ export class NativeScriptSanitizer extends Sanitizer {
6262
}
6363
}
6464

65+
// Add a fake polyfill for the document object
66+
(<any>global).document = (<any>global).document || {};
67+
const doc = (<any>global).document;
68+
doc.body = Object.assign((doc.body || {}), {
69+
isOverride: true,
70+
});
71+
6572
export class NativeScriptDocument {
6673
createElement(tag: string) {
6774
throw new Error("NativeScriptDocument is not DOM Document. There is no createElement() method.");
@@ -71,7 +78,7 @@ export class NativeScriptDocument {
7178
export const COMMON_PROVIDERS = [
7279
defaultPageFactoryProvider,
7380
{ provide: Sanitizer, useClass: NativeScriptSanitizer, deps: [] },
74-
{ provide: DOCUMENT, useClass: NativeScriptDocument, deps: [] },
81+
{ provide: DOCUMENT, useValue: doc },
7582
];
7683

7784
export class NativeScriptPlatformRef extends PlatformRef {

‎nativescript-angular/platform.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {
1818
} from "@angular/platform-browser-dynamic";
1919

2020
import {
21-
DOCUMENT,
2221
ɵINTERNAL_BROWSER_PLATFORM_PROVIDERS as INTERNAL_BROWSER_PLATFORM_PROVIDERS
2322
} from "@angular/platform-browser";
2423

@@ -32,13 +31,6 @@ import {
3231
StaticProvider,
3332
} from "@angular/core";
3433

35-
// Add a fake polyfill for the document object
36-
(<any>global).document = (<any>global).document || {};
37-
const doc = (<any>global).document;
38-
doc.body = Object.assign((doc.body || {}), {
39-
isOverride: true,
40-
});
41-
4234
// Work around a TS bug requiring an imports of
4335
// InjectionToken, ViewEncapsulation and MissingTranslationStrategy
4436
// without using them
@@ -67,10 +59,6 @@ export const NS_COMPILER_PROVIDERS: StaticProvider[] = [
6759
},
6860
multi: true
6961
},
70-
{
71-
provide: DOCUMENT,
72-
useValue: doc,
73-
},
7462
];
7563

7664
// Dynamic platform

‎ng-sample/package.json

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@
3232
},
3333
"homepage": "https://github.com/NativeScript/template-hello-world",
3434
"dependencies": {
35-
"@angular/animations": "~5.0.0",
36-
"@angular/common": "~5.0.0",
37-
"@angular/compiler": "~5.0.0",
38-
"@angular/core": "~5.0.0",
39-
"@angular/forms": "~5.0.0",
40-
"@angular/http": "~5.0.0",
41-
"@angular/platform-browser": "~5.0.0",
42-
"@angular/platform-browser-dynamic": "~5.0.0",
43-
"@angular/router": "~5.0.0",
35+
"@angular/animations": "~5.2.0",
36+
"@angular/common": "~5.2.0",
37+
"@angular/compiler": "~5.2.0",
38+
"@angular/core": "~5.2.0",
39+
"@angular/forms": "~5.2.0",
40+
"@angular/http": "~5.2.0",
41+
"@angular/platform-browser": "~5.2.0",
42+
"@angular/platform-browser-dynamic": "~5.2.0",
43+
"@angular/router": "~5.2.0",
4444
"nativescript-angular": "file:../nativescript-angular",
45-
"rxjs": "^5.5.2",
45+
"rxjs": "^5.5.0",
4646
"tns-core-modules": "next",
47-
"zone.js": "~0.8.2"
47+
"zone.js": "^0.8.4"
4848
},
4949
"devDependencies": {
5050
"babel-traverse": "6.9.0",
@@ -55,9 +55,10 @@
5555
"nativescript-dev-typescript": "^0.3.1",
5656
"shelljs": "^0.7.0",
5757
"tslint": "^4.5.1",
58-
"typescript": "~2.4.2"
58+
"typescript": "~2.6.2"
5959
},
6060
"scripts": {
61-
"tslint": "tslint --project tsconfig.json --config tslint.json"
61+
"tslint": "tslint --project tsconfig.json --config tslint.json",
62+
"update-app-ng-deps": "update-app-ng-deps"
6263
}
63-
}
64+
}

‎tests/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
],
2121
"homepage": "http://nativescript.org",
2222
"dependencies": {
23-
"@angular/animations": "~5.0.0",
24-
"@angular/common": "~5.0.0",
25-
"@angular/compiler": "~5.0.0",
26-
"@angular/core": "~5.0.0",
27-
"@angular/forms": "~5.0.0",
28-
"@angular/http": "~5.0.0",
29-
"@angular/platform-browser": "~5.0.0",
30-
"@angular/platform-browser-dynamic": "~5.0.0",
31-
"@angular/router": "~5.0.0",
23+
"@angular/animations": "~5.2.0",
24+
"@angular/common": "~5.2.0",
25+
"@angular/compiler": "~5.2.0",
26+
"@angular/core": "~5.2.0",
27+
"@angular/forms": "~5.2.0",
28+
"@angular/http": "~5.2.0",
29+
"@angular/platform-browser": "~5.2.0",
30+
"@angular/platform-browser-dynamic": "~5.2.0",
31+
"@angular/router": "~5.2.0",
3232
"nativescript-angular": "../nativescript-angular",
3333
"nativescript-unit-test-runner": "^0.3.4",
3434
"rxjs": "^5.5.0",
@@ -60,12 +60,12 @@
6060
"socket.io-client": "1.4.8",
6161
"tslib": "^1.7.1",
6262
"tslint": "^4.5.1",
63-
"typescript": "~2.4.2",
63+
"typescript": "~2.6.2",
6464
"mocha": "~3.5.0"
6565
},
6666
"scripts": {
6767
"e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
6868
"compile-tests-w": "tsc -p e2e --watch",
6969
"update-app-ng-deps": "update-app-ng-deps"
7070
}
71-
}
71+
}

0 commit comments

Comments
 (0)