Merge pull request #1911 from NativeScript/hristova/merge-release-in-master

chore: merge release in master

Author: Vladimir Amiorkov

e2e/animation-examples/app/App_Resources/Android/AndroidManifest.xml renamed to e2e/animation-examples/app/App_Resources/Android/src/main/AndroidManifest.xml

@@ -43,7 +43,6 @@
     "mochawesome": "~3.1.2",
     "nativescript-css-loader": "~0.26.0",
     "nativescript-dev-appium": "next",
-    "nativescript-dev-typescript": "next",
     "nativescript-dev-webpack": "next",
     "typescript": "~3.4.5"
   },

e2e/animation-examples/app/App_Resources/Android/drawable-hdpi/background.png renamed to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png

@@ -4,13 +4,7 @@
   "readme": "NativeScript Application",
   "repository": "<fill-your-repository-here>",
   "nativescript": {
-    "id": "org.nativescript.modalnavigationng",
-    "tns-android": {
-      "version": "next"
-    },
-    "tns-ios": {
-      "version": "next"
-    }
+    "id": "org.nativescript.modalnavigationng"
   },
   "dependencies": {
     "@angular/animations": "~8.0.0",
@@ -23,7 +17,6 @@
     "@angular/platform-browser-dynamic": "~8.0.0",
     "@angular/router": "~8.0.0",
     "nativescript-angular": "file:../../nativescript-angular",
-    "nativescript-dev-webpack": "next",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.8",
     "rxjs": "~6.3.3",
@@ -43,7 +36,6 @@
     "mocha": "~5.2.0",
     "mochawesome": "~3.1.2",
     "nativescript-dev-appium": "next",
-    "nativescript-dev-typescript": "next",
     "nativescript-dev-webpack": "next",
     "tns-platform-declarations": "next",
     "typescript": "~3.4.5"

e2e/animation-examples/app/App_Resources/Android/drawable-hdpi/icon.png renamed to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png

@@ -4,13 +4,7 @@
   "readme": "NativeScript Application",
   "repository": "<fill-your-repository-here>",
   "nativescript": {
-    "id": "org.nativescript.nestedroutertabview",
-    "tns-ios": {
-      "version": "next"
-    },
-    "tns-android": {
-      "version": "next"
-    }
+    "id": "org.nativescript.nestedroutertabview"
   },
   "dependencies": {
     "@angular/animations": "~8.0.0",
@@ -23,7 +17,6 @@
     "@angular/platform-browser-dynamic": "~8.0.0",
     "@angular/router": "~8.0.0",
     "nativescript-angular": "file:../../nativescript-angular",
-    "nativescript-dev-webpack": "next",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.8",
     "rxjs": "~6.3.3",
@@ -43,7 +36,6 @@
     "mocha": "~5.2.0",
     "mochawesome": "~3.1.2",
     "nativescript-dev-appium": "next",
-    "nativescript-dev-typescript": "next",
     "nativescript-dev-webpack": "next",
     "typescript": "3.4.5"
   },

e2e/animation-examples/app/App_Resources/Android/drawable-hdpi/logo.png renamed to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png

@@ -37,7 +37,6 @@
     "mocha": "~5.2.0",
     "mochawesome": "~3.1.2",
     "nativescript-dev-appium": "next",
-    "nativescript-dev-typescript": "next",
     "nativescript-dev-webpack": "next",
     "tslib": "^1.7.1",
     "typescript": "~3.4.5"

e2e/animation-examples/app/App_Resources/Android/drawable-ldpi/background.png renamed to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png

@@ -20,7 +20,7 @@
     "nativescript-theme-core": "~1.0.2",
     "reflect-metadata": "~0.1.8",
     "rxjs": "~6.0.0 || >=6.1.0",
-    "tns-core-modules": "^4.0.0",
+    "tns-core-modules": "next",
     "zone.js": "^0.9.1"
   },
   "devDependencies": {
@@ -36,7 +36,6 @@
     "lazy": "1.0.11",
     "nativescript-css-loader": "~0.26.0",
     "nativescript-dev-appium": "^4.0.0",
-    "nativescript-dev-typescript": "~0.7.1",
     "nativescript-dev-webpack": "next",
     "typescript": "~3.4.5"
   },

e2e/animation-examples/app/App_Resources/Android/drawable-ldpi/icon.png renamed to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png

@@ -4,13 +4,7 @@
   "readme": "NativeScript Application",
   "repository": "<fill-your-repository-here>",
   "nativescript": {
-    "id": "org.nativescript.routertabview",
-    "tns-android": {
-      "version": "next"
-    },
-    "tns-ios": {
-      "version": "next"
-    }
+    "id": "org.nativescript.routertabview"
   },
   "dependencies": {
     "@angular/animations": "~8.0.0",
@@ -41,7 +35,6 @@
     "mocha": "~5.2.0",
     "mochawesome": "~3.1.2",
     "nativescript-dev-appium": "next",
-    "nativescript-dev-typescript": "next",
     "typescript": "~3.4.5",
     "@angular/compiler-cli": "8.0.0",
     "@ngtools/webpack": "8.0.0"

e2e/animation-examples/app/App_Resources/Android/drawable-ldpi/logo.png renamed to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png

@@ -4,10 +4,7 @@
   "readme": "NativeScript Application",
   "repository": "<fill-your-repository-here>",
   "nativescript": {
-    "id": "org.nativescript.router",
-    "tns-android": {
-      "version": "next"
-    }
+    "id": "org.nativescript.router"
   },
   "dependencies": {
     "@angular/animations": "~8.0.0",
@@ -41,7 +38,6 @@
     "mocha": "~5.2.0",
     "mochawesome": "~3.1.2",
     "nativescript-dev-appium": "next",
-    "nativescript-dev-typescript": "next",
     "nativescript-dev-webpack": "next",
     "tslib": "^1.7.1",
     "typescript": "~3.4.5"

e2e/animation-examples/app/App_Resources/Android/drawable-mdpi/background.png renamed to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png

@@ -4,13 +4,7 @@
   "readme": "NativeScript Application",
   "repository": "<fill-your-repository-here>",
   "nativescript": {
-    "id": "org.nativescript.singlepage",
-    "tns-ios": {
-      "version": "next"
-    },
-    "tns-android": {
-      "version": "next"
-    }
+    "id": "org.nativescript.singlepage"
   },
   "dependencies": {
     "@angular/animations": "~8.0.0",
@@ -44,7 +38,6 @@
     "mocha": "~5.2.0",
     "mochawesome": "~3.1.2",
     "nativescript-dev-appium": "next",
-    "nativescript-dev-typescript": "next",
     "nativescript-dev-webpack": "next",
     "tslib": "^1.7.1",
     "typescript": "~3.4.5"

e2e/animation-examples/app/App_Resources/Android/drawable-mdpi/icon.png renamed to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png

@@ -4,13 +4,7 @@
   "readme": "NativeScript Application",
   "repository": "<fill-your-repository-here>",
   "nativescript": {
-    "id": "org.nativescript.testsappng",
-    "tns-ios": {
-      "version": "next"
-    },
-    "tns-android": {
-      "version": "next"
-    }
+    "id": "org.nativescript.testsappng"
   },
   "dependencies": {
     "@angular/common": "~8.0.0",
@@ -35,9 +29,11 @@
     "codelyzer": "^4.0.0",
     "filewalker": "^0.1.3",
     "lazy": "1.0.11",
-    "nativescript-dev-typescript": "next",
     "nativescript-dev-webpack": "next",
-    "tslint": "^5.4.3"
+    "tslint": "^5.4.3",
+    "typescript": "~3.4.5",
+    "@angular/compiler-cli": "~8.0.0",
+    "@ngtools/webpack": "~8.0.0"
   },
   "scripts": {
     "tslint": "tslint --config tslint.json 'app/**/*.ts'",

e2e/animation-examples/app/App_Resources/Android/drawable-mdpi/logo.png renamed to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png

@@ -54,7 +54,7 @@
     "@angular/platform-browser": "~8.0.0",
     "@angular/router": "~8.0.0",
     "rxjs": "^6.3.3",
-    "tns-core-modules": "^6.0.0 || >6.1.0-",
+    "tns-core-modules": "^5.1.0 || >5.1.0- || >5.2.0- || ^6.0.0 || >6.1.0-",
     "typescript": "~3.4.5",
     "zone.js": "^0.9.1"
   },

e2e/animation-examples/app/App_Resources/Android/drawable-nodpi/splash_screen.xml renamed to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml

@@ -1,12 +1,6 @@
 {
   "nativescript": {
-    "id": "org.nativescript.ngsample",
-    "tns-android": {
-      "version": "next"
-    },
-    "tns-ios": {
-      "version": "next"
-    }
+    "id": "org.nativescript.ngsample"
   },
   "name": "tns-template-hello-world",
   "main": "app.js",

e2e/animation-examples/app/App_Resources/Android/drawable-xhdpi/background.png renamed to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png

@@ -1,5 +1,4 @@
 {
-	"useLegacyWorkflow": false,
 	"appPath": "app",
 	"appResourcesPath": "app/App_Resources"
 }

e2e/animation-examples/app/App_Resources/Android/drawable-xhdpi/icon.png renamed to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png

@@ -1,12 +1,6 @@
 {
   "nativescript": {
-    "id": "org.nativescript.ngtests",
-    "tns-ios": {
-      "version": "next"
-    },
-    "tns-android": {
-      "version": "next"
-    }
+    "id": "org.nativescript.ngtests"
   },
   "name": "ngtests",
   "version": "1.0.0",
@@ -60,7 +54,6 @@
     "karma-webpack": "3.0.5",
     "lazy": "1.0.11",
     "mocha": "6.1.4",
-    "nativescript-dev-typescript": "next",
     "nativescript-dev-webpack": "next",
     "remove-strict-webpack-plugin": "~0.1.2",
     "sinon": "^7.3.2",

e2e/animation-examples/app/App_Resources/Android/drawable-xhdpi/logo.png renamed to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png

@@ -32,14 +32,13 @@ module.exports = env => {
 
     // Default destination inside platforms/<platform>/...
     const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot));
-    const appResourcesPlatformDir = platform === "android" ? "Android" : "iOS";
 
     const {
         // The 'appPath' and 'appResourcesPath' values are fetched from
         // the nsconfig.json configuration file
         // when bundling with `tns run android|ios --bundle`.
         appPath = "app",
-        appResourcesPath = "app/App_Resources",
+        appResourcesPath = "App_Resources",
 
         // You can provide the following flags when running 'tns run android|ios'
         aot, // --env.aot
@@ -62,8 +61,9 @@ module.exports = env => {
     const entryModule = `${nsWebpack.getEntryModule(appFullPath, platform)}.ts`;
     const entryPath = `.${sep}${entryModule}`;
     const entries = { bundle: entryPath };
-    if (platform === "ios") {
-        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules.js";
+    const areCoreModulesExternal = Array.isArray(env.externals) && env.externals.some(e => e.indexOf("tns-core-modules") > -1);
+    if (platform === "ios" && !areCoreModulesExternal) {
+        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules";
     };
 
     const ngCompilerTransformers = [];
@@ -108,6 +108,7 @@ module.exports = env => {
         itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "build", "configurations", "nativescript-android-snapshot")}`);
     }
 
+    nsWebpack.processAppComponents(appComponents, platform);
     const config = {
         mode: production ? "production" : "development",
         context: appFullPath,
@@ -212,6 +213,7 @@ module.exports = env => {
                                 unitTesting,
                                 appFullPath,
                                 projectRoot,
+                                ignoredFiles: nsWebpack.getUserDefinedEntries(entries, platform)
                             }
                         },
                     ].filter(loader => !!loader)
@@ -261,7 +263,7 @@ module.exports = env => {
             // Define useful constants like TNS_WEBPACK
             new webpack.DefinePlugin({
                 "global.TNS_WEBPACK": "true",
-                "process": undefined,
+                "process": "global.process",
             }),
             // Remove all files from the out dir.
             new CleanWebpackPlugin(itemsToClean, { verbose: !!verbose }),