Skip to content

Commit 4a41be5

Browse files
msaelicesmsaelices
committed
Merge remote-tracking branch 'upstream/master'
2 parents 3a96a1b + 286fcd3 commit 4a41be5

File tree

1,921 files changed

+223632
-19601
lines changed

Some content is hidden

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

1,921 files changed

+223632
-19601
lines changed

‎.gitignore

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
# Folders
22
dist
33
hooks
4+
ios-typings-prj
45
libs
56
node_modules
67
package
78
platforms
8-
!tns-core-modules/platforms
9+
!nativescript-core/platforms
910
reports
1011
tags
12+
temp
1113

1214
# Files
1315
package-lock.json
1416
.DS_Store
1517
.nsbuildinfo
18+
tsdoc-metadata.json
19+
thumbs.db
1620

1721
# IDEs and editors
1822
/.idea
@@ -21,6 +25,8 @@ package-lock.json
2125
.c9/
2226
*.launch
2327
.settings/
28+
.atom
29+
.ctags-exclude
2430

2531
# IDE - VSCode
2632
.vscode/*
@@ -30,8 +36,10 @@ package-lock.json
3036
!.vscode/extensions.json
3137

3238
# Appium files
39+
mochawesome-report
3340
e2e/**/*.trace/
3441
e2e/**/test-results.xml
42+
e2e/**/e2e/resources/
3543

3644
# Webpack configuration files
3745
webpack.config.js
@@ -42,30 +50,25 @@ tsconfig.tns.json
4250
*.map
4351
*.tgz
4452
.baseDir.ts
45-
.sublime-grunt.cache
4653
tscommand*.tmp.txt
4754
.tscache
4855

4956
# Other
5057
*.js
58+
!tns-core-modules-package/**/*.js
5159
# https://github.com/NativeScript/nativescript-dev-webpack/issues/932
52-
!tns-core-modules/xml/xml.js
60+
!nativescript-core/xml/xml.js
5361
!tests/hooks/**/*.*
54-
!gruntfile.js
55-
!js-libs/**/*.*
56-
!css/**/*.*
57-
!css-value/**/*.*
58-
!fetch/**/*.*
59-
!apps/TelerikNEXT/lib/**/*.*
60-
!build/**/*.*
61-
.vs/
62-
63-
.baseDir.ts
64-
.ctags-exclude
62+
!nativescript-core/js-libs/**/*.*
63+
!nativescript-core/cli-hooks/**/*.*
64+
!nativescript-core/css/**/*.*
65+
nativescript-core/css/parser.js*
66+
nativescript-core/css/system-classes.js*
67+
!nativescript-core/css-value/**/*.*
68+
!nativescript-core/fetch/**/*.*
69+
!nativescript-core/build/**/*.*
6570

66-
TestRunResult.txt
67-
.testsapprun
71+
#generated by api-extractor
72+
nativescript-core/nativescript-core.d.ts
6873

69-
tns-core-modules.base.d.ts
70-
tns-core-modules.d.ts
71-
tns-core-modules.es6.d.ts
74+
.vs/

‎.travis.yml

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,17 @@
1-
env:
2-
global:
3-
- DATE=$(date +%Y-%m-%d)
4-
- PACKAGE_VERSION=$DATE-$TRAVIS_BUILD_NUMBER
5-
language: objective-c
6-
osx_image: xcode10.2
7-
jdk:
8-
- oraclejdk8
9-
- openjdk8
1+
language: node_js
2+
node_js:
3+
- "node"
104
script:
11-
- export JAVA_HOME=$HOME/openjdk8
12-
- $TRAVIS_BUILD_DIR/install-jdk.sh --install openjdk8 --target $JAVA_HOME
13-
- # do stuff with open OpenJDK 11
14-
- jdk_switcher use openjdk8
15-
install:
16-
# - brew update
17-
# - brew cask install android-sdk
18-
# Suppress output of sdkmanager to keep log under the 4MB limit of travis-ci
19-
# - yes | sdkmanager "platforms;android-28" >/dev/null
20-
# - yes | sdkmanager "build-tools;28.0.3" >/dev/null
21-
# - yes | sdkmanager "extras;android;m2repository" >/dev/null
22-
before_script:
23-
# - export ANDROID_HOME=/usr/local/share/android-sdk
24-
- npm install -g grunt-cli
25-
- npm install
26-
script:
27-
# - npm run setup-widgets
5+
- npm install
6+
- npm run tslint
287
- npm run setup
29-
- npm run tsc
30-
- npm run tslint
8+
- npm run unit-test
9+
10+
# public API changes check
11+
- npm run api-extractor-ci
12+
13+
# circular references check
14+
- cd tests && npm i
15+
- node_modules/.bin/webpack --env.android
16+
- node_modules/.bin/webpack --env.ios
17+

‎.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
}

0 commit comments

Comments
 (0)