Skip to content

chore: {N} 8 #2344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 6, 2021
Merged

chore: {N} 8 #2344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5014bbf
feat(rootlayout): add to element-registry (#2335)
williamjuan027 Mar 24, 2021
bec4d55
chore: {N} 8
NathanWalker Mar 24, 2021
0e03790
Merge remote-tracking branch 'origin/master' into feature/nativescript-8
NathanWalker Apr 6, 2021
cdb190c
chore: 8.0.0 deps
NathanWalker Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nativescript-angular-package/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@angular/platform-browser-dynamic": "~11.0.0",
"@angular/router": "~11.0.0",
"@nativescript/angular": "rc",
"@nativescript/core": "rc",
"@nativescript/core": "~8.0.0",
"ng-packagr": "^11.0.0",
"rxjs": "~6.6.0",
"typescript": "~4.0.0"
Expand Down
8 changes: 2 additions & 6 deletions nativescript-angular/element-registry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { View, LayoutBase, Page, Frame, AbsoluteLayout, ActivityIndicator, BottomNavigation, Button, ContentView, DatePicker, DockLayout, GridLayout, HtmlView, Image, Label, ListPicker, ListView, Placeholder, Progress, ProxyViewContainer, Repeater, ScrollView, SearchBar, SegmentedBar, SegmentedBarItem, Slider, StackLayout, FlexboxLayout, Switch, TabView, TabStrip, TabStripItem, TabContentItem, Tabs, TextField, TextView, TimePicker, WebView, WrapLayout, FormattedString, Span } from '@nativescript/core';
import { View, LayoutBase, Page, Frame, AbsoluteLayout, ActivityIndicator, Button, ContentView, DatePicker, DockLayout, GridLayout, HtmlView, Image, Label, ListPicker, ListView, Placeholder, Progress, ProxyViewContainer, Repeater, ScrollView, SearchBar, SegmentedBar, SegmentedBarItem, Slider, StackLayout, FlexboxLayout, Switch, TabView, TextField, TextView, TimePicker, WebView, WrapLayout, FormattedString, Span, RootLayout } from '@nativescript/core';

export interface ViewClass {
new (): View;
Expand Down Expand Up @@ -164,7 +164,6 @@ const frameMeta: ViewClassMeta = {
// Note: ActionBar related components are registerd together with action-bar directives.
registerElement('AbsoluteLayout', () => AbsoluteLayout);
registerElement('ActivityIndicator', () => ActivityIndicator);
registerElement('BottomNavigation', () => BottomNavigation);
registerElement('Button', () => Button);
registerElement('ContentView', () => ContentView);
registerElement('DatePicker', () => DatePicker);
Expand All @@ -183,6 +182,7 @@ registerElement('Placeholder', () => Placeholder);
registerElement('Progress', () => Progress);
registerElement('ProxyViewContainer', () => ProxyViewContainer);
registerElement('Repeater', () => Repeater);
registerElement('RootLayout', () => RootLayout);
registerElement('ScrollView', () => ScrollView);
registerElement('SearchBar', () => SearchBar);
registerElement('SegmentedBar', () => SegmentedBar);
Expand All @@ -192,10 +192,6 @@ registerElement('StackLayout', () => StackLayout);
registerElement('FlexboxLayout', () => FlexboxLayout);
registerElement('Switch', () => Switch);
registerElement('TabView', () => TabView);
registerElement('TabStrip', () => TabStrip);
registerElement('TabStripItem', () => TabStripItem);
registerElement('TabContentItem', () => TabContentItem);
registerElement('Tabs', () => Tabs);
registerElement('TextField', () => TextField);
registerElement('TextView', () => TextView);
registerElement('TimePicker', () => TimePicker);
Expand Down
13 changes: 2 additions & 11 deletions nativescript-angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nativescript/angular",
"version": "11.2.0",
"version": "11.8.0",
"description": "An Angular renderer that lets you build mobile apps with NativeScript.",
"homepage": "https://www.nativescript.org/",
"bugs": "https://github.com/NativeScript/nativescript-angular/issues",
Expand Down Expand Up @@ -60,15 +60,6 @@
"@nativescript/zone-js": "~1.0.0",
"nativescript-intl": "^4.0.0"
},
"peerDependencies": {
"@angular/common": "^11.0.0",
"@angular/compiler": "^11.0.0",
"@angular/core": "^11.0.0",
"@angular/forms": "^11.0.0",
"@angular/platform-browser": "^11.0.0",
"@angular/platform-browser-dynamic": "^11.0.0",
"@angular/router": "^11.0.0"
},
"devDependencies": {
"@angular/animations": "~11.2.0",
"@angular/common": "~11.2.0",
Expand All @@ -79,7 +70,7 @@
"@angular/platform-browser": "~11.2.0",
"@angular/platform-browser-dynamic": "~11.2.0",
"@angular/router": "~11.2.0",
"@nativescript/core": "~7.3.0",
"@nativescript/core": "~8.0.0",
"codelyzer": "^5.2.0",
"conventional-changelog-cli": "^2.0.34",
"husky": "^4.2.5",
Expand Down
2 changes: 1 addition & 1 deletion nativescript-angular/testing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
},
"devDependencies": {
"@nativescript/angular": "latest",
"@nativescript/core": "latest"
"@nativescript/core": "~8.0.0"
}
}
24 changes: 12 additions & 12 deletions tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@
],
"homepage": "http://nativescript.org",
"dependencies": {
"@angular/animations": "~9.1.0",
"@angular/common": "~9.1.0",
"@angular/compiler": "~9.1.0",
"@angular/core": "~9.1.0",
"@angular/forms": "~9.1.0",
"@angular/platform-browser": "~9.1.0",
"@angular/platform-browser-dynamic": "~9.1.0",
"@angular/router": "~9.1.0",
"@angular/animations": "~11.2.0",
"@angular/common": "~11.2.0",
"@angular/compiler": "~11.2.0",
"@angular/core": "~11.2.0",
"@angular/forms": "~11.2.0",
"@angular/platform-browser": "~11.2.0",
"@angular/platform-browser-dynamic": "~11.2.0",
"@angular/router": "~11.2.0",
"nativescript-angular": "../nativescript-angular-package",
"nativescript-unit-test-runner": "0.7.0",
"rxjs": "~6.5.5",
"@nativescript/core": "next",
"@nativescript/core": "~8.0.0",
"zone.js": "^0.10.3"
},
"devDependencies": {
"@angular/compiler-cli": "8.0.0",
"@ngtools/webpack": "8.0.0",
"@angular/compiler-cli": "~11.2.0",
"@ngtools/webpack": "~11.2.0",
"@types/chai": "^4.1.4",
"@types/karma-chai": "0.1.1",
"@types/mocha": "5.2.7",
Expand All @@ -57,7 +57,7 @@
"remove-strict-webpack-plugin": "~0.1.2",
"sinon": "^7.3.2",
"tslint": "^4.5.1",
"typescript": "~3.8.3"
"typescript": "~4.0.0"
},
"scripts": {
"e2e": "tsc -p e2e && mocha --opts ../e2e/config/mocha.opts --recursive e2e --appiumCapsLocation ../e2e/config/appium.capabilities.json",
Expand Down