mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-11-05 13:26:48 +08:00
Merge remote-tracking branch 'origin/master' into svetoslavtsenov/merge-6.2.0-release-in-master
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -16,6 +16,7 @@ package-lock.json
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
.nsbuildinfo
|
.nsbuildinfo
|
||||||
tsdoc-metadata.json
|
tsdoc-metadata.json
|
||||||
|
thumbs.db
|
||||||
|
|
||||||
# IDEs and editors
|
# IDEs and editors
|
||||||
/.idea
|
/.idea
|
||||||
|
|||||||
@@ -7,6 +7,9 @@ script:
|
|||||||
- npm run setup
|
- npm run setup
|
||||||
- npm run unit-test
|
- npm run unit-test
|
||||||
|
|
||||||
|
# public API changes check
|
||||||
|
- npm run api-extractor-ci
|
||||||
|
|
||||||
# circular references check
|
# circular references check
|
||||||
- cd tests && npm i
|
- cd tests && npm i
|
||||||
- node_modules/.bin/webpack --env.android
|
- node_modules/.bin/webpack --env.android
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ git checkout -b <my-fix-branch> master
|
|||||||
- Rebase your changes to the latest master: `git pull --rebase upstream master`.
|
- Rebase your changes to the latest master: `git pull --rebase upstream master`.
|
||||||
- Ensure all unit test are green for Android and iOS. Check [running unit tests](DevelopmentWorkflow.md#running-unit-tests).
|
- Ensure all unit test are green for Android and iOS. Check [running unit tests](DevelopmentWorkflow.md#running-unit-tests).
|
||||||
- Ensure your changes pass tslint validation. (run `npm run tslint` in the root of the repo).
|
- Ensure your changes pass tslint validation. (run `npm run tslint` in the root of the repo).
|
||||||
|
- If you've made changes to a public API, make sure you update and add the `api-reports/NativeScript.api.md` file to the PR. (run `npm run api-extractor` to update the api-report and definitions).
|
||||||
|
|
||||||
6. Push your fork. If you have rebased you might have to use force-push your branch:
|
6. Push your fork. If you have rebased you might have to use force-push your branch:
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ Check out the links below to get started:
|
|||||||
|
|
||||||
## For CTOs
|
## For CTOs
|
||||||
|
|
||||||
Making the right technology choices is key to success. Our [CTO’s guide to NativeScript](https://www.nativescript.org/ctos-guide) helps you understand why NativeScript is the right choice for your next mobile project.
|
Making the right technology choices is the key to success. Our [CTO’s guide to NativeScript](https://www.nativescript.org/ctos-guide) helps you understand why NativeScript is the right choice for your next mobile project.
|
||||||
|
|
||||||
## Getting Started and Installation
|
## Getting Started and Installation
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ extract_snippets() {
|
|||||||
|
|
||||||
npm install markdown-snippet-injector
|
npm install markdown-snippet-injector
|
||||||
|
|
||||||
for SNIPPET_DIR in {tests/app,apps/app,tns-core-modules} ; do
|
for SNIPPET_DIR in {tests/app,apps/app,nativescript-core} ; do
|
||||||
echo "Extracting snippets from: $SNIPPET_DIR"
|
echo "Extracting snippets from: $SNIPPET_DIR"
|
||||||
node "$BIN" --root="$SNIPPET_DIR" --target="$TARGET_DIR" \
|
node "$BIN" --root="$SNIPPET_DIR" --target="$TARGET_DIR" \
|
||||||
--sourceext=".js|.ts|.xml|.html|.css"
|
--sourceext=".js|.ts|.xml|.html|.css"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"main": "index",
|
"main": "index",
|
||||||
"types": "index.d.ts",
|
"types": "index.d.ts",
|
||||||
"description": "Telerik NativeScript Core Modules",
|
"description": "Telerik NativeScript Core Modules",
|
||||||
"version": "6.2.0",
|
"version": "6.3.0",
|
||||||
"homepage": "https://www.nativescript.org",
|
"homepage": "https://www.nativescript.org",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|||||||
@@ -47,6 +47,7 @@
|
|||||||
"unit-test-watch": "mocha-typescript-watch -p unit-tests/tsconfig.json --opts unit-tests/mocha.opts",
|
"unit-test-watch": "mocha-typescript-watch -p unit-tests/tsconfig.json --opts unit-tests/mocha.opts",
|
||||||
"dev-link-tns-core-modules-widgets": "(cd tns-core-modules-widgets/dist/package && npm link) && (cd nativescript-core && npm i ../tns-core-modules-widgets/dist/package --save)",
|
"dev-link-tns-core-modules-widgets": "(cd tns-core-modules-widgets/dist/package && npm link) && (cd nativescript-core && npm i ../tns-core-modules-widgets/dist/package --save)",
|
||||||
"api-extractor": "api-extractor run --local --verbose && (cd nativescript-core && cat nativescript-core.header nativescript-core.d.ts > tmp_file && mv tmp_file nativescript-core.d.ts)",
|
"api-extractor": "api-extractor run --local --verbose && (cd nativescript-core && cat nativescript-core.header nativescript-core.d.ts > tmp_file && mv tmp_file nativescript-core.d.ts)",
|
||||||
|
"api-extractor-ci": "api-extractor run --verbose",
|
||||||
"typedoc": "npm run api-extractor && typedoc --tsconfig tsconfig.typedoc.json",
|
"typedoc": "npm run api-extractor && typedoc --tsconfig tsconfig.typedoc.json",
|
||||||
"typedoc-dev": "npm run typedoc && cd bin/dist/apiref && npx http-server",
|
"typedoc-dev": "npm run typedoc && cd bin/dist/apiref && npx http-server",
|
||||||
"build-core": "sh ./build/build-core.sh",
|
"build-core": "sh ./build/build-core.sh",
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"main": "index",
|
"main": "index",
|
||||||
"types": "index.d.ts",
|
"types": "index.d.ts",
|
||||||
"description": "Telerik NativeScript Core Modules",
|
"description": "Telerik NativeScript Core Modules",
|
||||||
"version": "6.2.0",
|
"version": "6.3.0",
|
||||||
"homepage": "https://www.nativescript.org",
|
"homepage": "https://www.nativescript.org",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "tns-core-modules-widgets",
|
"name": "tns-core-modules-widgets",
|
||||||
"version": "6.2.0",
|
"version": "6.3.0",
|
||||||
"description": "Native widgets used in the NativeScript framework.",
|
"description": "Native widgets used in the NativeScript framework.",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "echo \"Error: no test specified\" && exit 1"
|
"test": "echo \"Error: no test specified\" && exit 1"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "tns-platform-declarations",
|
"name": "tns-platform-declarations",
|
||||||
"version": "6.2.0",
|
"version": "6.3.0",
|
||||||
"description": "Platform-specific TypeScript declarations for NativeScript for accessing native objects",
|
"description": "Platform-specific TypeScript declarations for NativeScript for accessing native objects",
|
||||||
"main": "",
|
"main": "",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
Reference in New Issue
Block a user