Merge remote-tracking branch 'origin/master' into vsetoslavtsenov/merge-release-in-master

e2e/nested-frame-navigation/.gitignore

@@ -1,2 +0,0 @@
-.vscode/settings.json
-mochawesome-report

e2e/nested-frame-navigation/README.md

@@ -1,14 +0,0 @@
-Execute Tests
-=============
-
-Android:
-
-```
-npm run e2e -- --runType android23 # --devMode
-```
-
-iOS:
-
-```
-npm run e2e -- --runType sim.iPhoneX.iOS112 # --devMode
-```

e2e/nested-frame-navigation/nsconfig.json

@@ -1,3 +0,0 @@
-{
-	"useLegacyWorkflow": false
-}

e2e/nested-frame-navigation/package.json

@@ -14,12 +14,12 @@
   },
   "dependencies": {
     "nativescript-theme-core": "~1.0.4",
-    "tns-core-modules": "next"
+    "tns-core-modules": "file:../../tns-core-modules"
   },
   "devDependencies": {
     "@types/chai": "~4.1.7",
     "@types/mocha": "~5.2.5",
-    "@types/node": "^12.7.2",
+    "@types/node": "~10.12.18",
     "mocha": "~5.2.0",
     "mochawesome": "~3.1.2",
     "nativescript-dev-appium": "next",

e2e/nested-frame-navigation/tsconfig.json

@@ -6,24 +6,24 @@
         "emitDecoratorMetadata": true,
         "noEmitHelpers": true,
         "noEmitOnError": true,
+        "skipLibCheck": true,
         "lib": [
             "es6",
             "dom"
         ],
         "baseUrl": ".",
         "paths": {
-            "*": [
-                "./node_modules/tns-core-modules/*",
-                "./node_modules/*"
-            ],
             "~/*": [
                 "app/*"
+            ],
+            "*": [
+                "./node_modules/*"
             ]
         }
     },
     "exclude": [
+        "e2e",
         "node_modules",
-        "platforms",
-        "e2e"
+        "platforms"
     ]
-}
+}