Visitar URL original
Merge branch 'master' into textview-maxlines · NativeScript/NativeScript@7dcc40c · GitHub
Skip to content

Commit 7dcc40c

Browse files
author
Alexander Vakrilov
authored
Merge branch 'master' into textview-maxlines
2 parents 97b2244 + 0ffc790 commit 7dcc40c

135 files changed

Lines changed: 3943 additions & 2607 deletions

File tree

Some content is hidden

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

‎.vscode/launch.json‎

Lines changed: 33 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,90 +7,75 @@
77
{
88
"type": "node",
99
"request": "launch",
10-
"name": "Unit Tests",
10+
"name": "Launch mocha tests",
1111
"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
1212
"args": [
1313
"--timeout",
1414
"999999",
1515
"--opts",
1616
"unit-tests/mocha.opts"
1717
],
18-
"internalConsoleOptions": "openOnSessionStart",
18+
"console": "integratedTerminal",
19+
"internalConsoleOptions": "neverOpen",
1920
"preLaunchTask": "tsc-unit-tests"
2021
},
2122
{
22-
"name": "Launch on iOS",
23+
"name": "Launch tests on Android",
2324
"type": "nativescript",
2425
"request": "launch",
25-
"platform": "ios",
26-
"appRoot": "${workspaceRoot}",
26+
"platform": "android",
27+
"appRoot": "${workspaceRoot}/tests",
2728
"sourceMaps": true,
29+
"stopOnEntry": true,
2830
"watch": true
2931
},
30-
// {
31-
// "name": "Test on iOS",
32-
// "type": "nativescript",
33-
// "request": "launch",
34-
// "platform": "ios",
35-
// "appRoot": "${workspaceRoot}",
36-
// "sourceMaps": true,
37-
// "watch": false,
38-
// "stopOnEntry": true,
39-
// "launchTests": true,
40-
// "tnsArgs": [
41-
// "--justlaunch"
42-
// ]
43-
// },
4432
{
45-
"name": "Attach on iOS",
33+
"name": "Launch tests on iOS",
4634
"type": "nativescript",
47-
"request": "attach",
35+
"request": "launch",
4836
"platform": "ios",
49-
"appRoot": "${workspaceRoot}",
37+
"appRoot": "${workspaceRoot}/tests",
5038
"sourceMaps": true,
51-
"watch": false
39+
"stopOnEntry": true,
40+
"watch": true
5241
},
5342
{
54-
"name": "Launch on Android",
43+
"name": "Attach ui tests on Android",
5544
"type": "nativescript",
56-
"request": "launch",
45+
"request": "attach",
5746
"platform": "android",
58-
"appRoot": "${workspaceRoot}",
47+
"appRoot": "${workspaceRoot}/e2e/ui-tests-app",
5948
"sourceMaps": true,
60-
"watch": true
49+
"watch": false
6150
},
6251
{
63-
"name": "Debug tests on Android",
52+
"name": "Launch ui tests on Android",
6453
"type": "nativescript",
6554
"request": "launch",
6655
"platform": "android",
67-
"appRoot": "${workspaceRoot}/tests",
56+
"appRoot": "${workspaceRoot}/e2e/ui-tests-app",
6857
"sourceMaps": true,
6958
"stopOnEntry": true,
70-
"watch": true,
59+
"watch": true
7160
},
72-
// {
73-
// "name": "Test on Android",
74-
// "type": "nativescript",
75-
// "request": "launch",
76-
// "platform": "android",
77-
// "appRoot": "${workspaceRoot}",
78-
// "sourceMaps": true,
79-
// "watch": false,
80-
// "stopOnEntry": true,
81-
// "launchTests": true,
82-
// "tnsArgs": [
83-
// "--justlaunch"
84-
// ]
85-
// },
8661
{
87-
"name": "Attach on Android",
62+
"name": "Attach ui tests on iOS",
8863
"type": "nativescript",
8964
"request": "attach",
90-
"platform": "android",
91-
"appRoot": "${workspaceRoot}",
65+
"platform": "ios",
66+
"appRoot": "${workspaceRoot}/e2e/ui-tests-app",
9267
"sourceMaps": true,
9368
"watch": false
69+
},
70+
{
71+
"name": "Launch ui tests on iOS",
72+
"type": "nativescript",
73+
"request": "launch",
74+
"platform": "ios",
75+
"appRoot": "${workspaceRoot}/e2e/ui-tests-app",
76+
"sourceMaps": true,
77+
"stopOnEntry": true,
78+
"watch": true
9479
}
9580
]
96-
}
81+
}

‎.vscode/tasks.json‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,14 @@
11
{
2-
// See http://go.microsoft.com/fwlink/?LinkId=733558
3-
// for the documentation about the tasks.json format
4-
"version": "0.1.0",
5-
"command": "tsc",
6-
"isShellCommand": true,
7-
"args": ["-p", "."],
8-
"showOutput": "always",
9-
"problemMatcher": "$tsc",
10-
"tasks": [
11-
{
12-
"taskName": "tsc-unit-tests",
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"label": "tsc-unit-tests",
8+
"type": "shell",
139
"problemMatcher": "$tsc",
1410
"command": "./node_modules/.bin/tsc",
15-
"args": [ "-p", "tsconfig.unit-tests.json" ]
16-
},
17-
{
18-
"taskName": "unit-tests",
19-
"command": "npm",
20-
"args": ["run", "unit-test"]
21-
},
22-
{
23-
"taskName": "unit-tests-watch",
24-
"command": "npm",
25-
"args": ["run", "unit-test-watch"]
26-
}
27-
]
11+
"args": [ "-p", "unit-tests/tsconfig.json" ],
12+
}
13+
]
2814
}

‎CHANGELOG.md‎

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,54 @@
1+
<a name="6.2.1"></a>
2+
## [6.2.1](https://github.com/NativeScript/NativeScript/compare/6.2.0...6.2.1) (2019-11-12)
3+
4+
5+
### Bug Fixes
6+
7+
* **dark-mode:** formatted string and html view text color ([#8031](https://github.com/NativeScript/NativeScript/issues/8031)) ([0c7f838](https://github.com/NativeScript/NativeScript/commit/0c7f838))
8+
* ensure @CallSuper native methods call superFunc ([#8025](https://github.com/NativeScript/NativeScript/issues/8025)) ([7fa9978](https://github.com/NativeScript/NativeScript/commit/7fa9978))
9+
* **dev-tools:** use app root in getDocument() ([#8071](https://github.com/NativeScript/NativeScript/issues/8071)) ([f686472](https://github.com/NativeScript/NativeScript/commit/f686472))
10+
* **gradient:** import LinearGradient with alias ([#8063](https://github.com/NativeScript/NativeScript/issues/8063)) ([eb33ede](https://github.com/NativeScript/NativeScript/commit/eb33ede))
11+
12+
13+
### Features
14+
15+
* **application:** add system appearance changed event to typings ([#8034](https://github.com/NativeScript/NativeScript/issues/8034)) ([2a34368](https://github.com/NativeScript/NativeScript/commit/2a34368))
16+
17+
18+
19+
<a name="6.2.0"></a>
20+
# [6.2.0](https://github.com/NativeScript/NativeScript/compare/6.1.2...6.2.0) (2019-10-24)
21+
22+
23+
### Bug Fixes
24+
25+
* **action-bar:** font icon support to NavigationButton ([#7842](https://github.com/NativeScript/NativeScript/issues/7842)) ([4991e6d](https://github.com/NativeScript/NativeScript/commit/4991e6d)) ([#7918](https://github.com/NativeScript/NativeScript/issues/7918)) ([bdb411f](https://github.com/NativeScript/NativeScript/commit/bdb411f))
26+
* **action-bar-ios13:** action bar items population ([#7965](https://github.com/NativeScript/NativeScript/issues/7965)) ([ce96dad](https://github.com/NativeScript/NativeScript/commit/ce96dad))
27+
* **application-settings-android:** possible uninitialized sharedPreferences variable usage ([#7813](https://github.com/NativeScript/NativeScript/issues/7813)) ([4f421ff](https://github.com/NativeScript/NativeScript/commit/4f421ff))
28+
* **css:** parse css selectors with escape sequences ([#7689](https://github.com/NativeScript/NativeScript/issues/7689)) ([5520213](https://github.com/NativeScript/NativeScript/commit/5520213))
29+
* xml parsing when input value is reported as object instead of string ([#7916](https://github.com/NativeScript/NativeScript/issues/7916)) ([a06a5f9](https://github.com/NativeScript/NativeScript/commit/a06a5f9))
30+
* **css-android:** restore elements' native features if offending css is removed while the app is running ([#7789](https://github.com/NativeScript/NativeScript/issues/7789)) ([2beae5b](https://github.com/NativeScript/NativeScript/commit/2beae5b))
31+
* **css-calc:** reduce_css_calc_1.default is not a function ([#7787](https://github.com/NativeScript/NativeScript/issues/7787)) ([03d1ff0](https://github.com/NativeScript/NativeScript/commit/03d1ff0))
32+
* **bottom-navigation-ios:** incorrect layout on orientation change ([#7927](https://github.com/NativeScript/NativeScript/issues/7927)) ([c9bfec1](https://github.com/NativeScript/NativeScript/commit/c9bfec1))
33+
34+
35+
### Features
36+
37+
* **action-bar-android:** add properties to control the titleView content insets ([#7805](https://github.com/NativeScript/NativeScript/issues/7805)) ([57a8605](https://github.com/NativeScript/NativeScript/commit/57a8605))
38+
* **css:** add attribute scoped css without global refresh ([#7907](https://github.com/NativeScript/NativeScript/issues/7907)) ([f791a40](https://github.com/NativeScript/NativeScript/commit/f791a40))
39+
* **css:** Add HSL/HSLA support ([#7730](https://github.com/NativeScript/NativeScript/issues/7730)) ([3cabdde](https://github.com/NativeScript/NativeScript/commit/3cabdde))
40+
* **dark-mode:** add system appearance property, event and CSS classes ([#7887](https://github.com/NativeScript/NativeScript/issues/7887)) ([5c9a217](https://github.com/NativeScript/NativeScript/commit/5c9a217))
41+
* **file-system:** async read/write ([#7671](https://github.com/NativeScript/NativeScript/issues/7671)) ([2146ac9](https://github.com/NativeScript/NativeScript/commit/2146ac9))
42+
* **dark-mode-ios:** adapt dynamic system colors ([#7826](https://github.com/NativeScript/NativeScript/issues/7826)) ([f82cf08](https://github.com/NativeScript/NativeScript/commit/f82cf08))
43+
* **platform-declarations:** add android29 typings ([#7923](https://github.com/NativeScript/NativeScript/issues/7923)) ([dc65402](https://github.com/NativeScript/NativeScript/commit/dc65402))
44+
* **platform-declarations:** generate typings from iOS 13.0 SDK ([#7817](https://github.com/NativeScript/NativeScript/issues/7817)) ([3e8d635](https://github.com/NativeScript/NativeScript/commit/3e8d635))
45+
* **segmented-bar-ios:** add support for the new selectedSegmentTintColor property ([#7880](https://github.com/NativeScript/NativeScript/issues/7880)) ([ca7c46d](https://github.com/NativeScript/NativeScript/commit/ca7c46d))
46+
* overhaul and streamline Android page navigation transitions ([#7925](https://github.com/NativeScript/NativeScript/issues/7925)) ([08e23bc](https://github.com/NativeScript/NativeScript/commit/08e23bc))
47+
* Scoped Packages ([#7911](https://github.com/NativeScript/NativeScript/issues/7911)) ([cc97a16](https://github.com/NativeScript/NativeScript/commit/cc97a16))
48+
* update material components dependency to 92.3 ([#7936](https://github.com/NativeScript/NativeScript/issues/7936)) ([866c2b0](https://github.com/NativeScript/NativeScript/commit/866c2b0))
49+
50+
51+
152
<a name="6.1.2"></a>
253
## [6.1.2](https://github.com/NativeScript/NativeScript/compare/6.1.1...6.1.2) (2019-10-15)
354

@@ -1108,7 +1159,7 @@ A full list of breaking changes could be found [here](https://github.com/NativeS
11081159

11091160
- [(#2834)](https://github.com/NativeScript/NativeScript/issues/2834) Animations: scale() syntax does not support only one argument
11101161

1111-
- [(#2813)](https://github.com/NativeScript/NativeScript/issues/2813) The Camera module in Android doesn't handle pemissions for you
1162+
- [(#2813)](https://github.com/NativeScript/NativeScript/issues/2813) The Camera module in Android doesn't handle permissions for you
11121163

11131164
- [(#2789)](https://github.com/NativeScript/NativeScript/issues/2789) CSS border-width causes text to overflow TextView
11141165

‎CONTRIBUTING.md‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Here are some guides on how to do that:
77
- [Reporting Bugs](#bugs)
88
- [Requesting New Features](#features)
99
- [Submitting a PR](#pr)
10+
- [Check test report](#test-report)
1011
- [Commit Message Guidelines](#commit-messages)
1112
- [Releasing new versions](#release)
1213

@@ -82,6 +83,23 @@ It's our turn from there on! We will review the PR and discuss changes you might
8283

8384
>Note: Sometimes you will see someone from the contributors team writing strange comments like: `test` or `test branch_functional_tests#css-gradients-tests branch_widgets#vultix/css-gradients` - don't worry about it, these are just phrases that trigger the internal CI builds.
8485
86+
## <a name="test-report"></a> Check test report
87+
88+
The purpose of the test report view is to show the tests' results for the PRs for the external contributors. When a NativeScript team member triggers the tests, you can review the result by selecting the `Details` button next to the `ci/jenkins/core-modules-tests` task.
89+
90+
> Note: the `Details` button will be available when the execution of the test completes and there is at least one failing test.
91+
92+
When you click on the button, you will be redirected to the report page. On the left pane you can find a list of all failed jobs.
93+
94+
> Note: Each item name consists of the application name, type of device and platform version: `pr-e2e-tests-[application-name]-[device-type]-[platform-version]`. Usually, the test applications, that are executed for PRs are part of NativeScript repository.
95+
96+
Based on the executed suite, one of the following or all of the following files will be generated: `mochawesome.html` | `index.html` | `unit-tests.log`. Some of the reports also might include `*.png`, `*.logs` or `[page source].xml` files that can help in understanding where is the problem.
97+
98+
For example:
99+
1. When you select the `index.html` page, an additional `TestNG Results` sidebar will be displayed. There you can find a list of all failures.
100+
2. When you select one of them, you will see on the right side all tests, that have been executed. The problematic ones will be coloured in red.
101+
3. If you click on one of them, detailed info or error log will be displayed. As we've mentioned above in some of the test reports, you will also find screenshots, that demonstrates the problem visually. Those images can be found below the info/ error log.
102+
85103
## <a name="commit-messages"></a> Commit Message Guidelines
86104

87105
Please follow the git commit message format described below when committing your changes or submitting a PR. That allows us to use the commit messages to generate a change log for every new release.
@@ -245,7 +263,14 @@ cd ..
245263
4. Execute [`npm version`](https://docs.npmjs.com/cli/version) to bump the version of `tns-core-modules`,
246264
tag the release and update the CHANGELOG.md. Don't forget to check the auto-generated CHANGELOG.md
247265
```
248-
cd tns-core-modules
266+
cd nativescript-core
267+
npm --no-git-tag-version version [major|minor|patch] -m "release: cut the %s release"
268+
cd ..
269+
270+
5. Execute [`npm version`](https://docs.npmjs.com/cli/version) to bump the version of `tns-core-modules`,
271+
tag the release and update the CHANGELOG.md. Don't forget to check the auto-generated CHANGELOG.md
272+
```
273+
cd tns-core-modules-package
249274
npm --no-git-tag-version version [major|minor|patch] -m "release: cut the %s release"
250275
cd ..
251276
```
@@ -254,7 +279,7 @@ Usually tns-core-modules-widgets should already have been released and we need t
254279
255280
7. Create release-branch with change log
256281
```
257-
git checkout -b release-[release-version]
282+
git checkout -b release-[version]
258283
```
259284
260285
7. Add changes
@@ -263,9 +288,9 @@ git add changed-files
263288
git commit -m "release: cut the %s release"
264289
git push
265290
```
266-
8. Create git tag
291+
8. Create git tag as git tag 6.3.0 or use git UI
267292
```
268-
git tag release-version
293+
git tag [release-version]
269294
git push --tags
270295
```
271296
9. Create a pull request. Be careful to base your branch on the correct branch

0 commit comments

Comments
 (0)