Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8dceb18

Browse files
author
Elena Hristova
committed
Merge remote-tracking branch 'origin/master' into merge-release-in-master
2 parents 097bd0e + 87c8cea commit 8dceb18

File tree

109 files changed

+30
-3594
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+30
-3594
lines changed

‎DevelopmentWorkflow.md

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
<!-- TOC depthFrom:2 -->
44

5-
- [Running locally](#running-locally)
5+
- [Development Workflow](#development-workflow)
6+
- [Running locally](#running-locally)
67
- [Prerequisites](#prerequisites)
7-
- [Install dependencies](#install-dependencies)
8-
- [Run the sample application (ng-sample)](#run-the-sample-application-ng-sample)
9-
- [Running the tests](#running-the-tests)
10-
- [Testing locally by running e2e tests](#testing-locally-by-running-e2e-tests)
11-
- [Developer workflow](#developer-workflow)
8+
- [Clone repository](#clone-repository)
9+
- [Install dependencies of the compatibility package (nativescript-angular)](#install-dependencies-of-the-compatibility-package-nativescript-angular)
10+
- [Install dependencies of the scoped package (@nativescript/angular)](#install-dependencies-of-the-scoped-package-nativescriptangular)
11+
- [Run some of the e2e applications e.g. router-tab-view](#run-some-of-the-e2e-applications-eg-router-tab-view)
12+
- [Running the tests](#running-the-tests)
13+
- [Testing locally by running e2e tests](#testing-locally-by-running-e2e-tests)
1214

1315
<!-- /TOC -->
1416

@@ -27,18 +29,25 @@ $ git clone git@github.com:NativeScript/nativescript-angular.git
2729
$ cd nativescript-angular
2830
```
2931

30-
### Install dependencies
32+
### Install dependencies of the compatibility package (nativescript-angular)
3133

3234
```
3335
$ cd nativescript-angular
3436
$ npm install
3537
```
3638

37-
### Run the sample application (ng-sample)
39+
### Install dependencies of the scoped package (@nativescript/angular)
40+
41+
```
42+
$ cd nativescript-angular-package
43+
$ npm install
44+
```
45+
46+
### Run some of the e2e applications e.g. router-tab-view
3847

3948
Install NPM packages (use the local copy of `nativescript-angular`):
4049
```
41-
$ cd ng-sample
50+
$ cd e2e/router-tab-view
4251
$ npm install
4352
```
4453

@@ -49,6 +58,8 @@ $ tns run android
4958
$ tns run ios
5059
```
5160

61+
Make changes to `nativescript-angular` (in `./nativescript-angular-package` folder) or `@nativescript/angular` (in `./nativescript-angular` folder) and see them applied in the running app.
62+
5263
## Running the tests
5364

5465
Install the NPM dependencies (use the local copy of `nativescript-angular`):
@@ -95,9 +106,4 @@ NOTE: The steps below describe how to run `renderer` tests, but the same approac
95106
``` bash
96107
npm run e2e -- --runType capabilityName
97108
```
98-
99-
## Developer workflow
100-
101-
1. Open the `nativescript-angular` folder and start a typescript watcher in it `tsc -w`.
102-
2. Make changes to the `test`, `ng-sample`, `e2e` app projects or in `nativescript-angular` folder.
103-
3. Run the `tests`, `ng-sample` or `e2e` apps as shown above.
109+

‎README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ This repository contains the code for integration of NativeScript with Angular.
88

99
<!-- TOC depthFrom:2 -->
1010

11-
- [Watch the video explaining Angular and NativeScript](#watch-the-video-explaining-angular-and-nativescript)
12-
- [Explore the examples](#explore-the-examples)
13-
- [Contribute](#contribute)
14-
- [Known issues](#known-issues)
15-
- [Get Help](#get-help)
11+
- [NativeScript Angular](#nativescript-angular)
12+
- [Watch the video explaining Angular and NativeScript](#watch-the-video-explaining-angular-and-nativescript)
13+
- [Explore the examples](#explore-the-examples)
14+
- [Contribute](#contribute)
15+
- [Known issues](#known-issues)
16+
- [Get Help](#get-help)
1617

1718
<!-- /TOC -->
1819

@@ -22,7 +23,7 @@ This repository contains the code for integration of NativeScript with Angular.
2223

2324
## Explore the examples
2425

25-
The `ng-sample` app is meant for testing stuff while developing the renderer code, and isn't the best example out there. You can take a look at these sample apps that use the published builds from npm:
26+
The `e2e` apps are meant for testing stuff. You can take a look at these additional sample apps that use the published builds from npm:
2627

2728
* [Hello world starter](https://github.com/NativeScript/nativescript-app-templates/tree/master/packages/template-hello-world-ng)
2829
* [Master-detail template](https://github.com/NativeScript/nativescript-app-templates/tree/master/packages/template-master-detail-ng)

‎nativescript-angular-package/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nativescript-angular",
3-
"version": "8.20.1",
3+
"version": "8.30.0",
44
"description": "An Angular renderer that lets you build mobile apps with NativeScript.",
55
"homepage": "https://www.nativescript.org/",
66
"bugs": "https://github.com/NativeScript/nativescript-angular/issues",

‎nativescript-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/angular",
3-
"version": "8.20.1",
3+
"version": "8.30.0",
44
"description": "An Angular renderer that lets you build mobile apps with NativeScript.",
55
"homepage": "https://www.nativescript.org/",
66
"bugs": "https://github.com/NativeScript/nativescript-angular/issues",

‎ng-sample/.vscode/launch.json

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎ng-sample/.vscode/settings.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎ng-sample/LICENSE

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎ng-sample/README.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎ng-sample/app/App_Resources/Android/AndroidManifest.xml

Lines changed: 0 additions & 40 deletions
This file was deleted.
-10.7 KB
Binary file not shown.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /