bump demos

Author: bradmartin

demo-angular/package.json

@@ -2,10 +2,10 @@
 	"nativescript": {
 		"id": "org.nativescript.demoangular",
 		"tns-android": {
-			"version": "6.3.1"
+			"version": "6.5.0"
 		},
 		"tns-ios": {
-			"version": "6.3.0"
+			"version": "6.5.0"
 		}
 	},
 	"description": "NativeScript Application",
@@ -22,16 +22,16 @@
 		"@angular/router": "~8.2.0",
 		"@nativescript/theme": "~2.2.1",
 		"@nstudio/nativescript-loading-indicator": "file:../src",
-		"nativescript-angular": "~8.20.3",
+		"nativescript-angular": "~8.21.0",
 		"reflect-metadata": "~0.1.12",
 		"rxjs": "^6.4.0",
-		"tns-core-modules": "~6.3.0",
+		"tns-core-modules": "~6.5.0",
 		"zone.js": "~0.9.1"
 	},
 	"devDependencies": {
 		"@angular/compiler-cli": "~8.2.0",
 		"@ngtools/webpack": "~8.2.0",
-		"nativescript-dev-webpack": "~1.4.0",
+		"nativescript-dev-webpack": "~1.5.1",
 		"typescript": "~3.5.3"
 	},
 	"gitHead": "fa98f785df3fba482e5e2a0c76f4be1fa6dc7a14",

demo-angular/tsconfig.tns.json

@@ -4,4 +4,4 @@
         "module": "esNext",
         "moduleResolution": "node"
     }
-}
+}

demo-angular/webpack.config.js

@@ -18,12 +18,13 @@ const hashSalt = Date.now().toString();
 
 module.exports = env => {
     // Add your custom Activities, Services and other Android app components here.
-    const appComponents = [
+    const appComponents = env.appComponents || [];
+    appComponents.push(...[
         "tns-core-modules/ui/frame",
         "tns-core-modules/ui/frame/activity",
-    ];
+    ]);
 
-    const platform = env && (env.android && "android" || env.ios && "ios");
+    const platform = env && (env.android && "android" || env.ios && "ios" || env.platform);
     if (!platform) {
         throw new Error("You need to provide a target platform!");
     }
@@ -65,9 +66,8 @@ module.exports = env => {
     const hasRootLevelScopedModules = nsWebpack.hasRootLevelScopedModules({ projectDir: projectRoot });
     const hasRootLevelScopedAngular = nsWebpack.hasRootLevelScopedAngular({ projectDir: projectRoot });
     let coreModulesPackageName = "tns-core-modules";
-    const alias = {
-        '~': appFullPath
-    };
+    const alias = env.alias || {};
+    alias['~'] = appFullPath;
 
     const compilerOptions = getCompilerOptionsFromTSConfig(tsConfigPath);
     if (hasRootLevelScopedModules) {
@@ -84,7 +84,9 @@ module.exports = env => {
     const appResourcesFullPath = resolve(projectRoot, appResourcesPath);
     const entryModule = `${nsWebpack.getEntryModule(appFullPath, platform)}.ts`;
     const entryPath = `.${sep}${entryModule}`;
-    const entries = { bundle: entryPath };
+    const entries = env.entries || {};
+    entries.bundle = entryPath;
+
     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";

demo/package.json

@@ -1,15 +1,9 @@
 {
   "nativescript": {
-    "id": "org.nativescript.demo",
-    "tns-android": {
-      "version": "6.3.1"
-    },
-    "tns-ios": {
-      "version": "6.3.0"
-    }
+    "id": "org.nativescript.demo"
   },
   "dependencies": {
-    "@nativescript/core": "^6.3.2",
+    "@nativescript/core": "^6.5.0",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "0.7.0",
     "@nstudio/nativescript-loading-indicator": "file:../src"
@@ -20,8 +14,8 @@
     "karma-jasmine": "2.0.1",
     "karma-nativescript-launcher": "^0.4.0",
     "nativescript-css-loader": "~0.26.1",
-    "nativescript-dev-webpack": "1.4.1",
-    "tns-platform-declarations": "^6.3.2",
+    "nativescript-dev-webpack": "1.5.1",
+    "tns-platform-declarations": "^6.5.0",
     "tslint": "~5.20.1",
     "typescript": "^3.7.4",
     "karma-webpack": "3.0.5"