From b993a83f2371df8cb276474360d95e89d62e5ad5 Mon Sep 17 00:00:00 2001
From: Dimitris-Rafail Katsampas <katsampasdr@gmail.com>
Date: Fri, 3 Feb 2023 07:58:01 +0200
Subject: [PATCH 1/8] fix(core): added item template handling for external
 renderers (#10196)

---
 packages/core/ui/list-view/list-view-common.ts | 10 ++++++++--
 packages/core/ui/repeater/index.ts             |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/core/ui/list-view/list-view-common.ts b/packages/core/ui/list-view/list-view-common.ts
index 25180a78f..04f1bbddb 100644
--- a/packages/core/ui/list-view/list-view-common.ts
+++ b/packages/core/ui/list-view/list-view-common.ts
@@ -10,6 +10,7 @@ import { Observable, EventData } from '../../data/observable';
 import { ObservableArray, ChangedData } from '../../data/observable-array';
 import { addWeakEventListener, removeWeakEventListener } from '../core/weak-event-listener';
 import { CoreTypes } from '../../core-types';
+import { isFunction } from '../../utils/types';
 
 const autoEffectiveRowHeight = -1;
 
@@ -28,8 +29,13 @@ export abstract class ListViewBase extends ContainerView implements ListViewDefi
 		key: 'default',
 		createView: () => {
 			if (__UI_USE_EXTERNAL_RENDERER__) {
-			} else if (this.itemTemplate) {
-				return Builder.parse(this.itemTemplate, this);
+				if (isFunction(this.itemTemplate)) {
+					return (<Template>this.itemTemplate)();
+				}
+			} else {
+				if (this.itemTemplate) {
+					return Builder.parse(this.itemTemplate, this);
+				}
 			}
 
 			return undefined;
diff --git a/packages/core/ui/repeater/index.ts b/packages/core/ui/repeater/index.ts
index 89cc7de64..9b5985db5 100644
--- a/packages/core/ui/repeater/index.ts
+++ b/packages/core/ui/repeater/index.ts
@@ -8,6 +8,7 @@ import { ObservableArray, ChangedData } from '../../data/observable-array';
 import { addWeakEventListener, removeWeakEventListener } from '../core/weak-event-listener';
 import { Builder } from '../builder';
 import { profile } from '../../profiling';
+import { isFunction } from '../../utils/types';
 
 export interface ItemsSource {
 	length: number;
@@ -130,7 +131,7 @@ export class Repeater extends CustomLayoutView {
 
 			if (!viewToAdd) {
 				if (__UI_USE_EXTERNAL_RENDERER__) {
-					viewToAdd = this._getDefaultItemContent(i);
+					viewToAdd = isFunction(this.itemTemplate) ? (<Template>this.itemTemplate)() : this._getDefaultItemContent(i);
 				} else {
 					viewToAdd = this.itemTemplate ? Builder.parse(this.itemTemplate, this) : this._getDefaultItemContent(i);
 				}

From dcf6a365cd574bd4dfa245ad6c38c22e551ef65c Mon Sep 17 00:00:00 2001
From: Dimitris-Rafail Katsampas <katsampasdr@gmail.com>
Date: Sun, 5 Feb 2023 19:16:01 +0200
Subject: [PATCH 2/8] fix(core): unset css values of type Property (#10199)

---
 packages/core/ui/styling/style-scope.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/core/ui/styling/style-scope.ts b/packages/core/ui/styling/style-scope.ts
index ad47fb19e..a7a5dd7ce 100644
--- a/packages/core/ui/styling/style-scope.ts
+++ b/packages/core/ui/styling/style-scope.ts
@@ -79,6 +79,7 @@ let currentScopeTag: string = null;
 const applicationAdditionalSelectors: RuleSet[] = [];
 const applicationKeyframes: any = {};
 const animationsSymbol = Symbol('animations');
+const kebabCasePattern = /-([a-z])/g;
 const pattern = /('|")(.*?)\1/;
 
 class CSSSource {
@@ -575,6 +576,7 @@ export class CssState {
 
 		const valuesToApply = {};
 		const cssExpsProperties = {};
+		const replacementFunc = (g) => g[1].toUpperCase();
 
 		for (const property in newPropertyValues) {
 			const value = newPropertyValues[property];
@@ -621,7 +623,8 @@ export class CssState {
 			if (property in view.style) {
 				view.style[`css:${property}`] = unsetValue;
 			} else {
-				// TRICKY: How do we unset local value?
+				const camelCasedProperty = property.replace(kebabCasePattern, replacementFunc);
+				view[camelCasedProperty] = unsetValue;
 			}
 		}
 		// Set new values to the style
@@ -631,9 +634,7 @@ export class CssState {
 				if (property in view.style) {
 					view.style[`css:${property}`] = value;
 				} else {
-					const camelCasedProperty = property.replace(/-([a-z])/g, function (g) {
-						return g[1].toUpperCase();
-					});
+					const camelCasedProperty = property.replace(kebabCasePattern, replacementFunc);
 					view[camelCasedProperty] = value;
 				}
 			} catch (e) {

From 9179ff861dcd72224ed79205406b328119784aa5 Mon Sep 17 00:00:00 2001
From: Teodor Dermendjiev <tdermendjievft@gmail.com>
Date: Tue, 14 Feb 2023 09:05:41 +0200
Subject: [PATCH 3/8] fix(ios): embedding sdk (#10211)

Disable setting main window content

When NS app is embedded main window should not be updated because it belongs to the parent app.
---
 packages/core/application/index.ios.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/core/application/index.ios.ts b/packages/core/application/index.ios.ts
index 0e5a06fd3..3b2153ccd 100644
--- a/packages/core/application/index.ios.ts
+++ b/packages/core/application/index.ios.ts
@@ -247,9 +247,8 @@ export class iOSApplication implements iOSApplicationDefinition {
 			cssFile: getCssFileName(),
 		});
 
-		// this._window will be undefined when NS app is embedded in a native one
 		if (this._window) {
-			if (args.root !== null) {
+			if (args.root !== null && !NativeScriptEmbedder.sharedInstance().delegate)
 				this.setWindowContent(args.root);
 			}
 		} else {

From ba2d90e5e9fd226a8c2107a9ebecf0077d170616 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Tue, 14 Feb 2023 16:15:09 -0800
Subject: [PATCH 4/8] chore: nx migrate latest

---
 migrations.json | 20 ++++++++++++++++++++
 package.json    | 12 ++++++------
 workspace.json  | 17 -----------------
 3 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100644 migrations.json
 delete mode 100644 workspace.json

diff --git a/migrations.json b/migrations.json
new file mode 100644
index 000000000..224faaef7
--- /dev/null
+++ b/migrations.json
@@ -0,0 +1,20 @@
+{
+	"migrations": [
+		{
+			"version": "15.7.0-beta.0",
+			"description": "Split global configuration files into individual project.json files. This migration has been added automatically to the beginning of your migration set to retroactively make them work with the new version of Nx.",
+			"cli": "nx",
+			"implementation": "./src/migrations/update-15-7-0/split-configuration-into-project-json-files",
+			"package": "@nrwl/workspace",
+			"name": "15-7-0-split-configuration-into-project-json-files"
+		},
+		{
+			"version": "15.7.0-beta.0",
+			"description": "Split global configuration files (e.g., workspace.json) into individual project.json files.",
+			"cli": "nx",
+			"implementation": "./src/migrations/update-15-7-0/split-configuration-into-project-json-files",
+			"package": "@nrwl/workspace",
+			"name": "15-7-0-split-configuration-into-project-json-files"
+		}
+	]
+}
diff --git a/package.json b/package.json
index f5a4a69f1..c878a9b3f 100644
--- a/package.json
+++ b/package.json
@@ -24,11 +24,11 @@
   "devDependencies": {
     "@nativescript/hook": "^2.0.0",
     "@nativescript/nx": "~4.2.0",
-    "@nrwl/cli": "15.6.3",
-    "@nrwl/eslint-plugin-nx": "15.6.3",
-    "@nrwl/jest": "15.6.3",
-    "@nrwl/node": "15.6.3",
-    "@nrwl/workspace": "15.6.3",
+    "@nrwl/cli": "15.7.0",
+    "@nrwl/eslint-plugin-nx": "15.7.0",
+    "@nrwl/jest": "15.7.0",
+    "@nrwl/node": "15.7.0",
+    "@nrwl/workspace": "15.7.0",
     "@nstudio/focus": "^15.0.0",
     "@nstudio/nps-i": "~2.0.0",
     "@prettier/plugin-xml": "^2.2.0",
@@ -51,7 +51,7 @@
     "module-alias": "^2.2.2",
     "nativescript": "~8.4.0",
     "nativescript-typedoc-theme": "1.1.0",
-    "nx": "15.6.3",
+    "nx": "15.7.0",
     "parse-css": "git+https://github.com/tabatkins/parse-css.git",
     "parserlib": "^1.1.1",
     "prettier": "^2.6.2",
diff --git a/workspace.json b/workspace.json
deleted file mode 100644
index 087d4d011..000000000
--- a/workspace.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"version": 2,
-	"projects": {
-		"apps-automated": "apps/automated",
-		"apps-toolbox": "apps/toolbox",
-		"apps-ui": "apps/ui",
-		"core": "packages/core",
-		"core-api-docs": "tools/scripts",
-		"types": "packages/types",
-		"types-android": "packages/types-android",
-		"types-ios": "packages/types-ios",
-		"types-minimal": "packages/types-minimal",
-		"ui-mobile-base": "packages/ui-mobile-base",
-		"webpack5": "packages/webpack5"
-	},
-	"$schema": "./node_modules/nx/schemas/workspace-schema.json"
-}

From 25d780f41cb69b30d717b8b95e04a366e7e28383 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Tue, 14 Feb 2023 16:17:22 -0800
Subject: [PATCH 5/8] chore: cleanup

---
 packages/core/application/index.ios.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/application/index.ios.ts b/packages/core/application/index.ios.ts
index 3b2153ccd..db9c6cc22 100644
--- a/packages/core/application/index.ios.ts
+++ b/packages/core/application/index.ios.ts
@@ -248,7 +248,7 @@ export class iOSApplication implements iOSApplicationDefinition {
 		});
 
 		if (this._window) {
-			if (args.root !== null && !NativeScriptEmbedder.sharedInstance().delegate)
+			if (args.root !== null && !NativeScriptEmbedder.sharedInstance().delegate) {
 				this.setWindowContent(args.root);
 			}
 		} else {

From decbfa11f443760c5df45c7812df3b723912f67e Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Tue, 14 Feb 2023 19:40:56 -0800
Subject: [PATCH 6/8] chore: tests

---
 .github/workflows/apps_automated.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/apps_automated.yml b/.github/workflows/apps_automated.yml
index f942f6587..bf55daa17 100644
--- a/.github/workflows/apps_automated.yml
+++ b/.github/workflows/apps_automated.yml
@@ -49,7 +49,7 @@ jobs:
         uses: rigor789/action-create-emulator@main
 
       - name: Test (Android)
-        run: node tools/scripts/run-automated.js android
+        run: npx nx run apps-automated:android --timeout=600
 
       - name: Start iOS Simulator
         if: ${{ always() && !cancelled() }} # run iOS tests even if Android tests failed
@@ -60,4 +60,4 @@ jobs:
 
       - name: Test (iOS)
         if: ${{ always() && !cancelled() }} # run iOS tests even if Android tests failed
-        run: node tools/scripts/run-automated.js ios
+        run: npx nx run apps-automated:ios --timeout=600

From 64e91e93ae297a51ce78efcd7c18ddb3258f3b1e Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Tue, 14 Feb 2023 19:55:45 -0800
Subject: [PATCH 7/8] ci: tests

---
 .github/workflows/apps_automated.yml | 4 ++--
 tools/scripts/run-automated.js       | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/apps_automated.yml b/.github/workflows/apps_automated.yml
index bf55daa17..f942f6587 100644
--- a/.github/workflows/apps_automated.yml
+++ b/.github/workflows/apps_automated.yml
@@ -49,7 +49,7 @@ jobs:
         uses: rigor789/action-create-emulator@main
 
       - name: Test (Android)
-        run: npx nx run apps-automated:android --timeout=600
+        run: node tools/scripts/run-automated.js android
 
       - name: Start iOS Simulator
         if: ${{ always() && !cancelled() }} # run iOS tests even if Android tests failed
@@ -60,4 +60,4 @@ jobs:
 
       - name: Test (iOS)
         if: ${{ always() && !cancelled() }} # run iOS tests even if Android tests failed
-        run: npx nx run apps-automated:ios --timeout=600
+        run: node tools/scripts/run-automated.js ios
diff --git a/tools/scripts/run-automated.js b/tools/scripts/run-automated.js
index 138a3e3c3..766e6a904 100644
--- a/tools/scripts/run-automated.js
+++ b/tools/scripts/run-automated.js
@@ -6,9 +6,10 @@
  */
 const spawn = require('child_process').spawn
 const kill = require('tree-kill');
+const path = require('path');
 
 const TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
-
+const workspaceDir = path.resolve(__dirname, '../..');
 const platform = process.argv[2];
 const spawned_process = spawn(
 	"npx",
@@ -20,6 +21,7 @@ const spawned_process = spawn(
 		"--timeout=600" // 10 minutes, booting avds on CI is very slow...
 	],
 	{
+		cwd: workspaceDir,
 		stdio: ["inherit", "pipe", "pipe"],
 	}
 );

From e0a4c887ef84f2a21bc0363f88718bee32d5985d Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Tue, 14 Feb 2023 20:34:30 -0800
Subject: [PATCH 8/8] ci: tests

---
 apps/automated/tsconfig.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/automated/tsconfig.json b/apps/automated/tsconfig.json
index 6230aa69d..96f8482ec 100644
--- a/apps/automated/tsconfig.json
+++ b/apps/automated/tsconfig.json
@@ -4,7 +4,9 @@
 		"diagnostics": false,
 		"paths": {
 			"~/*": ["src/*"],
-			"tns-core-modules/*": ["@nativescript/core/*"]
+			"tns-core-modules/*": ["@nativescript/core/*"],
+			"@nativescript/core": ["../../packages/core/index.ts"],
+			"@nativescript/core/*": ["../../packages/core/*"]
 		}
 	}
 }