diff --git a/.gitignore b/.gitignore
index 24b08c83e4..483637624e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,4 +59,6 @@ ios-typings-prj
 .nx/cache
 .nx/workspace-data
 vite.config.*.timestamp*
-vitest.config.*.timestamp*
\ No newline at end of file
+vitest.config.*.timestamp*
+.cursor/rules/nx-rules.mdc
+.github/instructions/nx.instructions.md
diff --git a/apps/automated/.gitignore b/apps/automated/.gitignore
index 512c68e15a..e9dc6c6f24 100644
--- a/apps/automated/.gitignore
+++ b/apps/automated/.gitignore
@@ -1 +1,2 @@
 !webpack.config.js
+hooks
\ No newline at end of file
diff --git a/apps/automated/package.json b/apps/automated/package.json
index 6b5d728d9d..e02cd5ac00 100644
--- a/apps/automated/package.json
+++ b/apps/automated/package.json
@@ -11,12 +11,12 @@
     "nativescript-theme-core": "file:../../node_modules/nativescript-theme-core"
   },
   "devDependencies": {
-    "@nativescript/android": "~8.8.0",
-    "@nativescript/ios": "~8.8.0",
-    "@nativescript/visionos": "~8.8.0",
+    "@nativescript/android": "~8.9.0",
+    "@nativescript/ios": "~8.9.0",
+    "@nativescript/visionos": "~8.9.0",
     "@nativescript/webpack": "file:../../dist/packages/webpack5",
     "circular-dependency-plugin": "^5.2.2",
-    "typescript": "~5.6.0"
+    "typescript": "~5.8.0"
   },
   "gitHead": "c06800e52ee1a184ea2dffd12a6702aaa43be4e3",
   "readme": "NativeScript Application"
diff --git a/apps/automated/src/debugger/dom-node-tests.ts b/apps/automated/src/debugger/dom-node-tests.ts
index 52b8b8ad88..80d76e21c4 100644
--- a/apps/automated/src/debugger/dom-node-tests.ts
+++ b/apps/automated/src/debugger/dom-node-tests.ts
@@ -1,15 +1,9 @@
 import { assert, assertEqual } from '../tk-unit';
-import { DOMNode } from '@nativescript/core/debugger/dom-node';
+import { DOMNode } from '@nativescript/core/debugger/dom-types';
 import { attachDOMInspectorCommandCallbacks, attachCSSInspectorCommandCallbacks, attachDOMInspectorEventCallbacks } from '@nativescript/core/debugger/devtools-elements';
 import { InspectorCommands, InspectorEvents } from '@nativescript/core/debugger/devtools-elements';
-import { unsetValue } from '@nativescript/core/ui/core/properties';
-import { Button } from '@nativescript/core/ui/button';
-import { Slider } from '@nativescript/core/ui/slider';
-import { Label } from '@nativescript/core/ui/label';
+import { unsetValue, Button, Slider, Label, TextView, StackLayout, isAndroid } from '@nativescript/core';
 import { textProperty } from '@nativescript/core/ui/text-base';
-import { TextView } from '@nativescript/core/ui/text-view';
-import { StackLayout } from '@nativescript/core/ui/layouts/stack-layout';
-import { isAndroid } from '@nativescript/core/platform';
 
 let originalInspectorGlobal: InspectorCommands & InspectorEvents;
 
diff --git a/apps/automated/src/file-system/file-system-tests.ts b/apps/automated/src/file-system/file-system-tests.ts
index 559d3126cc..e502418a56 100644
--- a/apps/automated/src/file-system/file-system-tests.ts
+++ b/apps/automated/src/file-system/file-system-tests.ts
@@ -746,7 +746,7 @@ export function testAndroidCreate() {
 
 export function test_FileAppend(done) {
 	const content = 'Hello World';
-	const hello_world = global.isIOS ? NSString.stringWithString(content).dataUsingEncoding(NSUTF8StringEncoding) : new java.lang.String(content).getBytes('UTF-8');
+	const hello_world = __APPLE__ ? NSString.stringWithString(content).dataUsingEncoding(NSUTF8StringEncoding) : new java.lang.String(content).getBytes('UTF-8');
 	const file = fs.File.fromPath(fs.path.join(fs.knownFolders.temp().path, `${Date.now()}-app.txt`));
 	file
 		.appendText('Hello')
diff --git a/apps/automated/src/pages/property-bindings.ts b/apps/automated/src/pages/property-bindings.ts
index 12a9ec9fcd..cb7c3f8bca 100644
--- a/apps/automated/src/pages/property-bindings.ts
+++ b/apps/automated/src/pages/property-bindings.ts
@@ -8,7 +8,7 @@ import { Trace } from '@nativescript/core';
 import * as gridModule from '@nativescript/core/ui/layouts/grid-layout';
 import * as sliders from '@nativescript/core/ui/slider';
 import * as switches from '@nativescript/core/ui/switch';
-import * as bindable from '@nativescript/core/ui/core/bindable';
+import type { BindingOptions } from '@nativescript/core/ui/core/bindable/bindable-types';
 
 Trace.enable();
 //Trace.setCategories(Trace.categories.Style + " ," + Trace.categories.Binding);
@@ -64,7 +64,7 @@ export function createPage() {
 		slider.value = desc.value;
 		stack.addChild(slider);
 
-		var options: bindable.BindingOptions = {
+		var options: BindingOptions = {
 			sourceProperty: 'value',
 			targetProperty: desc.name,
 		};
@@ -82,7 +82,7 @@ export function createPage() {
 		sw.horizontalAlignment = 'left';
 		stack.addChild(sw);
 
-		var options: bindable.BindingOptions = {
+		var options: BindingOptions = {
 			sourceProperty: 'checked',
 			targetProperty: desc.name,
 		};
@@ -99,7 +99,7 @@ export function createPage() {
 		txt.text = desc.value;
 		stack.addChild(txt);
 
-		var options: bindable.BindingOptions = {
+		var options: BindingOptions = {
 			sourceProperty: 'text',
 			targetProperty: desc.name,
 		};
diff --git a/apps/automated/src/test-runner.ts b/apps/automated/src/test-runner.ts
index 33a4c6858e..bd507b7170 100644
--- a/apps/automated/src/test-runner.ts
+++ b/apps/automated/src/test-runner.ts
@@ -2,7 +2,7 @@
 import * as TKUnit from './tk-unit';
 import './ui-test';
 
-import { isIOS, isAndroid, Application, Device, platformNames, Trace, Button, Frame, StackLayout, Page, TextView, Utils, Color } from '@nativescript/core';
+import { isAndroid, Device, platformNames, Trace, Button, Frame, StackLayout, Page, TextView, Utils, Color } from '@nativescript/core';
 Frame.defaultAnimatedNavigation = false;
 
 export function isRunningOnEmulator(): boolean {
@@ -147,7 +147,7 @@ import * as scrollViewSafeAreaTests from './ui/scroll-view/scroll-view-safe-area
 import * as repeaterSafeAreaTests from './ui/repeater/repeater-safe-area-tests';
 import * as webViewSafeAreaTests from './ui/web-view/web-view-safe-area-tests';
 
-if (isIOS && Utils.ios.MajorVersion > 10) {
+if (__APPLE__ && Utils.SDK_VERSION > 10) {
 	allTests['SAFEAREALAYOUT'] = safeAreaLayoutTests;
 	allTests['SAFEAREA-LISTVIEW'] = safeAreaListViewtTests;
 	allTests['SAFEAREA-SCROLL-VIEW'] = scrollViewSafeAreaTests;
diff --git a/apps/automated/src/tk-unit.ts b/apps/automated/src/tk-unit.ts
index c875f60f4c..3c79c6dffc 100644
--- a/apps/automated/src/tk-unit.ts
+++ b/apps/automated/src/tk-unit.ts
@@ -11,8 +11,7 @@
 
 */
 
-import { isIOS, Trace, Device } from '@nativescript/core';
-import * as types from '@nativescript/core/utils/types';
+import { Trace, Device, Utils } from '@nativescript/core';
 
 const sdkVersion = parseInt(Device.sdkVersion);
 
@@ -172,10 +171,10 @@ export function assertFalse(test: boolean, message?: string) {
 
 export function assertNotEqual(actual: any, expected: any, message?: string) {
 	let equals = false;
-	if (types.isUndefined(actual) && types.isUndefined(expected)) {
+	if (Utils.isUndefined(actual) && Utils.isUndefined(expected)) {
 		equals = true;
-	} else if (!types.isNullOrUndefined(actual) && !types.isNullOrUndefined(expected)) {
-		if (types.isFunction(actual.equals)) {
+	} else if (!Utils.isNullOrUndefined(actual) && !Utils.isNullOrUndefined(expected)) {
+		if (Utils.isFunction(actual.equals)) {
 			// Use the equals method
 			if (actual.equals(expected)) {
 				equals = true;
@@ -191,7 +190,7 @@ export function assertNotEqual(actual: any, expected: any, message?: string) {
 }
 
 export function assertEqual<T extends { equals?(arg: T): boolean } | any>(actual: T, expected: T, message: string = '') {
-	if (!types.isNullOrUndefined(actual) && !types.isNullOrUndefined(expected) && types.getClass(actual) === types.getClass(expected) && types.isFunction((<any>actual).equals)) {
+	if (!Utils.isNullOrUndefined(actual) && !Utils.isNullOrUndefined(expected) && Utils.getClass(actual) === Utils.getClass(expected) && Utils.isFunction((<any>actual).equals)) {
 		// Use the equals method
 		if (!(<any>actual).equals(expected)) {
 			throw new Error(`${message} Actual: <${actual}>(${typeof actual}). Expected: <${expected}>(${typeof expected})`);
@@ -352,7 +351,7 @@ export function waitUntilReady(isReady: () => boolean, timeoutSec: number = 5, s
 		return;
 	}
 
-	if (isIOS) {
+	if (__APPLE__) {
 		const timeoutMs = timeoutSec * 1000;
 		let totalWaitTime = 0;
 		while (true) {
diff --git a/apps/automated/src/ui-helper.ts b/apps/automated/src/ui-helper.ts
index 487ba37cf0..3e1879dbec 100644
--- a/apps/automated/src/ui-helper.ts
+++ b/apps/automated/src/ui-helper.ts
@@ -1,4 +1,4 @@
-import { Color, Button, FormattedString, Span, ActionBar, Builder, isIOS, unsetValue, View, ViewBase, Frame, NavigationEntry, LayoutBase, StackLayout, Page, TabView, TabViewItem, Utils } from '@nativescript/core';
+import { Color, Button, FormattedString, Span, ActionBar, Builder, unsetValue, View, ViewBase, Frame, NavigationEntry, LayoutBase, StackLayout, Page, TabView, TabViewItem, Utils } from '@nativescript/core';
 
 import * as TKUnit from './tk-unit';
 
@@ -255,7 +255,7 @@ export function assertTabSelectedTabTextColor(testView: ViewBase, hexColor: stri
 }
 
 export function forceGC() {
-	if (isIOS) {
+	if (__APPLE__) {
 		/* tslint:disable:no-unused-expression */
 		// Could cause GC on the next call.
 		new ArrayBuffer(4 * 1024 * 1024);
@@ -295,7 +295,7 @@ export function _generateFormattedString(): FormattedString {
 export function nativeView_recycling_test(createNew: () => View, createLayout?: () => LayoutBase, nativeGetters?: Map<string, (view) => any>, customSetters?: Map<string, any>) {
 	return;
 
-	// if (isIOS) {
+	// if (__APPLE__) {
 	//     // recycling not implemented yet.
 	//     return;
 	// }
diff --git a/apps/automated/src/ui/action-bar/action-bar-tests-common.ts b/apps/automated/src/ui/action-bar/action-bar-tests-common.ts
index b0abe4c7ed..708414ff1f 100644
--- a/apps/automated/src/ui/action-bar/action-bar-tests-common.ts
+++ b/apps/automated/src/ui/action-bar/action-bar-tests-common.ts
@@ -1,16 +1,6 @@
 import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
-import { Builder } from '@nativescript/core/ui/builder';
-import { Label } from '@nativescript/core/ui/label';
-import { Button } from '@nativescript/core/ui/button';
-import { Page } from '@nativescript/core/ui/page';
-import { View, isIOS } from '@nativescript/core';
-import { fromObject } from '@nativescript/core/data/observable';
-import { Frame } from '@nativescript/core/ui/frame';
-
-// >> actionbar-common-require
-import * as actionBarModule from '@nativescript/core/ui/action-bar';
-// << actionbar-common-require
+import { View, fromObject, Frame, Page, Button, Label, Builder, ActionItem, ActionBar } from '@nativescript/core';
 
 export function test_actionItem_inherit_bindingContext() {
 	let page: Page;
@@ -20,7 +10,7 @@ export function test_actionItem_inherit_bindingContext() {
 	const pageFactory = function (): Page {
 		page = new Page();
 		page.bindingContext = context;
-		const actionItem = new actionBarModule.ActionItem();
+		const actionItem = new ActionItem();
 
 		actionItem.bind({
 			sourceProperty: 'text',
@@ -164,7 +154,7 @@ export function test_Setting_ActionItems_doesnt_thrown() {
 
 	const pageFactory = function (): Page {
 		page = new Page();
-		const actionItem = new actionBarModule.ActionItem();
+		const actionItem = new ActionItem();
 		actionItem.text = 'Item';
 		page.actionBar.actionItems.addItem(actionItem);
 
@@ -286,12 +276,12 @@ export function test_ActionBarVisibility_Never_ShouldNotShowDeclaredActionBar()
                 </ActionBar.titleView>
             </ActionBar>
         </Page>
-        `
+        `,
 	);
 
 	helper.navigate(() => page);
 	let actionBarHidden = false;
-	if (isIOS) {
+	if (__APPLE__) {
 		actionBarHidden = page.actionBar.nativeView.hidden;
 	} else {
 		actionBarHidden = !page.actionBar.nativeView.isShown();
@@ -314,12 +304,12 @@ export function test_ActionBarVisibility_Always_ShouldShownHiddenActionBar() {
                 </ActionBar.titleView>
             </ActionBar>
         </Page>
-        `
+        `,
 	);
 
 	helper.navigate(() => page);
 	let actionBarHidden = false;
-	if (isIOS) {
+	if (__APPLE__) {
 		actionBarHidden = page.actionBar.nativeView.hidden;
 	} else {
 		actionBarHidden = !page.actionBar.nativeView.isShown();
@@ -342,12 +332,12 @@ export function test_ActionBarVisibility_Auto_ShouldRespectPageActionBarHiddenPr
                 </ActionBar.titleView>
             </ActionBar>
         </Page>
-        `
+        `,
 	);
 
 	helper.navigate(() => page);
 	let actionBarHidden = false;
-	if (isIOS) {
+	if (__APPLE__) {
 		actionBarHidden = page.actionBar.nativeView.hidden;
 	} else {
 		actionBarHidden = !page.actionBar.nativeView.isShown();
@@ -391,5 +381,5 @@ export function createPageAndNavigate() {
 }
 
 export function test_recycling() {
-	helper.nativeView_recycling_test(() => new actionBarModule.ActionBar());
+	helper.nativeView_recycling_test(() => new ActionBar());
 }
diff --git a/apps/automated/src/ui/animation/animation-tests.ts b/apps/automated/src/ui/animation/animation-tests.ts
index 7a96d2a7a5..c9794d9029 100644
--- a/apps/automated/src/ui/animation/animation-tests.ts
+++ b/apps/automated/src/ui/animation/animation-tests.ts
@@ -1,11 +1,6 @@
 import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
-import * as viewModule from '@nativescript/core/ui/core/view';
-import { Label } from '@nativescript/core/ui/label';
-import { StackLayout } from '@nativescript/core/ui/layouts/stack-layout';
-import * as colorModule from '@nativescript/core/color';
-import { CoreTypes, PercentLength } from '@nativescript/core';
-import { AnimationPromise, AnimationDefinition, Animation } from '@nativescript/core/ui/animation';
+import { AnimationPromise, AnimationDefinition, Animation, CoreTypes, PercentLength, Label, StackLayout, View, Color } from '@nativescript/core';
 
 // >> animation-require
 // import * as animation from '@nativescript/core/ui/animation';
@@ -38,7 +33,7 @@ export function test_AnimatingProperties(done) {
 	label
 		.animate({
 			opacity: 0.75,
-			backgroundColor: new colorModule.Color('Red'),
+			backgroundColor: new Color('Red'),
 			translate: { x: 100, y: 100 },
 			scale: { x: 2, y: 2 },
 			rotate: 180,
@@ -269,7 +264,7 @@ export function test_AnimateOpacity(done) {
 
 export function test_AnimateOpacity_ShouldThrow_IfNotNumber() {
 	var label = new Label();
-	helper.buildUIAndRunTest(label, (views: Array<viewModule.View>) => {
+	helper.buildUIAndRunTest(label, (views: Array<View>) => {
 		TKUnit.assertThrows(() => {
 			label.animate({ opacity: <any>'0.75' });
 		}, 'Setting opacity to a non number should throw.');
@@ -278,7 +273,7 @@ export function test_AnimateOpacity_ShouldThrow_IfNotNumber() {
 
 export function test_AnimateDelay_ShouldThrow_IfNotNumber() {
 	var label = new Label();
-	helper.buildUIAndRunTest(label, (views: Array<viewModule.View>) => {
+	helper.buildUIAndRunTest(label, (views: Array<View>) => {
 		TKUnit.assertThrows(() => {
 			label.animate({ delay: <any>'1' });
 		}, 'Setting delay to a non number should throw.');
@@ -287,7 +282,7 @@ export function test_AnimateDelay_ShouldThrow_IfNotNumber() {
 
 export function test_AnimateDuration_ShouldThrow_IfNotNumber() {
 	var label = new Label();
-	helper.buildUIAndRunTest(label, (views: Array<viewModule.View>) => {
+	helper.buildUIAndRunTest(label, (views: Array<View>) => {
 		TKUnit.assertThrows(() => {
 			label.animate({ duration: <any>'1' });
 		}, 'Setting duration to a non number should throw.');
@@ -296,7 +291,7 @@ export function test_AnimateDuration_ShouldThrow_IfNotNumber() {
 
 export function test_AnimateIterations_ShouldThrow_IfNotNumber() {
 	var label = new Label();
-	helper.buildUIAndRunTest(label, (views: Array<viewModule.View>) => {
+	helper.buildUIAndRunTest(label, (views: Array<View>) => {
 		TKUnit.assertThrows(() => {
 			label.animate({ iterations: <any>'1' });
 		}, 'Setting iterations to a non number should throw.');
@@ -305,7 +300,7 @@ export function test_AnimateIterations_ShouldThrow_IfNotNumber() {
 
 export function test_AnimateRotate_ShouldThrow_IfNotNumber() {
 	var label = new Label();
-	helper.buildUIAndRunTest(label, (views: Array<viewModule.View>) => {
+	helper.buildUIAndRunTest(label, (views: Array<View>) => {
 		TKUnit.assertThrows(() => {
 			label.animate({ rotate: <any>'1' });
 		}, 'Setting rotate to a non number should throw.');
@@ -314,7 +309,7 @@ export function test_AnimateRotate_ShouldThrow_IfNotNumber() {
 
 export function test_AnimateScale_ShouldThrow_IfNotPair() {
 	var label = new Label();
-	helper.buildUIAndRunTest(label, (views: Array<viewModule.View>) => {
+	helper.buildUIAndRunTest(label, (views: Array<View>) => {
 		TKUnit.assertThrows(() => {
 			label.animate({ scale: <any>'1' });
 		}, 'Setting scale to a non Pair should throw.');
@@ -323,7 +318,7 @@ export function test_AnimateScale_ShouldThrow_IfNotPair() {
 
 export function test_AnimateTranslate_ShouldThrow_IfNotPair() {
 	var label = new Label();
-	helper.buildUIAndRunTest(label, (views: Array<viewModule.View>) => {
+	helper.buildUIAndRunTest(label, (views: Array<View>) => {
 		TKUnit.assertThrows(() => {
 			label.animate({ translate: <any>'1' });
 		}, 'Setting translate to a non Pair should throw.');
@@ -332,7 +327,7 @@ export function test_AnimateTranslate_ShouldThrow_IfNotPair() {
 
 export function test_AnimateBackgroundColor_ShouldThrow_IfNotValidColorStringOrColor() {
 	var label = new Label();
-	helper.buildUIAndRunTest(label, (views: Array<viewModule.View>) => {
+	helper.buildUIAndRunTest(label, (views: Array<View>) => {
 		TKUnit.assertThrows(() => {
 			label.animate({ backgroundColor: <any>'test' });
 		}, 'Setting backgroundColor to a not valid color string or Color should throw.');
@@ -341,12 +336,12 @@ export function test_AnimateBackgroundColor_ShouldThrow_IfNotValidColorStringOrC
 
 export function test_AnimateBackgroundColor(done) {
 	let label = prepareTest();
-	var red = new colorModule.Color('Red');
+	var red = new Color('Red');
 
 	label
 		.animate({ backgroundColor: red, duration: 5 })
 		.then(() => {
-			TKUnit.assert((<colorModule.Color>label.backgroundColor).equals(red));
+			TKUnit.assert((<Color>label.backgroundColor).equals(red));
 			done();
 		})
 		.catch((e) => {
@@ -357,12 +352,12 @@ export function test_AnimateBackgroundColor(done) {
 export function test_AnimateBackgroundColor_FromString(done) {
 	let label = prepareTest();
 	var expected = 'Red';
-	var clr = new colorModule.Color(expected);
+	var clr = new Color(expected);
 
 	label
 		.animate({ backgroundColor: <any>expected, duration: 5 })
 		.then(() => {
-			TKUnit.assert((<colorModule.Color>label.backgroundColor).equals(clr));
+			TKUnit.assert((<Color>label.backgroundColor).equals(clr));
 			done();
 		})
 		.catch((e) => {
@@ -505,7 +500,7 @@ export function test_AnimateExtent_Should_AcceptNumberValuesAsDip(done) {
 
 export function test_AnimateExtent_Should_ThrowIfCannotParsePercentLength() {
 	const label = new Label();
-	helper.buildUIAndRunTest(label, (views: Array<viewModule.View>) => {
+	helper.buildUIAndRunTest(label, (views: Array<View>) => {
 		TKUnit.assertThrows(() => {
 			label.animate({ width: '-frog%' });
 		}, 'Invalid percent string should throw');
@@ -633,8 +628,8 @@ export function test_PlayPromiseIsRejectedWhenAnimationIsCancelled(done) {
 	animation.cancel();
 }
 
-function assertIOSNativeTransformIsCorrect(view: viewModule.View) {
-	if (global.isIOS) {
+function assertIOSNativeTransformIsCorrect(view: View) {
+	if (__APPLE__) {
 		var errorMessage = (<any>require('@nativescript/core/ui/animation'))._getTransformMismatchErrorMessage(view);
 		if (errorMessage) {
 			TKUnit.assert(false, errorMessage);
diff --git a/apps/automated/src/ui/button/button-tests.ts b/apps/automated/src/ui/button/button-tests.ts
index 6161b4feaf..07f9a1b112 100644
--- a/apps/automated/src/ui/button/button-tests.ts
+++ b/apps/automated/src/ui/button/button-tests.ts
@@ -1,12 +1,7 @@
 import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
-import { View, EventData, Button, Observable, Color, Page, FormattedString } from '@nativescript/core';
+import { View, EventData, Button, Observable, Color, Page, FormattedString, BindingOptions, Span } from '@nativescript/core';
 import * as buttonTestsNative from './button-tests-native';
-import * as spanModule from '@nativescript/core/text/span';
-
-// >> button-require-others
-import { BindingOptions } from '@nativescript/core/ui/core/bindable';
-// << button-require-others
 
 export function test_recycling() {
 	helper.nativeView_recycling_test(() => new Button());
@@ -326,13 +321,13 @@ export var testNativeTextAlignmentFromLocal = function () {
 };
 
 export var test_WhenFormattedTextPropertyChanges_TextIsUpdated_Button = function () {
-	var firstSpan = new spanModule.Span();
+	var firstSpan = new Span();
 	firstSpan.fontSize = 10;
 	firstSpan.text = 'First';
-	var secondSpan = new spanModule.Span();
+	var secondSpan = new Span();
 	secondSpan.fontSize = 15;
 	secondSpan.text = 'Second';
-	var thirdSpan = new spanModule.Span();
+	var thirdSpan = new Span();
 	thirdSpan.fontSize = 20;
 	thirdSpan.text = 'Third';
 	var formattedString1 = new FormattedString();
@@ -392,7 +387,7 @@ export function test_setting_formattedText_With_UnknownFont_DoesNotCrash() {
 	helper.buildUIAndRunTest(btn, function (views) {
 		TKUnit.waitUntilReady(() => btn.isLayoutValid);
 
-		let span = new spanModule.Span();
+		let span = new Span();
 		span.text = 'Login';
 		let formattedString = new FormattedString();
 		formattedString.spans.push(span);
diff --git a/apps/automated/src/ui/core/bindable/bindable-tests.ts b/apps/automated/src/ui/core/bindable/bindable-tests.ts
index 8007ee0ff3..825db61c91 100644
--- a/apps/automated/src/ui/core/bindable/bindable-tests.ts
+++ b/apps/automated/src/ui/core/bindable/bindable-tests.ts
@@ -1,11 +1,7 @@
-import { Observable, fromObject, fromObjectRecursive } from '@nativescript/core/data/observable';
-import { ViewBase } from '@nativescript/core/ui/core/view-base';
-import { BindingOptions } from '@nativescript/core/ui/core/bindable';
+import { Application, View, Button, Page, StackLayout, Label, TextField, Trace, BindingOptions, ViewBase, Observable, fromObject, fromObjectRecursive, Utils } from '@nativescript/core';
 import * as TKUnit from '../../../tk-unit';
-import * as types from '@nativescript/core/utils/types';
 import * as helper from '../../../ui-helper';
 import * as bindingBuilder from '@nativescript/core/ui/builder/binding-builder';
-import { Application, View, Button, Page, StackLayout, Label, TextField, Trace } from '@nativescript/core';
 declare var WeakRef: any;
 // <snippet module="ui/core/bindable" title="bindable">
 // For information and examples how to use bindings please refer to special [**Data binding**](../../../../bindings.md) topic.
@@ -17,8 +13,8 @@ declare var WeakRef: any;
 
 export function test_Bindable_Members() {
 	const obj = new Label();
-	TKUnit.assert(types.isDefined(obj.bind), 'Bindable.bind not defined');
-	TKUnit.assert(types.isDefined(obj.unbind), 'Bindable.unbind not defined');
+	TKUnit.assert(Utils.isDefined(obj.bind), 'Bindable.bind not defined');
+	TKUnit.assert(Utils.isDefined(obj.unbind), 'Bindable.unbind not defined');
 }
 
 export function test_Binding_to_bindingContext_of_View() {
@@ -502,7 +498,7 @@ export function test_bindingToNestedPropertyWithValueSyntax() {
 			sourceProperty: '$value.testProperty',
 			targetProperty: 'targetPropertyName',
 		},
-		bindingSource
+		bindingSource,
 	);
 
 	TKUnit.assertEqual(testElement.get('targetPropertyName'), 'testValue');
@@ -706,7 +702,7 @@ export function test_UpdatingNestedPropertyViaBinding() {
 			targetProperty: 'text',
 			twoWay: true,
 		},
-		viewModel
+		viewModel,
 	);
 
 	const testElement2 = new Label();
@@ -717,7 +713,7 @@ export function test_UpdatingNestedPropertyViaBinding() {
 			targetProperty: 'text',
 			twoWay: true,
 		},
-		viewModel
+		viewModel,
 	);
 
 	TKUnit.assertEqual(testElement.get('text'), expectedValue1);
@@ -803,7 +799,7 @@ export function test_NestedPropertiesBinding() {
 			targetProperty: 'targetProperty',
 			twoWay: true,
 		},
-		viewModel
+		viewModel,
 	);
 
 	TKUnit.assertEqual(target1.get('targetProperty'), expectedValue);
@@ -835,7 +831,7 @@ export function test_WrongNestedPropertiesBinding() {
 			targetProperty: 'targetProperty',
 			twoWay: true,
 		},
-		viewModel
+		viewModel,
 	);
 
 	TKUnit.assertNotEqual(errorMessage, undefined);
@@ -856,7 +852,7 @@ export function test_NestedPropertiesBindingTwoTargets() {
 			targetProperty: 'targetProperty',
 			twoWay: true,
 		},
-		viewModel
+		viewModel,
 	);
 
 	const target2 = new Label();
@@ -866,7 +862,7 @@ export function test_NestedPropertiesBindingTwoTargets() {
 			targetProperty: 'targetProp',
 			twoWay: true,
 		},
-		viewModel
+		viewModel,
 	);
 
 	TKUnit.assertEqual(target1.get('targetProperty'), expectedText);
@@ -897,7 +893,7 @@ export function test_NestedPropertiesBindingTwoTargetsAndSecondChange() {
 			targetProperty: 'targetProperty',
 			twoWay: true,
 		},
-		viewModel
+		viewModel,
 	);
 
 	const target2 = new Label();
@@ -907,7 +903,7 @@ export function test_NestedPropertiesBindingTwoTargetsAndSecondChange() {
 			targetProperty: 'targetProp',
 			twoWay: true,
 		},
-		viewModel
+		viewModel,
 	);
 
 	TKUnit.assertEqual(target1.get('targetProperty'), expectedText);
@@ -948,7 +944,7 @@ export function test_NestedPropertiesBindingTwoTargetsAndRegularChange() {
 			targetProperty: 'targetProperty',
 			twoWay: true,
 		},
-		viewModel
+		viewModel,
 	);
 
 	const target2 = new Label();
@@ -958,7 +954,7 @@ export function test_NestedPropertiesBindingTwoTargetsAndRegularChange() {
 			targetProperty: 'targetProp',
 			twoWay: true,
 		},
-		viewModel
+		viewModel,
 	);
 
 	TKUnit.assertEqual(target1.get('targetProperty'), expectedText);
@@ -998,7 +994,7 @@ export function test_NestedPropertiesBindingTwoTargetsAndReplacingSomeNestedObje
 			targetProperty: 'targetProperty',
 			twoWay: true,
 		},
-		viewModel
+		viewModel,
 	);
 
 	const target2 = new Label();
@@ -1008,7 +1004,7 @@ export function test_NestedPropertiesBindingTwoTargetsAndReplacingSomeNestedObje
 			targetProperty: 'targetProp',
 			twoWay: true,
 		},
-		viewModel
+		viewModel,
 	);
 
 	TKUnit.assertEqual(target1.get('targetProperty'), expectedText);
@@ -1050,7 +1046,7 @@ export function test_NullSourcePropertyShouldNotCrash() {
 			targetProperty: 'targetProp',
 			expression: 'convFunc(field)',
 		},
-		model
+		model,
 	);
 
 	TKUnit.assertEqual(target.get('targetProp'), convFunc(expectedValue));
@@ -1123,7 +1119,7 @@ export function test_SupportFunctionsInExpressions() {
 			targetProperty: 'text',
 			expression: "isVisible() ? 'visible' : 'collapsed'",
 		},
-		model
+		model,
 	);
 
 	model.set('anyColor', 'blue');
@@ -1151,7 +1147,7 @@ export function test_$ValueSupportWithinExpression() {
 			targetProperty: 'text',
 			expression: "$value.anyColor === 'red' ? 'red' : 'blue'",
 		},
-		model
+		model,
 	);
 
 	model.set('anyColor', 'blue');
@@ -1230,7 +1226,7 @@ export function test_BindingToPropertiesWithSameNames() {
 			targetProperty: 'targetProperty',
 			twoWay: true,
 		},
-		model
+		model,
 	);
 
 	const target2 = new Label();
@@ -1240,7 +1236,7 @@ export function test_BindingToPropertiesWithSameNames() {
 			targetProperty: 'targetProp',
 			twoWay: true,
 		},
-		model
+		model,
 	);
 
 	model.item.set('seconds', model.item.seconds + 1);
@@ -1273,7 +1269,7 @@ export function test_BindingToPropertiesWithSameNamesSecondCase() {
 			targetProperty: 'targetProperty',
 			twoWay: true,
 		},
-		model
+		model,
 	);
 
 	const target2 = new Label();
@@ -1283,7 +1279,7 @@ export function test_BindingToPropertiesWithSameNamesSecondCase() {
 			targetProperty: 'targetProp',
 			twoWay: true,
 		},
-		model
+		model,
 	);
 
 	model.item.set('seconds', model.item.seconds + 1);
@@ -1372,7 +1368,7 @@ export function test_Observable_from_nested_json_binds_correctly() {
 			sourceProperty: 'firstObject.secondObject.dummyProperty',
 			targetProperty: 'text',
 		},
-		model
+		model,
 	);
 
 	model.get('firstObject').get('secondObject').set('dummyProperty', expectedValue);
@@ -1396,7 +1392,7 @@ export function test_Observable_from_nested_json_binds_correctly_when_upper_obje
 			sourceProperty: 'firstObject.secondObject.dummyProperty',
 			targetProperty: 'text',
 		},
-		model
+		model,
 	);
 
 	model.get('firstObject').set('secondObject', fromObject({ dummyProperty: expectedValue }));
diff --git a/apps/automated/src/ui/frame/frame-tests.android.ts b/apps/automated/src/ui/frame/frame-tests.android.ts
index f4df1d9160..0a18547250 100644
--- a/apps/automated/src/ui/frame/frame-tests.android.ts
+++ b/apps/automated/src/ui/frame/frame-tests.android.ts
@@ -1,7 +1,5 @@
-import { Frame } from '@nativescript/core/ui/frame';
 import * as TKUnit from '../../tk-unit';
-import { unsetValue } from '@nativescript/core/ui/core/view';
-import { PercentLength } from '@nativescript/core/ui/styling/style-properties';
+import { PercentLength, unsetValue, Frame } from '@nativescript/core';
 export * from './frame-tests-common';
 
 export function test_percent_width_and_height_set_to_page_support() {
diff --git a/apps/automated/src/ui/image/image-tests.ts b/apps/automated/src/ui/image/image-tests.ts
index 9be0666b9f..70066fe12d 100644
--- a/apps/automated/src/ui/image/image-tests.ts
+++ b/apps/automated/src/ui/image/image-tests.ts
@@ -65,7 +65,7 @@ function runImageTestSync(image: ImageModule.Image, src: string) {
 
 	image.src = src;
 
-	let imageSourceAvailable = global.isIOS ? !!image.imageSource : true;
+	let imageSourceAvailable = __APPLE__ ? !!image.imageSource : true;
 	TKUnit.assertFalse(image.isLoading, 'Image.isLoading should be false.');
 	TKUnit.assertTrue(imageSourceAvailable, 'imageSource should be set.');
 }
@@ -78,7 +78,7 @@ function runImageTestAsync(image: ImageModule.Image, src: string, done: (e: any)
 		image.off(IMAGE_LOADED_EVENT, handler);
 
 		try {
-			let imageSourceAvailable = global.isIOS ? !!image.imageSource : true;
+			let imageSourceAvailable = __APPLE__ ? !!image.imageSource : true;
 			TKUnit.assertFalse(image.isLoading, 'Image.isLoading should be false.');
 			TKUnit.assertTrue(imageSourceAvailable, 'imageSource should be set.');
 			done(null);
@@ -255,7 +255,7 @@ export const test_SettingStretch_none = function () {
 };
 
 function ios<T>(func: T): T {
-	return global.isIOS ? func : undefined;
+	return __APPLE__ ? func : undefined;
 }
 
 export const test_SettingImageSourceWhenSizedToParentDoesNotRequestLayout = ios(() => {
diff --git a/apps/automated/src/ui/label/label-tests.ts b/apps/automated/src/ui/label/label-tests.ts
index 92311ab24d..ada8f29584 100644
--- a/apps/automated/src/ui/label/label-tests.ts
+++ b/apps/automated/src/ui/label/label-tests.ts
@@ -1,51 +1,34 @@
 import * as TKUnit from '../../tk-unit';
 import * as testModule from '../../ui-test';
-
-//>> label-require
-import * as LabelModule from '@nativescript/core/ui/label';
-// << label-require
-
-import * as types from '@nativescript/core/utils/types';
-import * as colorModule from '@nativescript/core/color';
-import * as utils from '@nativescript/core/utils';
-import * as observableModule from '@nativescript/core/data/observable';
-import * as bindable from '@nativescript/core/ui/core/bindable';
-import { CoreTypes, Span, FormattedString, Utils } from '@nativescript/core';
+import { Label, GridLayout, LayoutBase, StackLayout, BindingOptions, CoreTypes, Span, FormattedString, Utils, Color, Observable, path } from '@nativescript/core';
 import * as labelTestsNative from './label-tests-native';
-import * as fs from '@nativescript/core/file-system';
-
-import { StackLayout } from '@nativescript/core/ui/layouts/stack-layout';
-import { GridLayout } from '@nativescript/core/ui/layouts/grid-layout';
-import { isIOS, isAndroid, isApple } from '@nativescript/core/platform';
-import { Label } from '@nativescript/core/ui/label';
-import { LayoutBase } from '@nativescript/core/ui/layouts/layout-base';
 import * as helper from '../../ui-helper';
 
 const testDir = 'ui/label';
 
 const expectLayoutRequest = __APPLE__ && Utils.SDK_VERSION >= 18;
 
-export class LabelTest extends testModule.UITest<LabelModule.Label> {
-	public create(): LabelModule.Label {
-		const label = new LabelModule.Label();
+export class LabelTest extends testModule.UITest<Label> {
+	public create(): Label {
+		const label = new Label();
 		label.text = 'Label';
 
 		return label;
 	}
 
 	public test_recycling() {
-		helper.nativeView_recycling_test(() => new LabelModule.Label());
+		helper.nativeView_recycling_test(() => new Label());
 	}
 
 	public test_Label_Members() {
-		const label = new LabelModule.Label();
-		TKUnit.assert(types.isDefined(label.text), 'Label.text is not defined');
-		TKUnit.assert(types.isDefined(label.textWrap), 'Label.textWrap is not defined');
+		const label = new Label();
+		TKUnit.assert(Utils.isDefined(label.text), 'Label.text is not defined');
+		TKUnit.assert(Utils.isDefined(label.textWrap), 'Label.textWrap is not defined');
 	}
 
 	public snippet_Set_Text_TNS() {
 		// >> label-settext
-		const label = new LabelModule.Label();
+		const label = new Label();
 		const expectedValue = 'Expected Value';
 		label.text = expectedValue;
 		// << label-settext
@@ -53,7 +36,7 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 
 	public snippet_Set_TextWrap_TNS() {
 		// >> label-textwrap
-		const label = new LabelModule.Label();
+		const label = new Label();
 		label.textWrap = true;
 		// << label-textwrap
 	}
@@ -115,7 +98,7 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 
 	public test_Set_BackgroundColor_TNS() {
 		const label = this.testView;
-		const expectedValue = new colorModule.Color('Red');
+		const expectedValue = new Color('Red');
 		label.backgroundColor = expectedValue;
 
 		const actual = label.style.backgroundColor;
@@ -124,7 +107,7 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 
 	public test_Set_BackgroundColor_Native() {
 		const testLabel = this.testView;
-		const expectedValue = new colorModule.Color('Red');
+		const expectedValue = new Color('Red');
 
 		testLabel.backgroundColor = expectedValue;
 
@@ -245,7 +228,7 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 			let expectedValue = NSString.stringWithString('i').sizeWithAttributes(<any>{
 				[NSFontAttributeName]: UIFont.systemFontOfSize(9),
 			}).width;
-			expectedValue = Math.ceil(utils.layout.toDevicePixels(expectedValue));
+			expectedValue = Math.ceil(Utils.layout.toDevicePixels(expectedValue));
 			const measuredWidth = label.getMeasuredWidth();
 			TKUnit.assertEqual(measuredWidth, expectedValue, 'measuredWidth should not be rounded down.');
 		}
@@ -257,14 +240,14 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 		testLabel.textWrap = true;
 		this.waitUntilTestElementLayoutIsValid();
 
-		if (isAndroid) {
+		if (__ANDROID__) {
 			TKUnit.assertNull(testLabel.android.getEllipsize());
 			TKUnit.assertTrue(testLabel.android.getLineCount() > 1, 'LinesNumber');
 			const actualHorizontalScrolling = testLabel.android.canScrollHorizontally(-1) || testLabel.android.canScrollHorizontally(1);
 			TKUnit.assertFalse(actualHorizontalScrolling, 'HorizontalScrolling');
 			TKUnit.assertNull(testLabel.android.getTransformationMethod(), 'TransformationMethod');
 		}
-		if (isIOS) {
+		if (__APPLE__) {
 			TKUnit.assertEqual(testLabel.ios.lineBreakMode, NSLineBreakMode.ByWordWrapping, 'LineBreakMode');
 			TKUnit.assertEqual(testLabel.ios.numberOfLines, 0, 'LinesNumber');
 		}
@@ -279,14 +262,14 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 		testLabel.textWrap = false;
 		this.waitUntilTestElementLayoutIsValid();
 
-		if (isAndroid) {
+		if (__ANDROID__) {
 			TKUnit.assertEqual(testLabel.android.getEllipsize(), android.text.TextUtils.TruncateAt.END, 'Ellipsize');
 			const actualHorizontalScrolling = testLabel.android.canScrollHorizontally(-1) || testLabel.android.canScrollHorizontally(1);
 			TKUnit.assertEqual(actualHorizontalScrolling, false, 'HorizontalScrolling');
 			TKUnit.assert(('' + testLabel.android.getTransformationMethod()).indexOf('SingleLineTransformationMethod') > -1, 'Expected: SingleLineTransformationMethod, Actual: ' + testLabel.android.getTransformationMethod());
 			TKUnit.assertEqual(testLabel.android.getLineCount(), 1, 'LinesNumber');
 		}
-		if (isIOS) {
+		if (__APPLE__) {
 			TKUnit.assertEqual(testLabel.ios.lineBreakMode, NSLineBreakMode.ByTruncatingTail, 'LineBreakMode');
 			TKUnit.assertEqual(testLabel.ios.numberOfLines, 1, 'LinesNumber');
 		}
@@ -322,7 +305,7 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 
 		if (testLabel.android) {
 			actualTextSize = testLabel.android.getTextSize();
-			const density = utils.layout.getDisplayDensity();
+			const density = Utils.layout.getDisplayDensity();
 			expSize = fontSize * density;
 			TKUnit.assertAreClose(actualTextSize, expSize, 0.1, 'Wrong native FontSize');
 
@@ -345,13 +328,13 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 			TKUnit.assertEqual(actualTextSize, fontSize, 'Wrong native FontSize');
 
 			normalColor = helper.getColor(testLabel.ios.textColor);
-			expColor = new colorModule.Color(color);
+			expColor = new Color(color);
 			TKUnit.assertEqual(normalColor.hex, expColor.hex);
 
 			const cgColor = (<UILabel>testLabel.ios).layer.backgroundColor;
 			const uiColor = UIColor.colorWithCGColor(cgColor);
 			actualBackgroundColor = helper.getColor(uiColor);
-			expBackgroundColor = new colorModule.Color(backgroundColor);
+			expBackgroundColor = new Color(backgroundColor);
 			TKUnit.assertEqual(actualBackgroundColor.hex, expBackgroundColor.hex);
 		}
 	}
@@ -372,11 +355,11 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 		// testLabel.parentPage.css = "label {background-color: #C6C6C6; color: #10C2B0; font-size: 14;}";
 		// all labels within the parent page will be styled according to css values
 		// << label-cssclass-type
-		const expectedBackgroundColor = new colorModule.Color(backgroundColor);
+		const expectedBackgroundColor = new Color(backgroundColor);
 		const actualBackgroundColor = label.style.backgroundColor;
 		TKUnit.assertEqual(expectedBackgroundColor.hex, actualBackgroundColor.hex);
 
-		const expectedColor = new colorModule.Color(color);
+		const expectedColor = new Color(color);
 		const actualColor = label.style.color;
 		TKUnit.assertEqual(expectedColor.hex, actualColor.hex);
 
@@ -401,11 +384,11 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 		// label.parentPage.css = "#testLabel {background-color: #C6C6C6; color: #10C2B0; font-size: 14;}";
 		// << label-css-identifier
 
-		const expectedBackgroundColor = new colorModule.Color(backgroundColor);
+		const expectedBackgroundColor = new Color(backgroundColor);
 		const actualBackgroundColor = label.style.backgroundColor;
 		TKUnit.assertEqual(expectedBackgroundColor.hex, actualBackgroundColor.hex);
 
-		const expectedColor = new colorModule.Color(color);
+		const expectedColor = new Color(color);
 		const actualColor = label.style.color;
 		TKUnit.assertEqual(expectedColor.hex, actualColor.hex);
 
@@ -415,10 +398,10 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 
 	public test_BindingToText() {
 		// >> label-observable
-		const label = new LabelModule.Label();
+		const label = new Label();
 		const expValue = 'Expected Value';
-		const sourceModel = new observableModule.Observable();
-		const bindingOptions: bindable.BindingOptions = {
+		const sourceModel = new Observable();
+		const bindingOptions: BindingOptions = {
 			sourceProperty: 'sourceProperty',
 			targetProperty: 'text',
 		};
@@ -435,8 +418,8 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 		this.waitUntilTestElementIsLoaded();
 
 		const expValue = 'Expected Value';
-		const sourceModel = new observableModule.Observable();
-		const bindingOptions: bindable.BindingOptions = {
+		const sourceModel = new Observable();
+		const bindingOptions: BindingOptions = {
 			sourceProperty: 'sourceProperty',
 			targetProperty: 'text',
 		};
@@ -458,19 +441,19 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 		this.waitUntilTestElementIsLoaded();
 
 		const firstExpValue = 'Expected Value';
-		const bindingOptions: bindable.BindingOptions = {
+		const bindingOptions: BindingOptions = {
 			sourceProperty: 'sourceProperty',
 			targetProperty: 'text',
 		};
 		label.bind(bindingOptions);
-		const firstSourceObject = new observableModule.Observable();
+		const firstSourceObject = new Observable();
 		firstSourceObject.set('sourceProperty', firstExpValue);
 
 		this.testPage.bindingContext = firstSourceObject;
 		TKUnit.assertEqual(label.text, firstExpValue);
 
 		const secondExpValue = 'Second value';
-		const secondSourceObject = new observableModule.Observable();
+		const secondSourceObject = new Observable();
 		secondSourceObject.set('sourceProperty', secondExpValue);
 		this.testPage.bindingContext = secondSourceObject;
 
@@ -519,7 +502,7 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 
 		view.id = 'testLabel';
 		page.addCss('#testLabel { text-align: ' + this.expectedTextAlignment + '; }');
-		page.addCssFile(fs.path.join(testDir, 'label-tests-page.css'));
+		page.addCssFile(path.join(testDir, 'label-tests-page.css'));
 
 		const actualResult = view.style.textAlignment;
 		// actual result is taken from #testLabel tag, because it has a greater priority (id vs type).
@@ -608,7 +591,7 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 	}
 
 	private requestLayoutFixture(expectRequestLayout: boolean, initialValue: string, setup: (label: Label) => LayoutBase): void {
-		if (!isApple) {
+		if (!__APPLE__) {
 			return;
 		}
 
@@ -740,7 +723,7 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
 
 	public test_FormattedText_ShouldNotCrash_WheRemovedFromSpan() {
 		const label = this.testView;
-		label.color = new colorModule.Color('red');
+		label.color = new Color('red');
 		this.waitUntilTestElementIsLoaded();
 
 		const span = new Span();
diff --git a/apps/automated/src/ui/layouts/safe-area-tests.ts b/apps/automated/src/ui/layouts/safe-area-tests.ts
index 3b4b0302ee..26e2fb04a2 100644
--- a/apps/automated/src/ui/layouts/safe-area-tests.ts
+++ b/apps/automated/src/ui/layouts/safe-area-tests.ts
@@ -417,10 +417,10 @@ export class SafeAreaTests extends testModule.UITest<any> {
 	private dock_children_components_in_safe_area(pageOptions?: helper.PageOptions) {
 		const snippet = `
         <DockLayout id="dock" stretchLastChild="true">
-            <Label id="childLeft" dock="Left" text="left" backgroundColor="red" />
-            <Label id="childTop" dock="Top" text="top" backgroundColor="green" />
-            <Label id="childRight" dock="Right" text="right" backgroundColor="blue" />
-            <Label id="childBottom" dock="Bottom" text="bottom" backgroundColor="yellow" />
+            <Label id="childLeft" dock="left" text="left" backgroundColor="red" />
+            <Label id="childTop" dock="top" text="top" backgroundColor="green" />
+            <Label id="childRight" dock="right" text="right" backgroundColor="blue" />
+            <Label id="childBottom" dock="bottom" text="bottom" backgroundColor="yellow" />
             <Label id="childFill" text="fill"/>
         </DockLayout>
         `;
@@ -466,16 +466,16 @@ export class SafeAreaTests extends testModule.UITest<any> {
 	private dock_nested_layouts_beyond_safe_area(pageOptions?: helper.PageOptions) {
 		const snippet = `
         <DockLayout id="dock" stretchLastChild="true">
-            <DockLayout id="childLeft" dock="Left" text="left" backgroundColor="red">
+            <DockLayout id="childLeft" dock="left" text="left" backgroundColor="red">
                 <Label text="left"/>
             </DockLayout>
-            <DockLayout id="childTop" dock="Top" text="top" backgroundColor="green">
+            <DockLayout id="childTop" dock="top" text="top" backgroundColor="green">
                 <Label text="top" />
             </DockLayout>
-            <DockLayout id="childRight" dock="Right" text="right" backgroundColor="blue">
+            <DockLayout id="childRight" dock="right" text="right" backgroundColor="blue">
                 <Label text="right" />
             </DockLayout>
-            <DockLayout id="childBottom" dock="Bottom" text="bottom" backgroundColor="yellow">
+            <DockLayout id="childBottom" dock="bottom" text="bottom" backgroundColor="yellow">
                 <Label text="bottom" />
             </DockLayout>
             <DockLayout id="childFill" text="fill">
diff --git a/apps/automated/src/ui/lifecycle/lifecycle-tests.ts b/apps/automated/src/ui/lifecycle/lifecycle-tests.ts
index 8cde29bafe..08431ecec7 100644
--- a/apps/automated/src/ui/lifecycle/lifecycle-tests.ts
+++ b/apps/automated/src/ui/lifecycle/lifecycle-tests.ts
@@ -1,7 +1,6 @@
 import * as helper from '../../ui-helper';
 import * as btnCounter from './pages/button-counter';
 import * as TKUnit from '../../tk-unit';
-import { isIOS } from '@nativescript/core';
 
 // Integration tests that asser sertain runtime behavior, lifecycle events atc.
 
@@ -90,7 +89,7 @@ export function test_setting_one_property_while_suspedned_does_not_call_other_pr
 
 // 	TKUnit.assertEqual(btn2.backgroundInternalSetNativeCount, 2, `2: Expected ${btn2.id}'s backgroundInternal.setNative to be exactly once when inflating from xml.`);
 // 	TKUnit.assertEqual(btn2.fontInternalSetNativeCount, 2, `2: Expected ${btn2.id}'s fontInternal.setNative to be called exactly once when inflating from xml.`);
-// 	TKUnit.assertEqual(btn2.nativeBackgroundRedraws, isIOS ? 1 : 2, `2: Expected ${btn2.id}'s native background to propagated exactly once when inflating from xml.`);
+// 	TKUnit.assertEqual(btn2.nativeBackgroundRedraws, __APPLE__ ? 1 : 2, `2: Expected ${btn2.id}'s native background to propagated exactly once when inflating from xml.`);
 
 // 	helper.waitUntilLayoutReady(btn2);
 
diff --git a/apps/automated/src/ui/list-view/list-view-tests.ts b/apps/automated/src/ui/list-view/list-view-tests.ts
index f5f83dc3d7..f7e8d317bc 100644
--- a/apps/automated/src/ui/list-view/list-view-tests.ts
+++ b/apps/automated/src/ui/list-view/list-view-tests.ts
@@ -1,7 +1,7 @@
 import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
 import { UITest } from '../../ui-test';
-import { isAndroid, isIOS, Page, View, KeyedTemplate, Utils, Observable, EventData, ObservableArray, Label, Application, ListView, ItemEventData } from '@nativescript/core';
+import { isAndroid, Page, View, KeyedTemplate, Utils, Observable, EventData, ObservableArray, Label, Application, ListView, ItemEventData } from '@nativescript/core';
 import { MyButton, MyStackLayout } from '../layouts/layout-helper';
 
 // >> article-item-tap
@@ -68,7 +68,7 @@ export class ListViewTest extends UITest<ListView> {
 				try {
 					if (isAndroid) {
 						TKUnit.assert(listView.android instanceof android.widget.ListView, 'android property is android.widget.ListView');
-					} else if (isIOS) {
+					} else if (__APPLE__) {
 						TKUnit.assert(listView.ios instanceof UITableView, 'ios property is UITableView');
 					}
 
@@ -136,13 +136,13 @@ export class ListViewTest extends UITest<ListView> {
 		const indexes = [];
 		const colors = ['red', 'green', 'blue'];
 		listView.on(ListView.itemLoadingEvent, function (args: ItemEventData) {
-			indexes[args.index] = isIOS ? args.ios : args.android;
+			indexes[args.index] = __APPLE__ ? args.ios : args.android;
 		});
 		listView.items = colors;
 		TKUnit.waitUntilReady(() => indexes.length === 3);
 
 		for (var item in indexes) {
-			if (isIOS) {
+			if (__APPLE__) {
 				TKUnit.assertTrue(indexes[item] instanceof UITableViewCell, 'itemLoading not called for index ' + item);
 			} else if (isAndroid) {
 				TKUnit.assertTrue(indexes[item] instanceof android.view.ViewGroup, 'itemLoading not called for index ' + item);
@@ -151,13 +151,13 @@ export class ListViewTest extends UITest<ListView> {
 	}
 
 	public test_cell_selection_ios() {
-		if (isIOS) {
+		if (__APPLE__) {
 			const listView = this.testView;
 
 			const indexes = [];
 			const colors = ['red', 'green', 'blue'];
 			listView.on(ListView.itemLoadingEvent, function (args: ItemEventData) {
-				indexes[args.index] = isIOS ? args.ios : args.android;
+				indexes[args.index] = __APPLE__ ? args.ios : args.android;
 			});
 			listView.items = colors;
 			TKUnit.waitUntilReady(() => indexes.length === 3);
@@ -390,7 +390,7 @@ export class ListViewTest extends UITest<ListView> {
 	}
 
 	public test_loadMoreItems_not_raised_when_showing_many_items() {
-		if (isIOS) {
+		if (__APPLE__) {
 			return;
 		}
 		var listView = this.testView;
@@ -719,7 +719,7 @@ export class ListViewTest extends UITest<ListView> {
 		this.testView.items = [1];
 		this.waitUntilListViewReady();
 
-		if (isIOS) {
+		if (__APPLE__) {
 			//Could cause GC on the next call.
 			//    NOTE: Don't replace this with forceGC();
 			let array = new ArrayBuffer(4 * 1024 * 1024);
@@ -764,7 +764,7 @@ export class ListViewTest extends UITest<ListView> {
 		// which does not guarantee releases after a GC pass.
 		//
 		// TKUnit.waitUntilReady(() => {
-		// 	if (isIOS) {
+		// 	if (__APPLE__) {
 		// 		/* tslint:disable:no-unused-expression */
 		// 		// Could cause GC on the next call.
 		// 		// NOTE: Don't replace this with forceGC();
diff --git a/apps/automated/src/ui/page/modal-tab-root.ts b/apps/automated/src/ui/page/modal-tab-root.ts
index 63ff23f7e5..6cc15c6ded 100644
--- a/apps/automated/src/ui/page/modal-tab-root.ts
+++ b/apps/automated/src/ui/page/modal-tab-root.ts
@@ -1,4 +1,4 @@
-import { ShownModallyData, Frame, isIOS, TabView } from '@nativescript/core';
+import { ShownModallyData, Frame, TabView } from '@nativescript/core';
 import * as TKUnit from '../../tk-unit';
 
 export function onShownModally(args: ShownModallyData) {
diff --git a/apps/automated/src/ui/page/page-tests-common.ts b/apps/automated/src/ui/page/page-tests-common.ts
index b14b72f706..9c3824b90e 100644
--- a/apps/automated/src/ui/page/page-tests-common.ts
+++ b/apps/automated/src/ui/page/page-tests-common.ts
@@ -1,4 +1,4 @@
-import { Page, ShownModallyData, NavigatedData, View, PercentLength, unsetValue, EventData, isIOS, Frame, NavigationEntry, TabView, TabViewItem, Button, Color, Label, StackLayout, Application, Utils, Builder } from '@nativescript/core';
+import { Page, ShownModallyData, NavigatedData, View, PercentLength, unsetValue, EventData, Frame, NavigationEntry, TabView, TabViewItem, Button, Color, Label, StackLayout, Application, Utils, Builder } from '@nativescript/core';
 
 // >> article-set-bindingcontext
 function pageLoaded(args) {
@@ -369,8 +369,8 @@ export function test_page_backgroundColor() {
 	const factory = () => page;
 	helper.navigate(factory);
 
-	if (isIOS) {
-		const backgroundColor = (!__VISIONOS__ && Utils.ios.MajorVersion <= 12) || !UIColor.systemBackgroundColor ? UIColor.whiteColor : UIColor.systemBackgroundColor;
+	if (__APPLE__) {
+		const backgroundColor = (!__VISIONOS__ && Utils.SDK_VERSION <= 12) || !UIColor.systemBackgroundColor ? UIColor.whiteColor : UIColor.systemBackgroundColor;
 		TKUnit.assertEqual(page.nativeView.backgroundColor, backgroundColor, 'page backgroundColor is wrong');
 	} else {
 		const whiteColor = new Color('white');
diff --git a/apps/automated/src/ui/placeholder/placeholder-tests.ts b/apps/automated/src/ui/placeholder/placeholder-tests.ts
index 6a66700ad5..5f5cbc4e38 100644
--- a/apps/automated/src/ui/placeholder/placeholder-tests.ts
+++ b/apps/automated/src/ui/placeholder/placeholder-tests.ts
@@ -1,21 +1,14 @@
 import * as TKUnit from '../../tk-unit';
-// >> article-creating-view
-import { isIOS, isAndroid } from '@nativescript/core/platform';
-import * as utils from '@nativescript/core/utils';
+import { isIOS, isAndroid, Utils, Placeholder, CreateViewEventData, View } from '@nativescript/core';
 import * as helper from '../../ui-helper';
-import * as viewModule from '@nativescript/core/ui/core/view';
-
-// >> article-require-placeholder-module
-import * as placeholderModule from '@nativescript/core/ui/placeholder';
-// << article-require-placeholder-module
 
 function creatingView(args) {
 	let nativeView;
-	if (isIOS) {
+	if (__APPLE__) {
 		nativeView = UITextView.new();
 		nativeView.text = 'Native';
 	} else if (isAndroid) {
-		nativeView = new android.widget.TextView(utils.ad.getApplicationContext());
+		nativeView = new android.widget.TextView(Utils.android.getApplicationContext());
 		nativeView.setText('Native');
 	}
 
@@ -26,21 +19,21 @@ exports.creatingView = creatingView;
 // << article-creating-view
 
 export function test_placeholder_creatingView() {
-	const p = new placeholderModule.Placeholder();
-	p.on(placeholderModule.Placeholder.creatingViewEvent, (args: placeholderModule.CreateViewEventData) => {
+	const p = new Placeholder();
+	p.on(Placeholder.creatingViewEvent, (args: CreateViewEventData) => {
 		let nativeView;
 		if (isIOS) {
 			nativeView = UITextView.new();
 			nativeView.text = 'Native';
 		} else if (isAndroid) {
-			nativeView = new android.widget.TextView(utils.ad.getApplicationContext());
+			nativeView = new android.widget.TextView(Utils.android.getApplicationContext());
 			nativeView.setText('Native');
 		}
 
 		args.view = nativeView;
 	});
 
-	function testAction(views: Array<viewModule.View>) {
+	function testAction(views: Array<View>) {
 		if (isIOS) {
 			TKUnit.assert(p.nativeViewProtected instanceof UITextView, 'nativeView property should be UITextView. Current value: ' + p.nativeViewProtected);
 		} else if (isAndroid) {
@@ -52,10 +45,10 @@ export function test_placeholder_creatingView() {
 }
 
 export function test_placeholder_will_not_crash_wihout_creatingView() {
-	const p = new placeholderModule.Placeholder();
+	const p = new Placeholder();
 
-	function testAction(views: Array<viewModule.View>) {
-		if (isIOS) {
+	function testAction(views: Array<View>) {
+		if (__APPLE__) {
 			TKUnit.assert(p.ios === undefined, 'ios property should be undefined. Current value: ' + p.ios);
 		} else if (isAndroid) {
 			TKUnit.assert(p.android === undefined, 'android view should be undefined. Current value: ' + p.android);
diff --git a/apps/automated/src/ui/scroll-view/scroll-view-tests.ts b/apps/automated/src/ui/scroll-view/scroll-view-tests.ts
index 5276ee32cd..5bbfff4f7a 100644
--- a/apps/automated/src/ui/scroll-view/scroll-view-tests.ts
+++ b/apps/automated/src/ui/scroll-view/scroll-view-tests.ts
@@ -1,6 +1,5 @@
 import * as TKUnit from '../../tk-unit';
-import { Button } from '@nativescript/core/ui/button';
-import { Page, isIOS } from '@nativescript/core';
+import { Page, Button } from '@nativescript/core';
 import { UITest } from '../../ui-test';
 import * as layoutHelper from '../layouts/layout-helper';
 import * as helper from '../../ui-helper';
@@ -46,7 +45,7 @@ class ScrollLayoutTest extends UITest<ScrollView> {
 	public test_vertical_oriantation_creates_correct_native_view() {
 		this.testView.orientation = 'vertical';
 
-		if (isIOS) {
+		if (__APPLE__) {
 			TKUnit.assert(this.testView.ios instanceof UIScrollView, 'ios property is UIScrollView');
 		} else {
 			TKUnit.assert(this.testView.android instanceof org.nativescript.widgets.VerticalScrollView, 'android property should be instanceof org.nativescript.widgets.VerticalScrollView');
@@ -56,7 +55,7 @@ class ScrollLayoutTest extends UITest<ScrollView> {
 	public test_horizontal_oriantation_creates_correct_native_view() {
 		this.testView.orientation = 'horizontal';
 
-		if (isIOS) {
+		if (__APPLE__) {
 			TKUnit.assert(this.testView.ios instanceof UIScrollView, 'ios property is UIScrollView');
 		} else {
 			TKUnit.assert(this.testView.android instanceof org.nativescript.widgets.HorizontalScrollView, 'android property should be instanceof org.nativescript.widgets.HorizontalScrollView');
@@ -248,7 +247,7 @@ class ScrollLayoutTest extends UITest<ScrollView> {
 		this.testView.scrollBarIndicatorVisible = true;
 		this.waitUntilTestElementLayoutIsValid();
 
-		if (isIOS) {
+		if (__APPLE__) {
 			TKUnit.assertEqual(this.testView.ios.showsHorizontalScrollIndicator, true);
 		} else {
 			TKUnit.assertEqual(this.testView.android.isHorizontalScrollBarEnabled(), true);
@@ -257,7 +256,7 @@ class ScrollLayoutTest extends UITest<ScrollView> {
 		this.testView.scrollBarIndicatorVisible = false;
 		this.waitUntilTestElementLayoutIsValid();
 
-		if (isIOS) {
+		if (__APPLE__) {
 			TKUnit.assertEqual(this.testView.ios.showsHorizontalScrollIndicator, false);
 		} else {
 			TKUnit.assertEqual(this.testView.android.isHorizontalScrollBarEnabled(), false);
@@ -269,7 +268,7 @@ class ScrollLayoutTest extends UITest<ScrollView> {
 		this.testView.scrollBarIndicatorVisible = true;
 		this.waitUntilTestElementLayoutIsValid();
 
-		if (isIOS) {
+		if (__APPLE__) {
 			TKUnit.assertEqual(this.testView.ios.showsVerticalScrollIndicator, true);
 		} else {
 			TKUnit.assertEqual(this.testView.android.isVerticalScrollBarEnabled(), true);
@@ -278,7 +277,7 @@ class ScrollLayoutTest extends UITest<ScrollView> {
 		this.testView.scrollBarIndicatorVisible = false;
 		this.waitUntilTestElementLayoutIsValid();
 
-		if (isIOS) {
+		if (__APPLE__) {
 			TKUnit.assertEqual(this.testView.ios.showsVerticalScrollIndicator, false);
 		} else {
 			TKUnit.assertEqual(this.testView.android.isVerticalScrollBarEnabled(), false);
diff --git a/apps/automated/src/ui/segmented-bar/segmented-bar-tests.ts b/apps/automated/src/ui/segmented-bar/segmented-bar-tests.ts
index 14f452990c..2bc5983ca2 100644
--- a/apps/automated/src/ui/segmented-bar/segmented-bar-tests.ts
+++ b/apps/automated/src/ui/segmented-bar/segmented-bar-tests.ts
@@ -1,10 +1,7 @@
 import * as TKUnit from '../../tk-unit';
 import * as segmentedBarTestsNative from './segmented-bar-tests-native';
 import { buildUIAndRunTest } from '../../ui-helper';
-import { View } from '@nativescript/core/ui/core/view';
-import { BindingOptions } from '@nativescript/core/ui/core/bindable';
-import { Observable } from '@nativescript/core/data/observable';
-import { Color } from '@nativescript/core/color';
+import { Color, Observable, BindingOptions, View } from '@nativescript/core';
 import * as helper from '../../ui-helper';
 
 // >> article-require-segmentedbar-module
diff --git a/apps/automated/src/ui/slider/slider-tests.ts b/apps/automated/src/ui/slider/slider-tests.ts
index 1d341429cb..c9c10eb068 100644
--- a/apps/automated/src/ui/slider/slider-tests.ts
+++ b/apps/automated/src/ui/slider/slider-tests.ts
@@ -1,11 +1,6 @@
 import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
-import { View } from '@nativescript/core/ui/core/view';
-import { Page } from '@nativescript/core/ui/page';
-import { BindingOptions } from '@nativescript/core/ui/core/bindable';
-import { Observable, EventData, PropertyChangeData } from '@nativescript/core';
-import { Color } from '@nativescript/core/color';
-import { isIOS } from '@nativescript/core/platform';
+import { BindingOptions, View, Page, Observable, EventData, PropertyChangeData, Color } from '@nativescript/core';
 
 // >> article-require-slider
 import { Slider } from '@nativescript/core/ui/slider';
@@ -101,7 +96,7 @@ export function test_set_native_value_triggers_propertyChanged() {
 }
 
 // Uncomment this when find way to check android Drawable color set by setColorFilter() method.
-if (isIOS) {
+if (__APPLE__) {
 	exports.test_set_color = function () {
 		const slider = new Slider();
 		slider.color = new Color('red');
@@ -157,16 +152,16 @@ export function test_values_change_native_values() {
 		TKUnit.assertEqual(getNativeMaxValue(slider), 10, '2: Wrong native slider.maxValue');
 
 		slider.minValue = 10;
-		TKUnit.assertEqual(getNativeValue(slider), isIOS ? 10 : 0, '3: wrong native slider.value');
-		TKUnit.assertEqual(getNativeMaxValue(slider), isIOS ? 10 : 0, '3: Wrong native slider.maxValue');
+		TKUnit.assertEqual(getNativeValue(slider), __APPLE__ ? 10 : 0, '3: wrong native slider.value');
+		TKUnit.assertEqual(getNativeMaxValue(slider), __APPLE__ ? 10 : 0, '3: Wrong native slider.maxValue');
 
 		slider.maxValue = 20;
-		TKUnit.assertEqual(getNativeValue(slider), isIOS ? 10 : 0, '4: wrong native slider.value');
-		TKUnit.assertEqual(getNativeMaxValue(slider), isIOS ? 20 : 10, '4: Wrong native slider.maxValue');
+		TKUnit.assertEqual(getNativeValue(slider), __APPLE__ ? 10 : 0, '4: wrong native slider.value');
+		TKUnit.assertEqual(getNativeMaxValue(slider), __APPLE__ ? 20 : 10, '4: Wrong native slider.maxValue');
 
 		slider.value = 15;
-		TKUnit.assertEqual(getNativeValue(slider), isIOS ? 15 : 5, '5: wrong native slider.value');
-		TKUnit.assertEqual(getNativeMaxValue(slider), isIOS ? 20 : 10, '5: Wrong native slider.maxValue');
+		TKUnit.assertEqual(getNativeValue(slider), __APPLE__ ? 15 : 5, '5: wrong native slider.value');
+		TKUnit.assertEqual(getNativeMaxValue(slider), __APPLE__ ? 20 : 10, '5: Wrong native slider.maxValue');
 	}
 
 	helper.buildUIAndRunTest(slider, testAction);
diff --git a/apps/automated/src/ui/switch/switch-tests.ts b/apps/automated/src/ui/switch/switch-tests.ts
index ab1796feda..b4095efb43 100644
--- a/apps/automated/src/ui/switch/switch-tests.ts
+++ b/apps/automated/src/ui/switch/switch-tests.ts
@@ -1,12 +1,6 @@
 import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
-import * as viewModule from '@nativescript/core/ui/core/view';
-import * as bindable from '@nativescript/core/ui/core/bindable';
-import { Color, Observable, PropertyChangeData, EventData } from '@nativescript/core';
-import * as platform from '@nativescript/core/platform';
-// >> article-require-switch
-import * as switchModule from '@nativescript/core/ui/switch';
-// << article-require-switch
+import { Switch, Color, Observable, PropertyChangeData, EventData, View, BindingOptions } from '@nativescript/core';
 
 // ### Binding the Switch checked property and Button isEanbled property to a observable view-model property.
 
@@ -21,20 +15,20 @@ exports.pageLoaded = pageLoaded;
 // << article-binding-switch-property
 
 export function test_recycling() {
-	helper.nativeView_recycling_test(() => new switchModule.Switch());
+	helper.nativeView_recycling_test(() => new Switch());
 }
 
 export function test_default_TNS_values() {
 	// >> article-create-switch
-	var mySwitch = new switchModule.Switch();
+	var mySwitch = new Switch();
 	// << article-create-switch
 	TKUnit.assertEqual(mySwitch.checked, false, 'Default switch.checked');
 }
 
 export function test_default_native_values() {
-	var mySwitch = new switchModule.Switch();
+	var mySwitch = new Switch();
 
-	function testAction(views: Array<viewModule.View>) {
+	function testAction(views: Array<View>) {
 		TKUnit.assertEqual(getNativeValue(mySwitch), false, 'Default native switch.checked');
 	}
 
@@ -44,10 +38,10 @@ export function test_default_native_values() {
 // Uncomment this when find way to check android Drawable color set by setColorFilter() method.
 if (__APPLE__) {
 	exports.test_set_color = function () {
-		var mySwitch = new switchModule.Switch();
+		var mySwitch = new Switch();
 		mySwitch.color = new Color('red');
 
-		function testAction(views: Array<viewModule.View>) {
+		function testAction(views: Array<View>) {
 			TKUnit.assert(mySwitch.color.ios.isEqual(mySwitch.ios.thumbTintColor), 'mySwitch.color');
 		}
 
@@ -55,10 +49,10 @@ if (__APPLE__) {
 	};
 
 	exports.test_set_backgroundColor = function () {
-		var mySwitch = new switchModule.Switch();
+		var mySwitch = new Switch();
 		mySwitch.backgroundColor = new Color('red');
 
-		function testAction(views: Array<viewModule.View>) {
+		function testAction(views: Array<View>) {
 			TKUnit.assert(CGColorEqualToColor((<Color>mySwitch.backgroundColor).ios.CGColor, mySwitch.ios.onTintColor.CGColor), 'mySwitch.color');
 		}
 
@@ -67,8 +61,8 @@ if (__APPLE__) {
 }
 
 export function test_set_TNS_checked_updates_native_checked() {
-	var mySwitch = new switchModule.Switch();
-	function testAction(views: Array<viewModule.View>) {
+	var mySwitch = new Switch();
+	function testAction(views: Array<View>) {
 		// >> article-setting-checked-property
 		mySwitch.checked = true;
 		// << article-setting-checked-property
@@ -79,8 +73,8 @@ export function test_set_TNS_checked_updates_native_checked() {
 }
 
 export function test_set_native_checked_updates_TNS_checked() {
-	var mySwitch = new switchModule.Switch();
-	function testAction(views: Array<viewModule.View>) {
+	var mySwitch = new Switch();
+	function testAction(views: Array<View>) {
 		setNativeValue(mySwitch, true);
 		TKUnit.assertEqual(mySwitch.checked, true, 'Native checked is different from TNS checked.');
 	}
@@ -89,8 +83,8 @@ export function test_set_native_checked_updates_TNS_checked() {
 }
 
 export function test_set_native_checked_triggers_propertyChanged() {
-	var mySwitch = new switchModule.Switch();
-	function testAction(views: Array<viewModule.View>) {
+	var mySwitch = new Switch();
+	function testAction(views: Array<View>) {
 		var checkedChanged = false;
 		var allChanges = 0;
 		mySwitch.on('checkedChange', function (data: EventData) {
@@ -113,13 +107,13 @@ export function test_set_native_checked_triggers_propertyChanged() {
 }
 
 export function test_binding_value_to_model() {
-	var mySwitch = new switchModule.Switch();
+	var mySwitch = new Switch();
 
-	function testAction(views: Array<viewModule.View>) {
+	function testAction(views: Array<View>) {
 		// >> aricle-binding-checked-property
 		var model = new Observable();
 		model.set('enabled', true);
-		var options: bindable.BindingOptions = {
+		var options: BindingOptions = {
 			sourceProperty: 'enabled',
 			targetProperty: 'checked',
 		};
@@ -139,8 +133,8 @@ export function test_binding_value_to_model() {
 	helper.buildUIAndRunTest(mySwitch, testAction);
 }
 
-function getNativeValue(mySwitch: switchModule.Switch): boolean {
-	if (platform.isAndroid) {
+function getNativeValue(mySwitch: Switch): boolean {
+	if (__ANDROID__) {
 		const nativeView: android.widget.Switch = mySwitch.nativeViewProtected;
 
 		return nativeView.isChecked();
@@ -149,8 +143,8 @@ function getNativeValue(mySwitch: switchModule.Switch): boolean {
 	}
 }
 
-function setNativeValue(mySwitch: switchModule.Switch, value: boolean) {
-	if (platform.isAndroid) {
+function setNativeValue(mySwitch: Switch, value: boolean) {
+	if (__ANDROID__) {
 		const nativeView: android.widget.Switch = mySwitch.nativeViewProtected;
 		nativeView.setChecked(value);
 	} else if (mySwitch.ios) {
diff --git a/apps/automated/src/ui/tab-view/tab-view-navigation-tests.ts b/apps/automated/src/ui/tab-view/tab-view-navigation-tests.ts
index 225dac2892..9d61f035d7 100644
--- a/apps/automated/src/ui/tab-view/tab-view-navigation-tests.ts
+++ b/apps/automated/src/ui/tab-view/tab-view-navigation-tests.ts
@@ -1,13 +1,6 @@
 import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
-import { isIOS, isAndroid } from '@nativescript/core/platform';
-import { Label } from '@nativescript/core/ui/label';
-import { StackLayout } from '@nativescript/core/ui/layouts/stack-layout';
-import { Frame } from '@nativescript/core/ui/frame';
-import { Page } from '@nativescript/core/ui/page';
-import { ListView, ItemEventData } from '@nativescript/core/ui/list-view';
-import { TabView, TabViewItem } from '@nativescript/core/ui/tab-view';
-import { Button } from '@nativescript/core/ui/button';
+import { isIOS, isAndroid, Label, StackLayout, Frame, Page, ListView, ItemEventData, TabView, TabViewItem, Button } from '@nativescript/core';
 
 var ASYNC = 2;
 
diff --git a/apps/automated/src/ui/text-base/text-base-tests.ts b/apps/automated/src/ui/text-base/text-base-tests.ts
index ee2ef510e2..99e5fcfb0e 100644
--- a/apps/automated/src/ui/text-base/text-base-tests.ts
+++ b/apps/automated/src/ui/text-base/text-base-tests.ts
@@ -1,9 +1,9 @@
 import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
-import { FormattedString, isIOS, Label, Span, StackLayout } from '@nativescript/core';
+import { FormattedString, Label, Span, StackLayout } from '@nativescript/core';
 
 export function test_native_font_size_with_a11y_font_scale() {
-	if (isIOS) {
+	if (__APPLE__) {
 		const deviceFontScaleMock = 4.0;
 
 		const page = helper.getCurrentPage();
diff --git a/apps/automated/src/ui/text-field/text-field-tests.ts b/apps/automated/src/ui/text-field/text-field-tests.ts
index 46b656b1a4..bdbf2c073d 100644
--- a/apps/automated/src/ui/text-field/text-field-tests.ts
+++ b/apps/automated/src/ui/text-field/text-field-tests.ts
@@ -1,18 +1,8 @@
 import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
-import { View, isIOS, StackLayout, Page, Color, Span, FormattedString } from '@nativescript/core';
+import { View, isIOS, StackLayout, Page, Color, Span, FormattedString, BindingOptions, Observable, TextField } from '@nativescript/core';
 import { getNativeText, getNativeHint, typeTextNatively, typeTextNativelyWithReturn, getNativeSecure, getNativeFontSize, getNativeColor, getNativeBackgroundColor, getNativeTextAlignment, getNativePlaceholderColor, getNativeFocus } from './text-field-tests-native';
 
-// >> require-textfield
-import { TextField } from '@nativescript/core/ui/text-field';
-// << require-textfield
-// Other frequently used modules when working with buttons include:
-// >> require-observable-binding-options-textfield
-import { BindingOptions } from '@nativescript/core/ui/core/bindable';
-
-import { Observable } from '@nativescript/core/data/observable';
-// << require-observable-binding-options-textfield
-
 // ### Binding two TextFields text property to observable view-model property.
 // >> binding-text-property-textfield
 function pageLoaded(args) {
diff --git a/apps/automated/src/ui/text-view/text-view-tests.ts b/apps/automated/src/ui/text-view/text-view-tests.ts
index c74bd57e9f..d8dcb50952 100644
--- a/apps/automated/src/ui/text-view/text-view-tests.ts
+++ b/apps/automated/src/ui/text-view/text-view-tests.ts
@@ -1,21 +1,7 @@
 import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
-import * as viewModule from '@nativescript/core/ui/core/view';
-import * as pagesModule from '@nativescript/core/ui/page';
 import * as textViewTestsNative from './text-view-tests-native';
-import * as colorModule from '@nativescript/core/color';
-import { CoreTypes } from '@nativescript/core';
-import * as platform from '@nativescript/core/platform';
-
-// >> require-textmodules
-import * as textViewModule from '@nativescript/core/ui/text-view';
-// << require-textmodules
-
-// Other frequently used modules when working with buttons include:
-import * as bindable from '@nativescript/core/ui/core/bindable';
-// >> require-observable-textview
-import * as observable from '@nativescript/core/data/observable';
-// << require-observable-textview
+import { CoreTypes, Color, Page, View, TextView, BindingOptions, Observable } from '@nativescript/core';
 
 // >> text-view-xml
 // <Page loaded="pageLoaded">
@@ -28,7 +14,7 @@ import * as observable from '@nativescript/core/data/observable';
 // >> observable-declare
 export function pageLoaded(args) {
 	let page = args.object;
-	let obj = new observable.Observable();
+	let obj = new Observable();
 	obj.set('someProperty', 'Please change this text!');
 	page.bindingContext = obj;
 }
@@ -39,9 +25,9 @@ export function test_recycling() {
 	helper.nativeView_recycling_test(_createTextViewFunc);
 }
 
-var _createTextViewFunc = function (): textViewModule.TextView {
+var _createTextViewFunc = function (): TextView {
 	// >> text-view-create
-	var textView = new textViewModule.TextView();
+	var textView = new TextView();
 	// << text-view-create
 	textView.text = 'textView';
 
@@ -49,8 +35,8 @@ var _createTextViewFunc = function (): textViewModule.TextView {
 };
 
 export var testSetText = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
 
 		// >> set-text-value
 		textView.text = 'Hello, world!';
@@ -63,8 +49,8 @@ export var testSetText = function () {
 };
 
 export var testSetTextNull = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
 
 		textView.text = null;
 
@@ -75,8 +61,8 @@ export var testSetTextNull = function () {
 };
 
 export var testSetTextUndefined = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
 
 		textView.text = undefined;
 
@@ -89,22 +75,22 @@ export var testSetTextUndefined = function () {
 // Supported for ios only.
 if (__APPLE__) {
 	exports.test_set_color = function () {
-		helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-			var textView = <textViewModule.TextView>views[0];
-			textView.color = new colorModule.Color('red');
+		helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+			var textView = <TextView>views[0];
+			textView.color = new Color('red');
 			TKUnit.assertEqual(textView.color.ios.CGColor, textView.ios.textColor.CGColor, 'textView.color');
 		});
 	};
 }
 
 export var testBindTextDirectlyToModel = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
 
 		// >> binding-text-property-textview
-		var model = new observable.Observable();
+		var model = new Observable();
 		model.set('username', 'john');
-		var options: bindable.BindingOptions = {
+		var options: BindingOptions = {
 			sourceProperty: 'username',
 			targetProperty: 'text',
 		};
@@ -125,15 +111,15 @@ export var testBindTextDirectlyToModel = function () {
 };
 
 export var testBindTextToBindingContext = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
-		var page = <pagesModule.Page>views[1];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
+		var page = <Page>views[1];
 
-		var model = new observable.Observable();
+		var model = new Observable();
 		model.set('username', 'john');
 		page.bindingContext = model;
 
-		var options: bindable.BindingOptions = {
+		var options: BindingOptions = {
 			sourceProperty: 'username',
 			targetProperty: 'text',
 		};
@@ -149,8 +135,8 @@ export var testBindTextToBindingContext = function () {
 };
 
 export var testTextIsUpdatedWhenUserTypes = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
 		textView.updateTextTrigger = 'focusLost';
 
 		var expectedValue = 'Hello, world!';
@@ -162,8 +148,8 @@ export var testTextIsUpdatedWhenUserTypes = function () {
 };
 
 export var testSetHint = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
 		textView.text = '';
 
 		// >> set-textview-hint
@@ -177,14 +163,14 @@ export var testSetHint = function () {
 };
 
 export var testBindHintDirectlyToModel = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
 		textView.text = '';
 
 		// >> binding-hint-property-textview
-		var model = new observable.Observable();
+		var model = new Observable();
 		model.set('hint', 'type your username here');
-		var options: bindable.BindingOptions = {
+		var options: BindingOptions = {
 			sourceProperty: 'hint',
 			targetProperty: 'hint',
 		};
@@ -205,16 +191,16 @@ export var testBindHintDirectlyToModel = function () {
 };
 
 export var testBindHintToBindingConext = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
 		textView.text = '';
-		var page = <pagesModule.Page>views[1];
+		var page = <Page>views[1];
 
-		var model = new observable.Observable();
+		var model = new Observable();
 		model.set('hint', 'type your username here');
 		page.bindingContext = model;
 
-		var options: bindable.BindingOptions = {
+		var options: BindingOptions = {
 			sourceProperty: 'hint',
 			targetProperty: 'hint',
 		};
@@ -230,8 +216,8 @@ export var testBindHintToBindingConext = function () {
 };
 
 export var testHintPlusTextiOS = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
 		if (!textView.ios) {
 			return;
 		}
@@ -254,14 +240,14 @@ export var testHintPlusTextiOS = function () {
 };
 
 export var testHintColoriOS = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
 		if (!textView.ios) {
 			return;
 		}
 
 		textView.text = '';
-		textView.color = new colorModule.Color('red');
+		textView.color = new Color('red');
 		textView.hint = 'hint';
 
 		var expectedValue;
@@ -282,8 +268,8 @@ export var testHintColoriOS = function () {
 };
 
 export var testSetEditable = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
 
 		// >> setting-editable-property
 		textView.editable = false;
@@ -296,13 +282,13 @@ export var testSetEditable = function () {
 };
 
 export var testBindEditableDirectlyToModel = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
 
 		// >> binding-editable-property
-		var model = new observable.Observable();
+		var model = new Observable();
 		model.set('editable', false);
-		var options: bindable.BindingOptions = {
+		var options: BindingOptions = {
 			sourceProperty: 'editable',
 			targetProperty: 'editable',
 		};
@@ -323,15 +309,15 @@ export var testBindEditableDirectlyToModel = function () {
 };
 
 export var testBindEditableToBindingConext = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
-		var page = <pagesModule.Page>views[1];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
+		var page = <Page>views[1];
 
-		var model = new observable.Observable();
+		var model = new Observable();
 		model.set('editable', false);
 		page.bindingContext = model;
 
-		var options: bindable.BindingOptions = {
+		var options: BindingOptions = {
 			sourceProperty: 'editable',
 			targetProperty: 'editable',
 		};
@@ -347,8 +333,8 @@ export var testBindEditableToBindingConext = function () {
 };
 
 export var testSetMaxLines = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
 
 		textView.maxLines = 3;
 
@@ -360,9 +346,9 @@ export var testSetMaxLines = function () {
 
 var expectedFontSize = 42;
 export var testLocalFontSizeFromCss = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
-		var page = <pagesModule.Page>views[1];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
+		var page = <Page>views[1];
 
 		page.css = 'textview { font-size: ' + expectedFontSize + '; }';
 		var actualResult = textView.style.fontSize;
@@ -371,9 +357,9 @@ export var testLocalFontSizeFromCss = function () {
 };
 
 export var testNativeFontSizeFromCss = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
-		var page = <pagesModule.Page>views[1];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
+		var page = <Page>views[1];
 		page.css = 'textview { font-size: ' + expectedFontSize + '; }';
 
 		var actualResult = textViewTestsNative.getNativeFontSize(textView);
@@ -382,8 +368,8 @@ export var testNativeFontSizeFromCss = function () {
 };
 
 export var testNativeFontSizeFromLocal = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
 		textView.style.fontSize = expectedFontSize;
 
 		var actualResult = textViewTestsNative.getNativeFontSize(textView);
@@ -393,9 +379,9 @@ export var testNativeFontSizeFromLocal = function () {
 
 var expectedLineHeight = 10;
 export var testLocalLineHeightFromCss = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
-		var page = <pagesModule.Page>views[1];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
+		var page = <Page>views[1];
 
 		page.css = 'textview { line-height: ' + expectedLineHeight + '; }';
 		var actualResult = textView.style.lineHeight;
@@ -406,9 +392,9 @@ export var testLocalLineHeightFromCss = function () {
 var expectedColorHex = '#FF0000FF';
 var expectedNormalizedColorHex = '#FF0000';
 export var testLocalColorFromCss = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
-		var page = <pagesModule.Page>views[1];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
+		var page = <Page>views[1];
 		page.css = 'textview { color: ' + expectedColorHex + '; }';
 
 		var actualResult = textView.style.color.hex;
@@ -417,9 +403,9 @@ export var testLocalColorFromCss = function () {
 };
 
 export var testNativeColorFromCss = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
-		var page = <pagesModule.Page>views[1];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
+		var page = <Page>views[1];
 		page.css = 'textview { color: ' + expectedColorHex + '; }';
 
 		var actualResult = textViewTestsNative.getNativeColor(textView).hex;
@@ -428,9 +414,9 @@ export var testNativeColorFromCss = function () {
 };
 
 export var testNativeColorFromLocal = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
-		textView.style.color = new colorModule.Color(expectedColorHex);
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
+		textView.style.color = new Color(expectedColorHex);
 
 		var actualResult = textViewTestsNative.getNativeColor(textView).hex;
 		TKUnit.assert(actualResult === expectedNormalizedColorHex, 'Actual: ' + actualResult + '; Expected: ' + expectedNormalizedColorHex);
@@ -440,9 +426,9 @@ export var testNativeColorFromLocal = function () {
 var expectedBackgroundColorHex = '#00FF00FF';
 var expectedNormalizedBackgroundColorHex = '#00FF00';
 export var testLocalBackgroundColorFromCss = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
-		var page = <pagesModule.Page>views[1];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
+		var page = <Page>views[1];
 		page.css = 'textview { background-color: ' + expectedBackgroundColorHex + '; }';
 
 		var actualResult = textView.style.backgroundColor.hex;
@@ -451,9 +437,9 @@ export var testLocalBackgroundColorFromCss = function () {
 };
 
 export var testNativeBackgroundColorFromCss = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
-		var page = <pagesModule.Page>views[1];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
+		var page = <Page>views[1];
 		page.css = 'textview { background-color: ' + expectedBackgroundColorHex + '; }';
 
 		helper.waitUntilLayoutReady(textView);
@@ -464,9 +450,9 @@ export var testNativeBackgroundColorFromCss = function () {
 };
 
 export var testNativeBackgroundColorFromLocal = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var textView = <textViewModule.TextView>views[0];
-		textView.style.backgroundColor = new colorModule.Color(expectedBackgroundColorHex);
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var textView = <TextView>views[0];
+		textView.style.backgroundColor = new Color(expectedBackgroundColorHex);
 
 		helper.waitUntilLayoutReady(textView);
 
@@ -477,9 +463,9 @@ export var testNativeBackgroundColorFromLocal = function () {
 
 var expectedTextAlignment: 'right' = 'right';
 export var testLocalTextAlignmentFromCss = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var view = <textViewModule.TextView>views[0];
-		var page = <pagesModule.Page>views[1];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var view = <TextView>views[0];
+		var page = <Page>views[1];
 		page.css = 'textview { text-align: ' + expectedTextAlignment + '; }';
 
 		var actualResult = view.style.textAlignment;
@@ -488,9 +474,9 @@ export var testLocalTextAlignmentFromCss = function () {
 };
 
 export var testNativeTextAlignmentFromCss = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var view = <textViewModule.TextView>views[0];
-		var page = <pagesModule.Page>views[1];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var view = <TextView>views[0];
+		var page = <Page>views[1];
 		page.css = 'textview { text-align: ' + expectedTextAlignment + '; }';
 
 		var actualResult = textViewTestsNative.getNativeTextAlignment(view);
@@ -499,8 +485,8 @@ export var testNativeTextAlignmentFromCss = function () {
 };
 
 export var testNativeTextAlignmentFromLocal = function () {
-	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
-		var view = <textViewModule.TextView>views[0];
+	helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<View>) {
+		var view = <TextView>views[0];
 		view.style.textAlignment = expectedTextAlignment;
 
 		var actualResult = textViewTestsNative.getNativeTextAlignment(view);
@@ -519,10 +505,10 @@ export var testNativeTextAlignmentFromLocal = function () {
 // };
 
 export function test_watch_listerer_is_removed_at_onDetach() {
-	if (platform.isAndroid) {
-		helper.buildUIAndRunTest(_createTextViewFunc(), (views: Array<viewModule.View>) => {
-			let tv = <textViewModule.TextView>views[0];
-			let page = <pagesModule.Page>tv.page;
+	if (__ANDROID__) {
+		helper.buildUIAndRunTest(_createTextViewFunc(), (views: Array<View>) => {
+			let tv = <TextView>views[0];
+			let page = <Page>tv.page;
 			let editText = tv.android;
 			editText.setText('String');
 			page.content = null;
@@ -532,8 +518,8 @@ export function test_watch_listerer_is_removed_at_onDetach() {
 }
 
 export function test_IntegrationTest_Transform_Decoration_Spacing_WithoutFormattedText_DoesNotCrash() {
-	let view = new textViewModule.TextView();
-	helper.buildUIAndRunTest(view, function (views: Array<viewModule.View>) {
+	let view = new TextView();
+	helper.buildUIAndRunTest(view, function (views: Array<View>) {
 		view.text = 'NormalText';
 		view.setInlineStyle('text-transform: uppercase; text-decoration: underline; letter-spacing: 1;');
 
@@ -544,9 +530,9 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithoutFormatt
 }
 
 export function test_IntegrationTest_Transform_Decoration_Spacing_WithFormattedText_DoesNotCrash() {
-	let view = new textViewModule.TextView();
+	let view = new TextView();
 	let formattedString = helper._generateFormattedString();
-	helper.buildUIAndRunTest(view, function (views: Array<viewModule.View>) {
+	helper.buildUIAndRunTest(view, function (views: Array<View>) {
 		view.formattedText = formattedString;
 		view.setInlineStyle('text-transform: uppercase; text-decoration: underline; letter-spacing: 1;');
 
diff --git a/apps/automated/src/ui/view/view-tests.android.ts b/apps/automated/src/ui/view/view-tests.android.ts
index 78385921d4..8c254f6565 100644
--- a/apps/automated/src/ui/view/view-tests.android.ts
+++ b/apps/automated/src/ui/view/view-tests.android.ts
@@ -1,12 +1,6 @@
 import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
-import { View, unsetValue } from '@nativescript/core/ui/core/view';
-import { Button } from '@nativescript/core/ui/button';
-import * as types from '@nativescript/core/utils/types';
-import { StackLayout } from '@nativescript/core/ui/layouts/stack-layout';
-import { Label } from '@nativescript/core/ui/label';
-import { Trace, isIOS } from '@nativescript/core';
-import { Color } from '@nativescript/core/color';
+import { View, unsetValue, Button, StackLayout, Label, Color, isIOS, Trace, Utils } from '@nativescript/core';
 
 // enable the trace, it is disabled by default
 Trace.enable();
@@ -301,5 +295,5 @@ export function checkNativeBackgroundColor(v: View): boolean {
 export function checkNativeBackgroundImage(v: View): boolean {
 	const bkg = <org.nativescript.widgets.BorderDrawable>(<android.view.View>v.android).getBackground();
 
-	return bkg && !types.isNullOrUndefined(bkg.getBackgroundImage());
+	return bkg && !Utils.isNullOrUndefined(bkg.getBackgroundImage());
 }
diff --git a/apps/automated/src/utils/utils-tests.ts b/apps/automated/src/utils/utils-tests.ts
index af99b603b9..92579afa1b 100644
--- a/apps/automated/src/utils/utils-tests.ts
+++ b/apps/automated/src/utils/utils-tests.ts
@@ -1,17 +1,16 @@
 import * as TKUnit from '../tk-unit';
-import * as utils from '@nativescript/core/utils';
-import { isIOS } from '@nativescript/core/platform';
+import { Utils } from '@nativescript/core';
 
 export function test_GC_isDefined() {
-	TKUnit.assertNotEqual(utils.GC, undefined, 'Method utils.GC() should be defined!');
+	TKUnit.assertNotEqual(Utils.GC, undefined, 'Method utils.GC() should be defined!');
 }
 
 export function test_releaseNativeObject_isDefined() {
-	TKUnit.assertNotEqual(utils.releaseNativeObject, undefined, 'Method utils.releaseNativeObject() should be defined!');
+	TKUnit.assertNotEqual(Utils.releaseNativeObject, undefined, 'Method utils.releaseNativeObject() should be defined!');
 }
 
 export function test_releaseNativeObject_canBeCalledWithNativeObject() {
-	if (isIOS) {
+	if (__APPLE__) {
 		test_releaseNativeObject_canBeCalledWithNativeObject_iOS();
 	} else {
 		test_releaseNativeObject_canBeCalledWithNativeObject_Android();
@@ -19,9 +18,9 @@ export function test_releaseNativeObject_canBeCalledWithNativeObject() {
 }
 
 export function test_executeOnMainThread_Works(done: Function) {
-	utils.executeOnMainThread(() => {
+	Utils.executeOnMainThread(() => {
 		try {
-			TKUnit.assertTrue(utils.isMainThread());
+			TKUnit.assertTrue(Utils.isMainThread());
 			done();
 		} catch (e) {
 			done(e);
@@ -30,9 +29,9 @@ export function test_executeOnMainThread_Works(done: Function) {
 }
 
 export function test_dispatchToMainThread_Works(done: Function) {
-	utils.dispatchToMainThread(() => {
+	Utils.dispatchToMainThread(() => {
 		try {
-			TKUnit.assertTrue(utils.isMainThread());
+			TKUnit.assertTrue(Utils.isMainThread());
 			done();
 		} catch (e) {
 			done(e);
@@ -44,9 +43,9 @@ export function test_mainThreadify_PassesArgs(done: Function) {
 	const expectedN = 434;
 	const expectedB = true;
 	const expectedS = 'string';
-	const f = utils.mainThreadify(function (n: number, b: boolean, s: string) {
+	const f = Utils.mainThreadify(function (n: number, b: boolean, s: string) {
 		try {
-			TKUnit.assertTrue(utils.isMainThread());
+			TKUnit.assertTrue(Utils.isMainThread());
 			TKUnit.assertEqual(n, expectedN);
 			TKUnit.assertEqual(b, expectedB);
 			TKUnit.assertEqual(s, expectedS);
@@ -68,7 +67,7 @@ function test_releaseNativeObject_canBeCalledWithNativeObject_iOS() {
 	}))();
 	TKUnit.assertMatches(obj.description, /NSObject/, 'Object description should match!');
 
-	utils.releaseNativeObject(obj);
+	Utils.releaseNativeObject(obj);
 
 	// Need to sleep to make the delayed release get executed
 	NSThread.sleepForTimeInterval(0);
@@ -79,7 +78,7 @@ function test_releaseNativeObject_canBeCalledWithNativeObject_Android() {
 	const obj = new java.lang.Object();
 	TKUnit.assertMatches(obj.toString(), /java.lang.Object/, 'Object description should match!');
 
-	utils.releaseNativeObject(obj);
+	Utils.releaseNativeObject(obj);
 
 	TKUnit.assertThrowsRegExp(obj.toString.bind(obj), 'Should throw an error!', /Failed calling toString on a java\/lang\/Object instance/);
 }
diff --git a/apps/toolbox/package.json b/apps/toolbox/package.json
index 19ea0a5834..96630949ac 100644
--- a/apps/toolbox/package.json
+++ b/apps/toolbox/package.json
@@ -12,10 +12,10 @@
     "nativescript-theme-core": "file:../../node_modules/nativescript-theme-core"
   },
   "devDependencies": {
-    "@nativescript/android": "~8.8.0",
-    "@nativescript/ios": "~8.8.0",
-    "@nativescript/visionos": "~8.8.0",
+    "@nativescript/android": "~8.9.0",
+    "@nativescript/ios": "~8.9.0",
+    "@nativescript/visionos": "~8.9.0",
     "@nativescript/webpack": "file:../../dist/packages/webpack5",
-    "typescript": "~5.6.0"
+    "typescript": "~5.8.0"
   }
 }
diff --git a/apps/ui/package.json b/apps/ui/package.json
index d2261c9f26..65529734c7 100644
--- a/apps/ui/package.json
+++ b/apps/ui/package.json
@@ -11,11 +11,11 @@
     "nativescript-theme-core": "file:../../node_modules/nativescript-theme-core"
   },
   "devDependencies": {
-    "@nativescript/android": "~8.8.0",
-    "@nativescript/ios": "~8.8.0",
-    "@nativescript/visionos": "~8.8.0",
+    "@nativescript/android": "~8.9.0",
+    "@nativescript/ios": "~8.9.0",
+    "@nativescript/visionos": "~8.9.0",
     "@nativescript/webpack": "file:../../dist/packages/webpack5",
-    "typescript": "~5.6.0"
+    "typescript": "~5.8.0"
   },
   "gitHead": "8ab7726d1ee9991706069c1359c552e67ee0d1a4",
   "readme": "NativeScript Application",
diff --git a/migrations.json b/migrations.json
index b8f9a4fe1d..8e9491e1cc 100644
--- a/migrations.json
+++ b/migrations.json
@@ -1,7 +1,14 @@
 {
 	"migrations": [
-		{ "version": "20.0.0-beta.7", "description": "Migration for v20.0.0-beta.7", "implementation": "./src/migrations/update-20-0-0/move-use-daemon-process", "package": "nx", "name": "move-use-daemon-process" },
-		{ "version": "20.0.1", "description": "Set `useLegacyCache` to true for migrating workspaces", "implementation": "./src/migrations/update-20-0-1/use-legacy-cache", "x-repair-skip": true, "package": "nx", "name": "use-legacy-cache" },
-		{ "cli": "nx", "version": "20.0.0-beta.5", "description": "replace getJestProjects with getJestProjectsAsync", "implementation": "./src/migrations/update-20-0-0/replace-getJestProjects-with-getJestProjectsAsync", "package": "@nx/jest", "name": "replace-getJestProjects-with-getJestProjectsAsync" }
+		{ "version": "21.0.0-beta.8", "description": "Removes the legacy cache configuration from nx.json", "implementation": "./src/migrations/update-21-0-0/remove-legacy-cache", "package": "nx", "name": "remove-legacy-cache" },
+		{ "version": "21.0.0-beta.8", "description": "Removes the legacy cache configuration from nx.json", "implementation": "./src/migrations/update-21-0-0/remove-custom-tasks-runner", "package": "nx", "name": "remove-custom-tasks-runner" },
+		{ "version": "21.0.0-beta.11", "description": "Updates release version config based on the breaking changes in Nx v21", "implementation": "./src/migrations/update-21-0-0/release-version-config-changes", "package": "nx", "name": "release-version-config-changes" },
+		{ "version": "21.0.0-beta.11", "description": "Updates release changelog config based on the breaking changes in Nx v21", "implementation": "./src/migrations/update-21-0-0/release-changelog-config-changes", "package": "nx", "name": "release-changelog-config-changes" },
+		{ "version": "21.1.0-beta.2", "description": "Adds **/nx-rules.mdc and **/nx.instructions.md to .gitignore if not present", "implementation": "./src/migrations/update-21-1-0/add-gitignore-entry", "package": "nx", "name": "21-1-0-add-ignore-entries-for-nx-rule-files" },
+		{ "version": "20.5.0-beta.2", "description": "Install jiti as a devDependency to allow vite to parse TS postcss files.", "implementation": "./src/migrations/update-20-5-0/install-jiti", "package": "@nx/vite", "name": "update-20-5-0-install-jiti" },
+		{ "version": "20.5.0-beta.3", "description": "Update resolve.conditions to include defaults that are no longer provided by Vite.", "implementation": "./src/migrations/update-20-5-0/update-resolve-conditions", "package": "@nx/vite", "name": "update-20-5-0-update-resolve-conditions" },
+		{ "version": "20.5.0-beta.3", "description": "Add vite config temporary files to the ESLint configuration ignore patterns if ESLint is used.", "implementation": "./src/migrations/update-20-5-0/eslint-ignore-vite-temp-files", "package": "@nx/vite", "name": "eslint-ignore-vite-temp-files" },
+		{ "cli": "nx", "version": "21.0.0-beta.9", "description": "Replace usage of `getJestProjects` with `getJestProjectsAsync`.", "implementation": "./src/migrations/update-21-0-0/replace-getJestProjects-with-getJestProjectsAsync", "package": "@nx/jest", "name": "replace-getJestProjects-with-getJestProjectsAsync-v21" },
+		{ "version": "21.0.0-beta.10", "description": "Remove the previously deprecated and unused `tsConfig` option from the `@nx/jest:jest` executor.", "implementation": "./src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor", "package": "@nx/jest", "name": "remove-tsconfig-option-from-jest-executor" }
 	]
 }
diff --git a/nx.json b/nx.json
index 9a31c9f9de..ce34484575 100644
--- a/nx.json
+++ b/nx.json
@@ -69,37 +69,17 @@
 	},
 	"$schema": "./node_modules/nx/schemas/nx-schema.json",
 	"namedInputs": {
-		"default": [
-			"{projectRoot}/**/*",
-			"sharedGlobals"
-		],
-		"sharedGlobals": [
-			"{workspaceRoot}/workspace.json",
-			"{workspaceRoot}/tsconfig.json",
-			"{workspaceRoot}/nx.json"
-		],
-		"production": [
-			"default",
-			"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
-			"!{projectRoot}/tsconfig.spec.json",
-			"!{projectRoot}/jest.config.[jt]s",
-			"!{projectRoot}/src/test-setup.[jt]s"
-		]
+		"default": ["{projectRoot}/**/*", "sharedGlobals"],
+		"sharedGlobals": ["{workspaceRoot}/workspace.json", "{workspaceRoot}/tsconfig.json", "{workspaceRoot}/nx.json"],
+		"production": ["default", "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)", "!{projectRoot}/tsconfig.spec.json", "!{projectRoot}/jest.config.[jt]s", "!{projectRoot}/src/test-setup.[jt]s"]
 	},
 	"targetDefaults": {
 		"build": {
-			"inputs": [
-				"production",
-				"^production"
-			],
+			"inputs": ["production", "^production"],
 			"cache": true
 		},
 		"test": {
-			"inputs": [
-				"default",
-				"^production",
-				"{workspaceRoot}/jest.preset.js"
-			],
+			"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
 			"cache": true
 		},
 		"lint": {
@@ -115,11 +95,7 @@
 			"cache": true
 		},
 		"@nx/jest:jest": {
-			"inputs": [
-				"default",
-				"^production",
-				"{workspaceRoot}/jest.preset.js"
-			],
+			"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
 			"cache": true,
 			"options": {
 				"passWithNoTests": true
@@ -133,25 +109,16 @@
 		},
 		"@nx/vite:test": {
 			"cache": true,
-			"inputs": [
-				"default",
-				"^production"
-			]
+			"inputs": ["default", "^production"]
 		}
 	},
 	"useDaemonProcess": false,
 	"parallel": 1,
 	"useInferencePlugins": false,
 	"defaultBase": "master",
-	"useLegacyCache": true,
 	"release": {
 		"releaseTagPattern": "{version}-{projectName}",
-		"projects": [
-			"packages/*",
-			"!packages/ui-mobile-base",
-			"!packages/types-minimal",
-			"!packages/winter-tc"
-		],
+		"projects": ["packages/*", "!packages/ui-mobile-base", "!packages/types-minimal", "!packages/winter-tc"],
 		"projectsRelationship": "independent",
 		"changelog": {
 			"workspaceChangelog": false,
@@ -165,4 +132,4 @@
 		}
 	},
 	"nxCloudId": "680a89d49c76d63ce41eb397"
-}
\ No newline at end of file
+}
diff --git a/package-lock.json b/package-lock.json
index f95a0f53cc..d3323343a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,32 +17,32 @@
 				"@csstools/css-color-parser": "^3.0.8",
 				"@csstools/css-parser-algorithms": "^3.0.4",
 				"@csstools/css-tokenizer": "^3.0.3",
-				"@nativescript/hook": "^2.0.0",
-				"@nativescript/nx": "^20.0.0",
+				"@nativescript/hook": "^3.0.1",
+				"@nativescript/nx": "^21.0.0",
 				"@nstudio/focus": "^20.0.2",
 				"@nstudio/nps-i": "~2.0.0",
-				"@nx/devkit": "20.3.0",
-				"@nx/eslint-plugin": "20.3.0",
-				"@nx/jest": "20.3.0",
-				"@nx/js": "20.3.0",
-				"@nx/node": "20.3.0",
-				"@nx/plugin": "20.3.0",
-				"@nx/vite": "20.3.0",
-				"@nx/web": "20.3.0",
-				"@nx/workspace": "20.3.0",
+				"@nx/devkit": "21.2.1",
+				"@nx/eslint-plugin": "21.2.1",
+				"@nx/jest": "21.2.1",
+				"@nx/js": "21.2.1",
+				"@nx/node": "21.2.1",
+				"@nx/plugin": "21.2.1",
+				"@nx/vite": "21.2.1",
+				"@nx/web": "21.2.1",
+				"@nx/workspace": "21.2.1",
 				"@prettier/plugin-xml": "^3.4.1",
-				"@swc-node/register": "~1.9.1",
-				"@swc/core": "~1.5.7",
-				"@swc/helpers": "~0.5.11",
+				"@swc-node/register": "~1.10.1",
+				"@swc/core": "~1.12.7",
+				"@swc/helpers": "~0.5.17",
 				"@types/jest": "~29.5.0",
 				"@types/node": "^20.0.0",
-				"@typescript-eslint/eslint-plugin": "^8.6.0",
-				"@typescript-eslint/parser": "^8.6.0",
-				"@vitest/coverage-v8": "^1.0.4",
-				"@vitest/ui": "^1.3.1",
-				"acorn": "^8.7.0",
+				"@typescript-eslint/eslint-plugin": "^8.35.0",
+				"@typescript-eslint/parser": "^8.35.0",
+				"@vitest/coverage-v8": "^2.0.0",
+				"@vitest/ui": "^2.0.0",
+				"acorn": "^8.15.0",
 				"acorn-stage3": "^4.0.0",
-				"copy-webpack-plugin": "^9.0.0",
+				"copy-webpack-plugin": "^13.0.0",
 				"copyfiles": "^2.4.0",
 				"css": "^3.0.0",
 				"css-tree": "^1.1.2",
@@ -52,39 +52,41 @@
 				"emoji-regex": "^10.3.0",
 				"enhanced-resolve": "^5.8.3",
 				"eslint": "~8.57.0",
-				"eslint-config-prettier": "~9.1.0",
+				"eslint-config-prettier": "^10.0.0",
 				"fork-ts-checker-webpack-plugin": "^7.0.0",
 				"gonzales": "^1.0.7",
 				"husky": "^9.0.0",
 				"jest": "~29.7.0",
 				"jest-environment-jsdom": "~29.7.0",
+				"jiti": "2.4.2",
 				"jsdom": "~22.1.0",
 				"lint-staged": "^15.2.0",
 				"loader-utils": "^2.0.0 || ^3.0.0",
 				"module-alias": "^2.2.2",
-				"nativescript": "~8.9.0",
+				"nativescript": "^9.0.0-alpha.0",
 				"nativescript-typedoc-theme": "1.1.0",
-				"nx": "20.3.0",
+				"nx": "21.2.1",
 				"parse-css": "git+https://github.com/tabatkins/parse-css.git",
 				"parserlib": "^1.1.1",
 				"postcss": "^8.0.0",
-				"postcss-import": "^14.0.0",
-				"postcss-loader": "^7.0.0",
+				"postcss-import": "^16.0.0",
+				"postcss-loader": "^8.0.0",
 				"prettier": "^3.2.5",
 				"sass": "^1.72.0",
+				"sass-loader": "^16.0.5",
 				"shady-css-parser": "^0.1.0",
 				"terser-webpack-plugin": "^5.0.0",
 				"tree-kill": "^1.2.2",
 				"ts-dedent": "^2.2.0",
-				"ts-jest": "29.2.5",
+				"ts-jest": "29.4.0",
 				"ts-loader": "^9.0.0",
 				"ts-node": "10.9.2",
 				"ts-patch": "^3.0.0",
 				"tslib": "^2.6.0",
-				"typedoc": "^0.27.6",
-				"typescript": "~5.6.0",
-				"vite": "^5.0.0",
-				"vitest": "^1.3.1",
+				"typedoc": "^0.28.6",
+				"typescript": "5.8.3",
+				"vite": "^6.0.0",
+				"vitest": "^2.0.0",
 				"vue-loader": "^15.0.0 <= 15.9.8",
 				"webpack": "^5.30.0 <= 5.50.0 || ^5.51.2",
 				"webpack-bundle-analyzer": "^4.0.0",
@@ -2276,20 +2278,20 @@
 			}
 		},
 		"node_modules/@emnapi/core": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.3.1.tgz",
-			"integrity": "sha512-pVGjBIt1Y6gg3EJN8jTcfpP/+uuRksIo055oE/OBkDNcjZqVbfkWCksG1Jp4yZnj3iKWyWX8fdG/j6UDYPbFog==",
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.3.tgz",
+			"integrity": "sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@emnapi/wasi-threads": "1.0.1",
+				"@emnapi/wasi-threads": "1.0.2",
 				"tslib": "^2.4.0"
 			}
 		},
 		"node_modules/@emnapi/runtime": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.3.1.tgz",
-			"integrity": "sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==",
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz",
+			"integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2297,9 +2299,9 @@
 			}
 		},
 		"node_modules/@emnapi/wasi-threads": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.1.tgz",
-			"integrity": "sha512-iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.2.tgz",
+			"integrity": "sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2307,9 +2309,9 @@
 			}
 		},
 		"node_modules/@esbuild/aix-ppc64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-			"integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
+			"integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==",
 			"cpu": [
 				"ppc64"
 			],
@@ -2320,13 +2322,13 @@
 				"aix"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/android-arm": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-			"integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.5.tgz",
+			"integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==",
 			"cpu": [
 				"arm"
 			],
@@ -2337,13 +2339,13 @@
 				"android"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/android-arm64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-			"integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz",
+			"integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==",
 			"cpu": [
 				"arm64"
 			],
@@ -2354,13 +2356,13 @@
 				"android"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/android-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-			"integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.5.tgz",
+			"integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==",
 			"cpu": [
 				"x64"
 			],
@@ -2371,13 +2373,13 @@
 				"android"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/darwin-arm64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-			"integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz",
+			"integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==",
 			"cpu": [
 				"arm64"
 			],
@@ -2388,13 +2390,13 @@
 				"darwin"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/darwin-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-			"integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz",
+			"integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==",
 			"cpu": [
 				"x64"
 			],
@@ -2405,13 +2407,13 @@
 				"darwin"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/freebsd-arm64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-			"integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz",
+			"integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==",
 			"cpu": [
 				"arm64"
 			],
@@ -2422,13 +2424,13 @@
 				"freebsd"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/freebsd-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-			"integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz",
+			"integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==",
 			"cpu": [
 				"x64"
 			],
@@ -2439,13 +2441,13 @@
 				"freebsd"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-arm": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-			"integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz",
+			"integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==",
 			"cpu": [
 				"arm"
 			],
@@ -2456,13 +2458,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-arm64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-			"integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz",
+			"integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==",
 			"cpu": [
 				"arm64"
 			],
@@ -2473,13 +2475,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-ia32": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-			"integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz",
+			"integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==",
 			"cpu": [
 				"ia32"
 			],
@@ -2490,13 +2492,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-loong64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-			"integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz",
+			"integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==",
 			"cpu": [
 				"loong64"
 			],
@@ -2507,13 +2509,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-mips64el": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-			"integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz",
+			"integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==",
 			"cpu": [
 				"mips64el"
 			],
@@ -2524,13 +2526,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-ppc64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-			"integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz",
+			"integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==",
 			"cpu": [
 				"ppc64"
 			],
@@ -2541,13 +2543,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-riscv64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-			"integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz",
+			"integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==",
 			"cpu": [
 				"riscv64"
 			],
@@ -2558,13 +2560,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-s390x": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-			"integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz",
+			"integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==",
 			"cpu": [
 				"s390x"
 			],
@@ -2575,13 +2577,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-			"integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz",
+			"integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==",
 			"cpu": [
 				"x64"
 			],
@@ -2592,13 +2594,30 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/netbsd-arm64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz",
+			"integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"netbsd"
+			],
+			"engines": {
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/netbsd-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-			"integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz",
+			"integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==",
 			"cpu": [
 				"x64"
 			],
@@ -2609,13 +2628,30 @@
 				"netbsd"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/openbsd-arm64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz",
+			"integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"openbsd"
+			],
+			"engines": {
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/openbsd-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-			"integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz",
+			"integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==",
 			"cpu": [
 				"x64"
 			],
@@ -2626,13 +2662,13 @@
 				"openbsd"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/sunos-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-			"integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz",
+			"integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==",
 			"cpu": [
 				"x64"
 			],
@@ -2643,13 +2679,13 @@
 				"sunos"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/win32-arm64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-			"integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz",
+			"integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==",
 			"cpu": [
 				"arm64"
 			],
@@ -2660,13 +2696,13 @@
 				"win32"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/win32-ia32": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-			"integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz",
+			"integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==",
 			"cpu": [
 				"ia32"
 			],
@@ -2677,13 +2713,13 @@
 				"win32"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/win32-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-			"integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz",
+			"integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==",
 			"cpu": [
 				"x64"
 			],
@@ -2694,13 +2730,13 @@
 				"win32"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@eslint-community/eslint-utils": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
-			"integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
+			"version": "4.7.0",
+			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
+			"integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2858,15 +2894,17 @@
 			"license": "ISC"
 		},
 		"node_modules/@gerrit0/mini-shiki": {
-			"version": "1.24.4",
-			"resolved": "https://registry.npmjs.org/@gerrit0/mini-shiki/-/mini-shiki-1.24.4.tgz",
-			"integrity": "sha512-YEHW1QeAg6UmxEmswiQbOVEg1CW22b1XUD/lNTliOsu0LD0wqoyleFMnmbTp697QE0pcadQiR5cVtbbAPncvpw==",
+			"version": "3.7.0",
+			"resolved": "https://registry.npmjs.org/@gerrit0/mini-shiki/-/mini-shiki-3.7.0.tgz",
+			"integrity": "sha512-7iY9wg4FWXmeoFJpUL2u+tsmh0d0jcEJHAIzVxl3TG4KL493JNnisdLAILZ77zcD+z3J0keEXZ+lFzUgzQzPDg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@shikijs/engine-oniguruma": "^1.24.2",
-				"@shikijs/types": "^1.24.2",
-				"@shikijs/vscode-textmate": "^9.3.1"
+				"@shikijs/engine-oniguruma": "^3.7.0",
+				"@shikijs/langs": "^3.7.0",
+				"@shikijs/themes": "^3.7.0",
+				"@shikijs/types": "^3.7.0",
+				"@shikijs/vscode-textmate": "^10.0.2"
 			}
 		},
 		"node_modules/@humanwhocodes/config-array": {
@@ -3146,6 +3184,29 @@
 				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
 			}
 		},
+		"node_modules/@isaacs/balanced-match": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+			"integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "20 || >=22"
+			}
+		},
+		"node_modules/@isaacs/brace-expansion": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+			"integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@isaacs/balanced-match": "^4.0.1"
+			},
+			"engines": {
+				"node": "20 || >=22"
+			}
+		},
 		"node_modules/@isaacs/cliui": {
 			"version": "8.0.2",
 			"resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -4620,20 +4681,119 @@
 			}
 		},
 		"node_modules/@nativescript/hook": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@nativescript/hook/-/hook-2.0.0.tgz",
-			"integrity": "sha512-v3Hj3Zpd69sQJfFpDNXonV0EjO1a2OL4l48wlo1Ycsqk4r7RY822d/irFTjt0LllRG0OcdEGgfG6wKb0YgPyHw==",
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@nativescript/hook/-/hook-3.0.1.tgz",
+			"integrity": "sha512-+h6N+wIUHziL+KjjBwGLo+EjAafkZCOsaBwUlRMWafbbS0qJVN2uRf0MKK9PKkbpeGlApgiZiGA12IXUrcpJ8w==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
-				"glob": "^7.1.0",
-				"mkdirp": "^1.0.4"
+				"glob": "^11.0.0",
+				"mkdirp": "^3.0.1"
+			}
+		},
+		"node_modules/@nativescript/hook/node_modules/glob": {
+			"version": "11.0.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-11.0.3.tgz",
+			"integrity": "sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"foreground-child": "^3.3.1",
+				"jackspeak": "^4.1.1",
+				"minimatch": "^10.0.3",
+				"minipass": "^7.1.2",
+				"package-json-from-dist": "^1.0.0",
+				"path-scurry": "^2.0.0"
+			},
+			"bin": {
+				"glob": "dist/esm/bin.mjs"
+			},
+			"engines": {
+				"node": "20 || >=22"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/@nativescript/hook/node_modules/jackspeak": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.1.tgz",
+			"integrity": "sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==",
+			"dev": true,
+			"license": "BlueOak-1.0.0",
+			"dependencies": {
+				"@isaacs/cliui": "^8.0.2"
+			},
+			"engines": {
+				"node": "20 || >=22"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/@nativescript/hook/node_modules/lru-cache": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.1.0.tgz",
+			"integrity": "sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": "20 || >=22"
+			}
+		},
+		"node_modules/@nativescript/hook/node_modules/minimatch": {
+			"version": "10.0.3",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz",
+			"integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"@isaacs/brace-expansion": "^5.0.0"
+			},
+			"engines": {
+				"node": "20 || >=22"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/@nativescript/hook/node_modules/mkdirp": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+			"integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"mkdirp": "dist/cjs/src/bin.js"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/@nativescript/hook/node_modules/path-scurry": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz",
+			"integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==",
+			"dev": true,
+			"license": "BlueOak-1.0.0",
+			"dependencies": {
+				"lru-cache": "^11.0.0",
+				"minipass": "^7.1.2"
+			},
+			"engines": {
+				"node": "20 || >=22"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
 		"node_modules/@nativescript/nx": {
-			"version": "20.0.3",
-			"resolved": "https://registry.npmjs.org/@nativescript/nx/-/nx-20.0.3.tgz",
-			"integrity": "sha512-Wv2fVQEE4lZTdpo+OMLGrk3GK8YGjFi4+Ouw5j6xI7kIxjIJ1/ha2dJ1iBm+DMjUtm2WpUcRdALVXrd357zdDg==",
+			"version": "21.0.0",
+			"resolved": "https://registry.npmjs.org/@nativescript/nx/-/nx-21.0.0.tgz",
+			"integrity": "sha512-WbepbqT/atWtVvMumfFwMlbtT2Bfkvt0Q1HBDL2bZV2BgNHUNdbUdiMIczA1plzlIEb8zkV1UL8xVTvFAW+mOQ==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -4643,11 +4803,11 @@
 				"plist": "^3.1.0"
 			},
 			"peerDependencies": {
-				"@nx/devkit": "^20.0.0",
-				"@nx/eslint": "^20.0.0",
-				"@nx/js": "^20.0.0",
-				"@nx/workspace": "^20.0.0",
-				"nx": "^20.0.0"
+				"@nx/devkit": "^21.0.0",
+				"@nx/eslint": "^21.0.0",
+				"@nx/js": "^21.0.0",
+				"@nx/workspace": "^21.0.0",
+				"nx": "^21.0.0"
 			}
 		},
 		"node_modules/@nodelib/fs.scandir": {
@@ -5255,9 +5415,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@nx/devkit": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-20.3.0.tgz",
-			"integrity": "sha512-u9oRd2F33DLNWPbzpYGW7xuMEYUAOwO9DLP9nGYpxbZXy6Z4AdoKeqhN+KBTyg8+DyQGuKUSEXcWriDyLLgcHw==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-21.2.1.tgz",
+			"integrity": "sha512-sbc8l6qdc9GER5gUeh+IKecyKA+uUv0V/bf45nibUziUuQN2C1nh9bFJHzBeFeySonmEbF+I0aZ3aoafM5FVuQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5271,7 +5431,7 @@
 				"yargs-parser": "21.1.1"
 			},
 			"peerDependencies": {
-				"nx": ">= 19 <= 21"
+				"nx": "21.2.1"
 			}
 		},
 		"node_modules/@nx/devkit/node_modules/enquirer": {
@@ -5288,17 +5448,17 @@
 			}
 		},
 		"node_modules/@nx/eslint": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/eslint/-/eslint-20.3.0.tgz",
-			"integrity": "sha512-QhApF0HAcMm0tc7kXna4XuFUuO3oroWvGmvzGqBSa3GyuXbAz1VJ1RFWYkyQzjAsltaBcMUFCA+ORUM+PN1sWA==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/eslint/-/eslint-21.2.1.tgz",
+			"integrity": "sha512-70natRH26IAsMrHDM3/LIJn5IE/+Z4EZ6qlkzCBHvWNG88QE/F/94Xw+bTtLxXqEsADhRcBSfpzM6FNcRRwOvg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@nx/devkit": "20.3.0",
-				"@nx/js": "20.3.0",
+				"@nx/devkit": "21.2.1",
+				"@nx/js": "21.2.1",
 				"semver": "^7.5.3",
 				"tslib": "^2.3.0",
-				"typescript": "~5.6.2"
+				"typescript": "~5.8.2"
 			},
 			"peerDependencies": {
 				"@zkochan/js-yaml": "0.0.7",
@@ -5311,14 +5471,14 @@
 			}
 		},
 		"node_modules/@nx/eslint-plugin": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/eslint-plugin/-/eslint-plugin-20.3.0.tgz",
-			"integrity": "sha512-U9DvbR7quyfnWk8ZCJlwKbIInZ5gd4be93X5gii966vM81n3lbWLc7y4avU4r3732X2pnpFGJqBgP8ov8JE/fw==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/eslint-plugin/-/eslint-plugin-21.2.1.tgz",
+			"integrity": "sha512-8/PaYdK8ozEPSQ4SWNbvfiaEAZB82oP33SLj0hCoR3pVe1vEp5mBuLtYZzlMSqo1YLKc0SBDPqKpe22vsGHvHg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@nx/devkit": "20.3.0",
-				"@nx/js": "20.3.0",
+				"@nx/devkit": "21.2.1",
+				"@nx/js": "21.2.1",
 				"@typescript-eslint/type-utils": "^8.0.0",
 				"@typescript-eslint/utils": "^8.0.0",
 				"chalk": "^4.1.0",
@@ -5330,7 +5490,7 @@
 			},
 			"peerDependencies": {
 				"@typescript-eslint/parser": "^6.13.2 || ^7.0.0 || ^8.0.0",
-				"eslint-config-prettier": "^9.0.0"
+				"eslint-config-prettier": "^10.0.0"
 			},
 			"peerDependenciesMeta": {
 				"eslint-config-prettier": {
@@ -5415,109 +5575,33 @@
 			}
 		},
 		"node_modules/@nx/jest": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/jest/-/jest-20.3.0.tgz",
-			"integrity": "sha512-szkmlq8Zgx1J04yq34HfbC1jGrELVXcJTfo76SnFonL9crnbBsLS2mPrvCe431Zm9Xs1PYNvxZLeIbxf6bVXcQ==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/jest/-/jest-21.2.1.tgz",
+			"integrity": "sha512-REwI01V+oSpX9d3GDgf5M1Nqcy1Ug8aglwMQxmPouBL23olktDX6oV1sE4P4mU5UnPq9p/AIcChBYbUlxLo75A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@jest/reporters": "^29.4.1",
 				"@jest/test-result": "^29.4.1",
-				"@nx/devkit": "20.3.0",
-				"@nx/js": "20.3.0",
+				"@nx/devkit": "21.2.1",
+				"@nx/js": "21.2.1",
 				"@phenomnomnominal/tsquery": "~5.0.1",
-				"chalk": "^4.1.0",
 				"identity-obj-proxy": "3.0.0",
 				"jest-config": "^29.4.1",
 				"jest-resolve": "^29.4.1",
 				"jest-util": "^29.4.1",
 				"minimatch": "9.0.3",
+				"picocolors": "^1.1.0",
 				"resolve.exports": "2.0.3",
 				"semver": "^7.5.3",
 				"tslib": "^2.3.0",
 				"yargs-parser": "21.1.1"
 			}
 		},
-		"node_modules/@nx/jest/node_modules/ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"color-convert": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/@nx/jest/node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
-		},
-		"node_modules/@nx/jest/node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"color-name": "~1.1.4"
-			},
-			"engines": {
-				"node": ">=7.0.0"
-			}
-		},
-		"node_modules/@nx/jest/node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@nx/jest/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@nx/jest/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@nx/js": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/js/-/js-20.3.0.tgz",
-			"integrity": "sha512-hnO1jzJUvO7+bBsC2uaUElpX9gpMiSA3wdt34V8nnPcIBWtdMrjKX7yRFSwZKimeNauesiX0uorTJf+z28R2bg==",
+		"node_modules/@nx/js": {
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/js/-/js-21.2.1.tgz",
+			"integrity": "sha512-m0Dd9r0AgxCc/Gs0kxjjAqOriKelvCOOSTRUvldx2JRjifU2DCIw9kIrgkAlkRmRDehqk7CUan4Qkb0tJSrlvg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5528,11 +5612,11 @@
 				"@babel/preset-env": "^7.23.2",
 				"@babel/preset-typescript": "^7.22.5",
 				"@babel/runtime": "^7.22.6",
-				"@nx/devkit": "20.3.0",
-				"@nx/workspace": "20.3.0",
+				"@nx/devkit": "21.2.1",
+				"@nx/workspace": "21.2.1",
 				"@zkochan/js-yaml": "0.0.7",
 				"babel-plugin-const-enum": "^1.0.1",
-				"babel-plugin-macros": "^2.8.0",
+				"babel-plugin-macros": "^3.1.0",
 				"babel-plugin-transform-typescript-metadata": "^0.3.1",
 				"chalk": "^4.1.0",
 				"columnify": "^1.6.0",
@@ -5541,19 +5625,18 @@
 				"ignore": "^5.0.4",
 				"js-tokens": "^4.0.0",
 				"jsonc-parser": "3.2.0",
-				"minimatch": "9.0.3",
 				"npm-package-arg": "11.0.1",
 				"npm-run-path": "^4.0.1",
 				"ora": "5.3.0",
+				"picocolors": "^1.1.0",
+				"picomatch": "4.0.2",
 				"semver": "^7.5.3",
 				"source-map-support": "0.5.19",
-				"tinyglobby": "^0.2.10",
-				"ts-node": "10.9.1",
-				"tsconfig-paths": "^4.1.2",
+				"tinyglobby": "^0.2.12",
 				"tslib": "^2.3.0"
 			},
 			"peerDependencies": {
-				"verdaccio": "^5.0.4"
+				"verdaccio": "^6.0.5"
 			},
 			"peerDependenciesMeta": {
 				"verdaccio": {
@@ -5614,16 +5697,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/@nx/js/node_modules/diff": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"engines": {
-				"node": ">=0.3.1"
-			}
-		},
 		"node_modules/@nx/js/node_modules/enquirer": {
 			"version": "2.3.6",
 			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
@@ -5670,6 +5743,19 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/@nx/js/node_modules/picomatch": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+			"integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
 		"node_modules/@nx/js/node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -5683,68 +5769,26 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/@nx/js/node_modules/ts-node": {
-			"version": "10.9.1",
-			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
-			"integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@cspotcode/source-map-support": "^0.8.0",
-				"@tsconfig/node10": "^1.0.7",
-				"@tsconfig/node12": "^1.0.7",
-				"@tsconfig/node14": "^1.0.0",
-				"@tsconfig/node16": "^1.0.2",
-				"acorn": "^8.4.1",
-				"acorn-walk": "^8.1.1",
-				"arg": "^4.1.0",
-				"create-require": "^1.1.0",
-				"diff": "^4.0.1",
-				"make-error": "^1.1.1",
-				"v8-compile-cache-lib": "^3.0.1",
-				"yn": "3.1.1"
-			},
-			"bin": {
-				"ts-node": "dist/bin.js",
-				"ts-node-cwd": "dist/bin-cwd.js",
-				"ts-node-esm": "dist/bin-esm.js",
-				"ts-node-script": "dist/bin-script.js",
-				"ts-node-transpile-only": "dist/bin-transpile.js",
-				"ts-script": "dist/bin-script-deprecated.js"
-			},
-			"peerDependencies": {
-				"@swc/core": ">=1.2.50",
-				"@swc/wasm": ">=1.2.50",
-				"@types/node": "*",
-				"typescript": ">=2.7"
-			},
-			"peerDependenciesMeta": {
-				"@swc/core": {
-					"optional": true
-				},
-				"@swc/wasm": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/@nx/node": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/node/-/node-20.3.0.tgz",
-			"integrity": "sha512-6tHufkw92acIdcdLGARUJOTpjx7x4+Bu+rmM8rnugkZ4aGj62/IdI32rNBjSltYKcSo38HJyCSzmp0REdXsrbg==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/node/-/node-21.2.1.tgz",
+			"integrity": "sha512-O2trdvw5dfM9SUMD3Pn6Aio8GcxnLd6iTEYQKv56fpx5Ud54e4WmtEIrzGY6cxDAN5F/mwAGZd43N1Z9wmLwoQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@nx/devkit": "20.3.0",
-				"@nx/eslint": "20.3.0",
-				"@nx/jest": "20.3.0",
-				"@nx/js": "20.3.0",
+				"@nx/devkit": "21.2.1",
+				"@nx/eslint": "21.2.1",
+				"@nx/jest": "21.2.1",
+				"@nx/js": "21.2.1",
+				"kill-port": "^1.6.1",
+				"tcp-port-used": "^1.0.2",
 				"tslib": "^2.3.0"
 			}
 		},
 		"node_modules/@nx/nx-darwin-arm64": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-20.3.0.tgz",
-			"integrity": "sha512-9PqSe1Sh7qNqA4GL0cZH0t3S0EZzb2Xn14XY9au7yf0+eoxyag1oETjjULrxLeUmSoXW2hDxzNtoqKFE9zF07Q==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-21.2.1.tgz",
+			"integrity": "sha512-iP5N5TAe4k9j2p4xhEXU/a/6qEW6PWbRQeSSbCsFLuvf4UslP7wW6vuzteSW1r48Aras+5lGUOERtrlnKnuTew==",
 			"cpu": [
 				"arm64"
 			],
@@ -5753,15 +5797,12 @@
 			"optional": true,
 			"os": [
 				"darwin"
-			],
-			"engines": {
-				"node": ">= 10"
-			}
+			]
 		},
 		"node_modules/@nx/nx-darwin-x64": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-20.3.0.tgz",
-			"integrity": "sha512-gsGGhJVvi5QZVVTZie5sNMo1zOAU+A2edm6DGegObdFRLV41Ju/Yrm/gTaSp4yUtywd3UU4S/30C/nI2c55adA==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-21.2.1.tgz",
+			"integrity": "sha512-CFRBYwUvQIYG+DPoNF2wzjCFSNn0tfN9WlHDJWI41qZNZfc4kSY8zQYDLXNj4/Lp7XMBL+Sv70Dd9mDzfnP2Cg==",
 			"cpu": [
 				"x64"
 			],
@@ -5770,15 +5811,12 @@
 			"optional": true,
 			"os": [
 				"darwin"
-			],
-			"engines": {
-				"node": ">= 10"
-			}
+			]
 		},
 		"node_modules/@nx/nx-freebsd-x64": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-20.3.0.tgz",
-			"integrity": "sha512-DiymYZBBu0upbiskdfn9KRyoXdyvKohezJiV3j4VkeRE8KR2p04NgwRQviDFbeD1cjWrDy9wk8y+G5PabLlqAA==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-21.2.1.tgz",
+			"integrity": "sha512-r2J6CrPwibsvCjMYQ7OqdpSF6HW1lI/+HghMh/cAeTQiCC2ksVeXR/WX2QkFkBhyo1pAbQilbxLUQOYEl8qL3A==",
 			"cpu": [
 				"x64"
 			],
@@ -5787,15 +5825,12 @@
 			"optional": true,
 			"os": [
 				"freebsd"
-			],
-			"engines": {
-				"node": ">= 10"
-			}
+			]
 		},
 		"node_modules/@nx/nx-linux-arm-gnueabihf": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-20.3.0.tgz",
-			"integrity": "sha512-Aksx66e8jmt/4rGJ/5z34SWXbPcYr9Ht52UonEeuCdQdoEvAOs7yBUbllYOjIcUsfZikEyZgvqfiQslsggSJdQ==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-21.2.1.tgz",
+			"integrity": "sha512-h7G/OQ0iEiKmcvBKiWycwx3RS+C3X997iDMhQLlJEKno2boUKpEXuz4T1uMBLdGdc6r+XElsaEMJYKxpIy8Fvw==",
 			"cpu": [
 				"arm"
 			],
@@ -5804,15 +5839,12 @@
 			"optional": true,
 			"os": [
 				"linux"
-			],
-			"engines": {
-				"node": ">= 10"
-			}
+			]
 		},
 		"node_modules/@nx/nx-linux-arm64-gnu": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-20.3.0.tgz",
-			"integrity": "sha512-Y5wmYEwF1bl014Ps8QjagI911VbViQSFHSTVOCNSObdAzig9E5o6NOkoWe+doT1UZLrrInnlkrggQUsbtdKjOg==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-21.2.1.tgz",
+			"integrity": "sha512-Cc1MIZHZEkY60xWuCxoTRDCbdezSyDNnziH9OUnJrCTB09EvDjUv+x9wyOYyBCfcGeU1b1L1icGKw7cS/CZwVw==",
 			"cpu": [
 				"arm64"
 			],
@@ -5821,15 +5853,12 @@
 			"optional": true,
 			"os": [
 				"linux"
-			],
-			"engines": {
-				"node": ">= 10"
-			}
+			]
 		},
 		"node_modules/@nx/nx-linux-arm64-musl": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-20.3.0.tgz",
-			"integrity": "sha512-yGcIkmImyOMfPkQSYH2EVjPmFE0VkLcO71Bbkpr3RlJ1N/vjYxsGbdnqPiBb8Wshib/hmwpiMHf/yzQtKH0SQw==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-21.2.1.tgz",
+			"integrity": "sha512-L0c59PWMmU66tYQG4Ume8dCvUChVvxW1B0iAyb1vSEB4sLQgdCIn44uxwmb3+0qIeex2RJlFt7FyI+ey5AfUvQ==",
 			"cpu": [
 				"arm64"
 			],
@@ -5838,15 +5867,12 @@
 			"optional": true,
 			"os": [
 				"linux"
-			],
-			"engines": {
-				"node": ">= 10"
-			}
+			]
 		},
 		"node_modules/@nx/nx-linux-x64-gnu": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-20.3.0.tgz",
-			"integrity": "sha512-nkA2DLI+rpmiuiy7dyXP4l9s7dgHkQWDX7lG1XltiT41RzAReJF1h8qBE6XrsAYE1CtI76DRWVphnc93+iZr+A==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-21.2.1.tgz",
+			"integrity": "sha512-E72abpUPT41DmgOmteTbcuiyRW0lY+3i9lq0drOjr1LApUJs+/HTa3W6K1qAGwZ6vn0XDOdYyG5jhFGzNl1pOg==",
 			"cpu": [
 				"x64"
 			],
@@ -5855,15 +5881,12 @@
 			"optional": true,
 			"os": [
 				"linux"
-			],
-			"engines": {
-				"node": ">= 10"
-			}
+			]
 		},
 		"node_modules/@nx/nx-linux-x64-musl": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-20.3.0.tgz",
-			"integrity": "sha512-sPMtTt9iTrCmFEIp9Qv27UX9PeL1aqKck2dz2TAFbXKVtF6+djOdTcNnTYw45KIP6izcUcOXXAq4G0QSQE7CLg==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-21.2.1.tgz",
+			"integrity": "sha512-aBt7BP0tMRx/iRUkuJnLQykQA/YO2phC6moPNxx+DHfricjI77gWWal/FlKQsM7g/bAoXPQw0QSG/ifvrJnUUA==",
 			"cpu": [
 				"x64"
 			],
@@ -5872,15 +5895,12 @@
 			"optional": true,
 			"os": [
 				"linux"
-			],
-			"engines": {
-				"node": ">= 10"
-			}
+			]
 		},
 		"node_modules/@nx/nx-win32-arm64-msvc": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-20.3.0.tgz",
-			"integrity": "sha512-ppfNa/8OfpWA9o26Pz3vArN4ulAC+Hx70/ghPRCP7ed1Mb3Z6yR2Ry9KfBRImbqajvuAExM0TePKMGq9LCdXmg==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-21.2.1.tgz",
+			"integrity": "sha512-NTGSDk6i9L3OEreBmlCaCAYHLRjHuyk3rCbX+MzDWCbO9HCLTO/NtKdwsKUNhBWDpEz5pN4ryU05vRBmGXhySA==",
 			"cpu": [
 				"arm64"
 			],
@@ -5889,15 +5909,12 @@
 			"optional": true,
 			"os": [
 				"win32"
-			],
-			"engines": {
-				"node": ">= 10"
-			}
+			]
 		},
 		"node_modules/@nx/nx-win32-x64-msvc": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-20.3.0.tgz",
-			"integrity": "sha512-8FOejZ4emtLSVn3pYWs4PIc3n4//qMbwMDPVxmPE8us3ir91Qh0bzr5zRj7Q8sEdSgvneXRXqtBp2grY2KMJsw==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-21.2.1.tgz",
+			"integrity": "sha512-XO0KFzyM2IkBhsvevLJMw8JDSOeWjCEkdxm5q9PJoNAmAuq2fJmwXs/d/KyEr8lohxQzNxt4ZDfUiW9AcSiFOw==",
 			"cpu": [
 				"x64"
 			],
@@ -5906,43 +5923,42 @@
 			"optional": true,
 			"os": [
 				"win32"
-			],
-			"engines": {
-				"node": ">= 10"
-			}
+			]
 		},
 		"node_modules/@nx/plugin": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/plugin/-/plugin-20.3.0.tgz",
-			"integrity": "sha512-yElgViQVA3A3aihOFMZgH6+Kl+Hb2bvcDUFu5JRoBeBGqxIa4n/aItgYVE8gPXG0WBfG0zxtOpBJOKep5Hx+Rw==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/plugin/-/plugin-21.2.1.tgz",
+			"integrity": "sha512-H5zJ77DRCPn/T+XmkvJxUckWwZvtoKwbbJL794+0XvNsc+vNyCneq0RVTDDFjX38m0aEFPZeyC0AHWgigZgG0w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@nx/devkit": "20.3.0",
-				"@nx/eslint": "20.3.0",
-				"@nx/jest": "20.3.0",
-				"@nx/js": "20.3.0",
+				"@nx/devkit": "21.2.1",
+				"@nx/eslint": "21.2.1",
+				"@nx/jest": "21.2.1",
+				"@nx/js": "21.2.1",
 				"tslib": "^2.3.0"
 			}
 		},
 		"node_modules/@nx/vite": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/vite/-/vite-20.3.0.tgz",
-			"integrity": "sha512-vb4crrU6rCl03kiVu5mJ34PvSzTI72/DQJEi4cFQu4KAwQ6gVigVOf4kW+d3dYelrJ52/Fzb/CEY94ZzdKyBFA==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/vite/-/vite-21.2.1.tgz",
+			"integrity": "sha512-GwlYum+I/HaF438Losx0VjB1eNM+0ywPOXMzFAai7I1A/7CTm3w5MblTvQazhs9mZPNbVISTQn+YMhHohLNbVw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@nx/devkit": "20.3.0",
-				"@nx/js": "20.3.0",
+				"@nx/devkit": "21.2.1",
+				"@nx/js": "21.2.1",
 				"@phenomnomnominal/tsquery": "~5.0.1",
 				"@swc/helpers": "~0.5.0",
+				"ajv": "^8.0.0",
 				"enquirer": "~2.3.6",
-				"minimatch": "9.0.3",
+				"picomatch": "4.0.2",
+				"semver": "^7.6.3",
 				"tsconfig-paths": "^4.1.2"
 			},
 			"peerDependencies": {
-				"vite": "^5.0.0",
-				"vitest": "^1.3.1 || ^2.0.0"
+				"vite": "^5.0.0 || ^6.0.0",
+				"vitest": "^1.3.1 || ^2.0.0 || ^3.0.0"
 			}
 		},
 		"node_modules/@nx/vite/node_modules/enquirer": {
@@ -5958,15 +5974,28 @@
 				"node": ">=8.6"
 			}
 		},
+		"node_modules/@nx/vite/node_modules/picomatch": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+			"integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
 		"node_modules/@nx/web": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/web/-/web-20.3.0.tgz",
-			"integrity": "sha512-MKmXI9uAX+fdLY0GfF/3rH4EXrEjyLI6FSt3kUuF1/UzAUUUqww6owoM+9EaC1mRcCYDd0nwN7piblVz/wIVLw==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/web/-/web-21.2.1.tgz",
+			"integrity": "sha512-Ws5pDKZ2aAayr3GSJysHKJUTdG38Th6fhNQE+D7iLc2eqo3bQ9Q90OviT9hJcDBwUcDNi82My6lNQMEob/If5w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@nx/devkit": "20.3.0",
-				"@nx/js": "20.3.0",
+				"@nx/devkit": "21.2.1",
+				"@nx/js": "21.2.1",
 				"detect-port": "^1.5.1",
 				"http-server": "^14.1.0",
 				"picocolors": "^1.1.0",
@@ -5974,16 +6003,18 @@
 			}
 		},
 		"node_modules/@nx/workspace": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/@nx/workspace/-/workspace-20.3.0.tgz",
-			"integrity": "sha512-z8NSAo5SiLEMPuwasDvLdCCtaTGdINh1cSZMCom8HeLbT8F7risbR0IlHVqVrKj9FPKqrAIsH+4knVb4dHHCnQ==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/@nx/workspace/-/workspace-21.2.1.tgz",
+			"integrity": "sha512-tJMD4ELFZI1bbfcDz+k89MB1GumTVkwDVMicPBZwIlXTVqKQDgJmGUYIMF7VgU499WcX08LQAwVlIjvGX07GMw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@nx/devkit": "20.3.0",
+				"@nx/devkit": "21.2.1",
+				"@zkochan/js-yaml": "0.0.7",
 				"chalk": "^4.1.0",
 				"enquirer": "~2.3.6",
-				"nx": "20.3.0",
+				"nx": "21.2.1",
+				"picomatch": "4.0.2",
 				"tslib": "^2.3.0",
 				"yargs-parser": "21.1.1"
 			}
@@ -6064,6 +6095,19 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/@nx/workspace/node_modules/picomatch": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+			"integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
 		"node_modules/@nx/workspace/node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -6077,47 +6121,245 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/@parcel/watcher": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz",
-			"integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==",
+		"node_modules/@oxc-resolver/binding-darwin-arm64": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-5.3.0.tgz",
+			"integrity": "sha512-hXem5ZAguS7IlSiHg/LK0tEfLj4eUo+9U6DaFwwBEGd0L0VIF9LmuiHydRyOrdnnmi9iAAFMAn/wl2cUoiuruA==",
+			"cpu": [
+				"arm64"
+			],
 			"dev": true,
 			"license": "MIT",
 			"optional": true,
-			"dependencies": {
-				"detect-libc": "^1.0.3",
-				"is-glob": "^4.0.3",
-				"micromatch": "^4.0.5",
-				"node-addon-api": "^7.0.0"
-			},
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			},
-			"optionalDependencies": {
-				"@parcel/watcher-android-arm64": "2.4.1",
-				"@parcel/watcher-darwin-arm64": "2.4.1",
-				"@parcel/watcher-darwin-x64": "2.4.1",
-				"@parcel/watcher-freebsd-x64": "2.4.1",
-				"@parcel/watcher-linux-arm-glibc": "2.4.1",
-				"@parcel/watcher-linux-arm64-glibc": "2.4.1",
-				"@parcel/watcher-linux-arm64-musl": "2.4.1",
-				"@parcel/watcher-linux-x64-glibc": "2.4.1",
-				"@parcel/watcher-linux-x64-musl": "2.4.1",
-				"@parcel/watcher-win32-arm64": "2.4.1",
-				"@parcel/watcher-win32-ia32": "2.4.1",
-				"@parcel/watcher-win32-x64": "2.4.1"
-			}
+			"os": [
+				"darwin"
+			]
 		},
-		"node_modules/@parcel/watcher-android-arm64": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz",
-			"integrity": "sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==",
+		"node_modules/@oxc-resolver/binding-darwin-x64": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-5.3.0.tgz",
+			"integrity": "sha512-wgSwfsZkRbuYCIBLxeg1bYrtKnirAy+IJF0lwfz4z08clgdNBDbfGECJe/cd0csIZPpRcvPFe8317yf31sWhtA==",
 			"cpu": [
-				"arm64"
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			]
+		},
+		"node_modules/@oxc-resolver/binding-freebsd-x64": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-5.3.0.tgz",
+			"integrity": "sha512-kzeE2WHgcRMmWjB071RdwEV5Pwke4o0WWslCKoh8if1puvxIxfzu3o7g6P2+v77BP5qop4cri+uvLABSO0WZjg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"freebsd"
+			]
+		},
+		"node_modules/@oxc-resolver/binding-linux-arm-gnueabihf": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-5.3.0.tgz",
+			"integrity": "sha512-I8np34yZP/XfIkZNDbw3rweqVgfjmHYpNX3xnJZWg+f4mgO9/UNWBwetSaqXeDZqvIch/aHak+q4HVrQhQKCqg==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@oxc-resolver/binding-linux-arm64-gnu": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-5.3.0.tgz",
+			"integrity": "sha512-u2ndfeEUrW898eXM+qPxIN8TvTPjI90NDQBRgaxxkOfNw3xaotloeiZGz5+Yzlfxgvxr9DY9FdYkqhUhSnGhOw==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@oxc-resolver/binding-linux-arm64-musl": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-5.3.0.tgz",
+			"integrity": "sha512-TzbjmFkcnESGuVItQ2diKacX8vu5G0bH3BHmIlmY4OSRLyoAlrJFwGKAHmh6C9+Amfcjo2rx8vdm7swzmsGC6Q==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@oxc-resolver/binding-linux-riscv64-gnu": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-5.3.0.tgz",
+			"integrity": "sha512-NH3pjAqh8nuN29iRuRfTY42Vn03ctoR9VE8llfoUKUfhHUjFHYOXK5VSkhjj1usG8AeuesvqrQnLptCRQVTi/Q==",
+			"cpu": [
+				"riscv64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@oxc-resolver/binding-linux-s390x-gnu": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-5.3.0.tgz",
+			"integrity": "sha512-tuZtkK9sJYh2MC2uhol1M/8IMTB6ZQ5jmqP2+k5XNXnOb/im94Y5uV/u2lXwVyIuKHZZHtr+0d1HrOiNahoKpw==",
+			"cpu": [
+				"s390x"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@oxc-resolver/binding-linux-x64-gnu": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-5.3.0.tgz",
+			"integrity": "sha512-VzhPYmZCtoES/ThcPdGSmMop7JlwgqtSvlgtKCW15ByV2JKyl8kHAHnPSBfpIooXb0ehFnRdxFtL9qtAEWy01g==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@oxc-resolver/binding-linux-x64-musl": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-5.3.0.tgz",
+			"integrity": "sha512-Hi39cWzul24rGljN4Vf1lxjXzQdCrdxO5oCT7KJP4ndSlqIUODJnfnMAP1YhcnIRvNvk+5E6sZtnEmFUd/4d8Q==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@oxc-resolver/binding-wasm32-wasi": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-5.3.0.tgz",
+			"integrity": "sha512-ddujvHhP3chmHnSXRlkPVUeYj4/B7eLZwL4yUid+df3WCbVh6DgoT9RmllZn21AhxgKtMdekDdyVJYKFd8tl4A==",
+			"cpu": [
+				"wasm32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"@napi-rs/wasm-runtime": "^0.2.9"
+			},
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/@oxc-resolver/binding-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
+			"version": "0.2.11",
+			"resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.11.tgz",
+			"integrity": "sha512-9DPkXtvHydrcOsopiYpUgPHpmj0HWZKMUnL2dZqpvC42lsratuBG06V5ipyno0fUek5VlFsNQ+AcFATSrJXgMA==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"@emnapi/core": "^1.4.3",
+				"@emnapi/runtime": "^1.4.3",
+				"@tybys/wasm-util": "^0.9.0"
+			}
+		},
+		"node_modules/@oxc-resolver/binding-win32-arm64-msvc": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-5.3.0.tgz",
+			"integrity": "sha512-j1YYPLvUkMVNKmIFQZZJ7q6Do4cI3htUnyxNLwDSBVhSohvPIK2VG+IdtOAlWZGa7v+phEZsHfNbXVwB0oPYFQ==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			]
+		},
+		"node_modules/@oxc-resolver/binding-win32-x64-msvc": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-5.3.0.tgz",
+			"integrity": "sha512-LT9eOPPUqfZscQRd5mc08RBeDWOQf+dnOrKnanMallTGPe6g7+rcAlFTA8SWoJbcD45PV8yArFtCmSQSpzHZmg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			]
+		},
+		"node_modules/@parcel/watcher": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz",
+			"integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"detect-libc": "^1.0.3",
+				"is-glob": "^4.0.3",
+				"micromatch": "^4.0.5",
+				"node-addon-api": "^7.0.0"
+			},
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			},
+			"optionalDependencies": {
+				"@parcel/watcher-android-arm64": "2.4.1",
+				"@parcel/watcher-darwin-arm64": "2.4.1",
+				"@parcel/watcher-darwin-x64": "2.4.1",
+				"@parcel/watcher-freebsd-x64": "2.4.1",
+				"@parcel/watcher-linux-arm-glibc": "2.4.1",
+				"@parcel/watcher-linux-arm64-glibc": "2.4.1",
+				"@parcel/watcher-linux-arm64-musl": "2.4.1",
+				"@parcel/watcher-linux-x64-glibc": "2.4.1",
+				"@parcel/watcher-linux-x64-musl": "2.4.1",
+				"@parcel/watcher-win32-arm64": "2.4.1",
+				"@parcel/watcher-win32-ia32": "2.4.1",
+				"@parcel/watcher-win32-x64": "2.4.1"
+			}
+		},
+		"node_modules/@parcel/watcher-android-arm64": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz",
+			"integrity": "sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==",
+			"cpu": [
+				"arm64"
 			],
 			"dev": true,
 			"license": "MIT",
@@ -7124,9 +7366,9 @@
 			}
 		},
 		"node_modules/@rollup/rollup-android-arm-eabi": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.1.tgz",
-			"integrity": "sha512-ssKhA8RNltTZLpG6/QNkCSge+7mBQGUqJRisZ2MDQcEGaK93QESEgWK2iOpIDZ7k9zPVkG5AS3ksvD5ZWxmItw==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.1.tgz",
+			"integrity": "sha512-JAcBr1+fgqx20m7Fwe1DxPUl/hPkee6jA6Pl7n1v2EFiktAHenTaXl5aIFjUIEsfn9w3HE4gK1lEgNGMzBDs1w==",
 			"cpu": [
 				"arm"
 			],
@@ -7138,9 +7380,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-android-arm64": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.29.1.tgz",
-			"integrity": "sha512-CaRfrV0cd+NIIcVVN/jx+hVLN+VRqnuzLRmfmlzpOzB87ajixsN/+9L5xNmkaUUvEbI5BmIKS+XTwXsHEb65Ew==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.1.tgz",
+			"integrity": "sha512-RurZetXqTu4p+G0ChbnkwBuAtwAbIwJkycw1n6GvlGlBuS4u5qlr5opix8cBAYFJgaY05TWtM+LaoFggUmbZEQ==",
 			"cpu": [
 				"arm64"
 			],
@@ -7152,9 +7394,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-darwin-arm64": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.29.1.tgz",
-			"integrity": "sha512-2ORr7T31Y0Mnk6qNuwtyNmy14MunTAMx06VAPI6/Ju52W10zk1i7i5U3vlDRWjhOI5quBcrvhkCHyF76bI7kEw==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.1.tgz",
+			"integrity": "sha512-fM/xPesi7g2M7chk37LOnmnSTHLG/v2ggWqKj3CCA1rMA4mm5KVBT1fNoswbo1JhPuNNZrVwpTvlCVggv8A2zg==",
 			"cpu": [
 				"arm64"
 			],
@@ -7166,9 +7408,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-darwin-x64": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.29.1.tgz",
-			"integrity": "sha512-j/Ej1oanzPjmN0tirRd5K2/nncAhS9W6ICzgxV+9Y5ZsP0hiGhHJXZ2JQ53iSSjj8m6cRY6oB1GMzNn2EUt6Ng==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.1.tgz",
+			"integrity": "sha512-gDnWk57urJrkrHQ2WVx9TSVTH7lSlU7E3AFqiko+bgjlh78aJ88/3nycMax52VIVjIm3ObXnDL2H00e/xzoipw==",
 			"cpu": [
 				"x64"
 			],
@@ -7180,9 +7422,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-freebsd-arm64": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.29.1.tgz",
-			"integrity": "sha512-91C//G6Dm/cv724tpt7nTyP+JdN12iqeXGFM1SqnljCmi5yTXriH7B1r8AD9dAZByHpKAumqP1Qy2vVNIdLZqw==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.1.tgz",
+			"integrity": "sha512-wnFQmJ/zPThM5zEGcnDcCJeYJgtSLjh1d//WuHzhf6zT3Md1BvvhJnWoy+HECKu2bMxaIcfWiu3bJgx6z4g2XA==",
 			"cpu": [
 				"arm64"
 			],
@@ -7194,9 +7436,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-freebsd-x64": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.29.1.tgz",
-			"integrity": "sha512-hEioiEQ9Dec2nIRoeHUP6hr1PSkXzQaCUyqBDQ9I9ik4gCXQZjJMIVzoNLBRGet+hIUb3CISMh9KXuCcWVW/8w==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.1.tgz",
+			"integrity": "sha512-uBmIxoJ4493YATvU2c0upGz87f99e3wop7TJgOA/bXMFd2SvKCI7xkxY/5k50bv7J6dw1SXT4MQBQSLn8Bb/Uw==",
 			"cpu": [
 				"x64"
 			],
@@ -7208,9 +7450,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.29.1.tgz",
-			"integrity": "sha512-Py5vFd5HWYN9zxBv3WMrLAXY3yYJ6Q/aVERoeUFwiDGiMOWsMs7FokXihSOaT/PMWUty/Pj60XDQndK3eAfE6A==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.1.tgz",
+			"integrity": "sha512-n0edDmSHlXFhrlmTK7XBuwKlG5MbS7yleS1cQ9nn4kIeW+dJH+ExqNgQ0RrFRew8Y+0V/x6C5IjsHrJmiHtkxQ==",
 			"cpu": [
 				"arm"
 			],
@@ -7222,9 +7464,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm-musleabihf": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.29.1.tgz",
-			"integrity": "sha512-RiWpGgbayf7LUcuSNIbahr0ys2YnEERD4gYdISA06wa0i8RALrnzflh9Wxii7zQJEB2/Eh74dX4y/sHKLWp5uQ==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.1.tgz",
+			"integrity": "sha512-8WVUPy3FtAsKSpyk21kV52HCxB+me6YkbkFHATzC2Yd3yuqHwy2lbFL4alJOLXKljoRw08Zk8/xEj89cLQ/4Nw==",
 			"cpu": [
 				"arm"
 			],
@@ -7236,9 +7478,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm64-gnu": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.29.1.tgz",
-			"integrity": "sha512-Z80O+taYxTQITWMjm/YqNoe9d10OX6kDh8X5/rFCMuPqsKsSyDilvfg+vd3iXIqtfmp+cnfL1UrYirkaF8SBZA==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.1.tgz",
+			"integrity": "sha512-yuktAOaeOgorWDeFJggjuCkMGeITfqvPgkIXhDqsfKX8J3jGyxdDZgBV/2kj/2DyPaLiX6bPdjJDTu9RB8lUPQ==",
 			"cpu": [
 				"arm64"
 			],
@@ -7250,9 +7492,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm64-musl": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.29.1.tgz",
-			"integrity": "sha512-fOHRtF9gahwJk3QVp01a/GqS4hBEZCV1oKglVVq13kcK3NeVlS4BwIFzOHDbmKzt3i0OuHG4zfRP0YoG5OF/rA==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.1.tgz",
+			"integrity": "sha512-W+GBM4ifET1Plw8pdVaecwUgxmiH23CfAUj32u8knq0JPFyK4weRy6H7ooxYFD19YxBulL0Ktsflg5XS7+7u9g==",
 			"cpu": [
 				"arm64"
 			],
@@ -7264,9 +7506,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.29.1.tgz",
-			"integrity": "sha512-5a7q3tnlbcg0OodyxcAdrrCxFi0DgXJSoOuidFUzHZ2GixZXQs6Tc3CHmlvqKAmOs5eRde+JJxeIf9DonkmYkw==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.1.tgz",
+			"integrity": "sha512-1zqnUEMWp9WrGVuVak6jWTl4fEtrVKfZY7CvcBmUUpxAJ7WcSowPSAWIKa/0o5mBL/Ij50SIf9tuirGx63Ovew==",
 			"cpu": [
 				"loong64"
 			],
@@ -7278,9 +7520,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.29.1.tgz",
-			"integrity": "sha512-9b4Mg5Yfz6mRnlSPIdROcfw1BU22FQxmfjlp/CShWwO3LilKQuMISMTtAu/bxmmrE6A902W2cZJuzx8+gJ8e9w==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.1.tgz",
+			"integrity": "sha512-Rl3JKaRu0LHIx7ExBAAnf0JcOQetQffaw34T8vLlg9b1IhzcBgaIdnvEbbsZq9uZp3uAH+JkHd20Nwn0h9zPjA==",
 			"cpu": [
 				"ppc64"
 			],
@@ -7292,9 +7534,23 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-riscv64-gnu": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.29.1.tgz",
-			"integrity": "sha512-G5pn0NChlbRM8OJWpJFMX4/i8OEU538uiSv0P6roZcbpe/WfhEO+AT8SHVKfp8qhDQzaz7Q+1/ixMy7hBRidnQ==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.1.tgz",
+			"integrity": "sha512-j5akelU3snyL6K3N/iX7otLBIl347fGwmd95U5gS/7z6T4ftK288jKq3A5lcFKcx7wwzb5rgNvAg3ZbV4BqUSw==",
+			"cpu": [
+				"riscv64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-riscv64-musl": {
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.1.tgz",
+			"integrity": "sha512-ppn5llVGgrZw7yxbIm8TTvtj1EoPgYUAbfw0uDjIOzzoqlZlZrLJ/KuiE7uf5EpTpCTrNt1EdtzF0naMm0wGYg==",
 			"cpu": [
 				"riscv64"
 			],
@@ -7306,9 +7562,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-s390x-gnu": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.29.1.tgz",
-			"integrity": "sha512-WM9lIkNdkhVwiArmLxFXpWndFGuOka4oJOZh8EP3Vb8q5lzdSCBuhjavJsw68Q9AKDGeOOIHYzYm4ZFvmWez5g==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.1.tgz",
+			"integrity": "sha512-Hu6hEdix0oxtUma99jSP7xbvjkUM/ycke/AQQ4EC5g7jNRLLIwjcNwaUy95ZKBJJwg1ZowsclNnjYqzN4zwkAw==",
 			"cpu": [
 				"s390x"
 			],
@@ -7320,9 +7576,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-x64-gnu": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.29.1.tgz",
-			"integrity": "sha512-87xYCwb0cPGZFoGiErT1eDcssByaLX4fc0z2nRM6eMtV9njAfEE6OW3UniAoDhX4Iq5xQVpE6qO9aJbCFumKYQ==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.1.tgz",
+			"integrity": "sha512-EtnsrmZGomz9WxK1bR5079zee3+7a+AdFlghyd6VbAjgRJDbTANJ9dcPIPAi76uG05micpEL+gPGmAKYTschQw==",
 			"cpu": [
 				"x64"
 			],
@@ -7334,9 +7590,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-x64-musl": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.29.1.tgz",
-			"integrity": "sha512-xufkSNppNOdVRCEC4WKvlR1FBDyqCSCpQeMMgv9ZyXqqtKBfkw1yfGMTUTs9Qsl6WQbJnsGboWCp7pJGkeMhKA==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.1.tgz",
+			"integrity": "sha512-iAS4p+J1az6Usn0f8xhgL4PaU878KEtutP4hqw52I4IO6AGoyOkHCxcc4bqufv1tQLdDWFx8lR9YlwxKuv3/3g==",
 			"cpu": [
 				"x64"
 			],
@@ -7348,9 +7604,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-win32-arm64-msvc": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.29.1.tgz",
-			"integrity": "sha512-F2OiJ42m77lSkizZQLuC+jiZ2cgueWQL5YC9tjo3AgaEw+KJmVxHGSyQfDUoYR9cci0lAywv2Clmckzulcq6ig==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.1.tgz",
+			"integrity": "sha512-NtSJVKcXwcqozOl+FwI41OH3OApDyLk3kqTJgx8+gp6On9ZEt5mYhIsKNPGuaZr3p9T6NWPKGU/03Vw4CNU9qg==",
 			"cpu": [
 				"arm64"
 			],
@@ -7362,9 +7618,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-win32-ia32-msvc": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.29.1.tgz",
-			"integrity": "sha512-rYRe5S0FcjlOBZQHgbTKNrqxCBUmgDJem/VQTCcTnA2KCabYSWQDrytOzX7avb79cAAweNmMUb/Zw18RNd4mng==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.1.tgz",
+			"integrity": "sha512-JYA3qvCOLXSsnTR3oiyGws1Dm0YTuxAAeaYGVlGpUsHqloPcFjPg+X0Fj2qODGLNwQOAcCiQmHub/V007kiH5A==",
 			"cpu": [
 				"ia32"
 			],
@@ -7376,9 +7632,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-win32-x64-msvc": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.1.tgz",
-			"integrity": "sha512-+10CMg9vt1MoHj6x1pxyjPSMjHTIlqs8/tBztXvPAx24SKs9jwVnKqHJumlH/IzhaPUaj3T6T6wfZr8okdXaIg==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.1.tgz",
+			"integrity": "sha512-J8o22LuF0kTe7m+8PvW9wk3/bRq5+mRo5Dqo6+vXb7otCm3TPhYOJqOaQtGU9YMWQSL3krMnoOxMr0+9E6F3Ug==",
 			"cpu": [
 				"x64"
 			],
@@ -7390,31 +7646,51 @@
 			]
 		},
 		"node_modules/@shikijs/engine-oniguruma": {
-			"version": "1.24.4",
-			"resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.24.4.tgz",
-			"integrity": "sha512-Do2ry6flp2HWdvpj2XOwwa0ljZBRy15HKZITzPcNIBOGSeprnA8gOooA/bLsSPuy8aJBa+Q/r34dMmC3KNL/zw==",
+			"version": "3.7.0",
+			"resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.7.0.tgz",
+			"integrity": "sha512-5BxcD6LjVWsGu4xyaBC5bu8LdNgPCVBnAkWTtOCs/CZxcB22L8rcoWfv7Hh/3WooVjBZmFtyxhgvkQFedPGnFw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@shikijs/types": "3.7.0",
+				"@shikijs/vscode-textmate": "^10.0.2"
+			}
+		},
+		"node_modules/@shikijs/langs": {
+			"version": "3.7.0",
+			"resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.7.0.tgz",
+			"integrity": "sha512-1zYtdfXLr9xDKLTGy5kb7O0zDQsxXiIsw1iIBcNOO8Yi5/Y1qDbJ+0VsFoqTlzdmneO8Ij35g7QKF8kcLyznCQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@shikijs/types": "3.7.0"
+			}
+		},
+		"node_modules/@shikijs/themes": {
+			"version": "3.7.0",
+			"resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.7.0.tgz",
+			"integrity": "sha512-VJx8497iZPy5zLiiCTSIaOChIcKQwR0FebwE9S3rcN0+J/GTWwQ1v/bqhTbpbY3zybPKeO8wdammqkpXc4NVjQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@shikijs/types": "1.24.4",
-				"@shikijs/vscode-textmate": "^9.3.1"
+				"@shikijs/types": "3.7.0"
 			}
 		},
 		"node_modules/@shikijs/types": {
-			"version": "1.24.4",
-			"resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.24.4.tgz",
-			"integrity": "sha512-0r0XU7Eaow0PuDxuWC1bVqmWCgm3XqizIaT7SM42K03vc69LGooT0U8ccSR44xP/hGlNx4FKhtYpV+BU6aaKAA==",
+			"version": "3.7.0",
+			"resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.7.0.tgz",
+			"integrity": "sha512-MGaLeaRlSWpnP0XSAum3kP3a8vtcTsITqoEPYdt3lQG3YCdQH4DnEhodkYcNMcU0uW0RffhoD1O3e0vG5eSBBg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@shikijs/vscode-textmate": "^9.3.1",
+				"@shikijs/vscode-textmate": "^10.0.2",
 				"@types/hast": "^3.0.4"
 			}
 		},
 		"node_modules/@shikijs/vscode-textmate": {
-			"version": "9.3.1",
-			"resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-9.3.1.tgz",
-			"integrity": "sha512-79QfK1393x9Ho60QFyLti+QfdJzRQCVLFb97kOIV7Eo9vQU/roINgk7m24uv0a7AUvN//RDH36FLjjK48v0s9g==",
+			"version": "10.0.2",
+			"resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz",
+			"integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7567,18 +7843,19 @@
 			}
 		},
 		"node_modules/@swc-node/register": {
-			"version": "1.9.2",
-			"resolved": "https://registry.npmjs.org/@swc-node/register/-/register-1.9.2.tgz",
-			"integrity": "sha512-BBjg0QNuEEmJSoU/++JOXhrjWdu3PTyYeJWsvchsI0Aqtj8ICkz/DqlwtXbmZVZ5vuDPpTfFlwDBZe81zgShMA==",
+			"version": "1.10.10",
+			"resolved": "https://registry.npmjs.org/@swc-node/register/-/register-1.10.10.tgz",
+			"integrity": "sha512-jYWaI2WNEKz8KZL3sExd2KVL1JMma1/J7z+9iTpv0+fRN7LGMF8VTGGuHI2bug/ztpdZU1G44FG/Kk6ElXL9CQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@swc-node/core": "^1.13.1",
-				"@swc-node/sourcemap-support": "^0.5.0",
+				"@swc-node/core": "^1.13.3",
+				"@swc-node/sourcemap-support": "^0.5.1",
 				"colorette": "^2.0.20",
-				"debug": "^4.3.4",
+				"debug": "^4.3.5",
+				"oxc-resolver": "^5.0.0",
 				"pirates": "^4.0.6",
-				"tslib": "^2.6.2"
+				"tslib": "^2.6.3"
 			},
 			"funding": {
 				"type": "github",
@@ -7622,15 +7899,15 @@
 			}
 		},
 		"node_modules/@swc/core": {
-			"version": "1.5.29",
-			"resolved": "https://registry.npmjs.org/@swc/core/-/core-1.5.29.tgz",
-			"integrity": "sha512-nvTtHJI43DUSOAf3h9XsqYg8YXKc0/N4il9y4j0xAkO0ekgDNo+3+jbw6MInawjKJF9uulyr+f5bAutTsOKVlw==",
+			"version": "1.12.7",
+			"resolved": "https://registry.npmjs.org/@swc/core/-/core-1.12.7.tgz",
+			"integrity": "sha512-bcpllEihyUSnqp0UtXTvXc19CT4wp3tGWLENhWnjr4B5iEOkzqMu+xHGz1FI5IBatjfqOQb29tgIfv6IL05QaA==",
 			"dev": true,
 			"hasInstallScript": true,
 			"license": "Apache-2.0",
 			"dependencies": {
 				"@swc/counter": "^0.1.3",
-				"@swc/types": "^0.1.8"
+				"@swc/types": "^0.1.23"
 			},
 			"engines": {
 				"node": ">=10"
@@ -7640,19 +7917,19 @@
 				"url": "https://opencollective.com/swc"
 			},
 			"optionalDependencies": {
-				"@swc/core-darwin-arm64": "1.5.29",
-				"@swc/core-darwin-x64": "1.5.29",
-				"@swc/core-linux-arm-gnueabihf": "1.5.29",
-				"@swc/core-linux-arm64-gnu": "1.5.29",
-				"@swc/core-linux-arm64-musl": "1.5.29",
-				"@swc/core-linux-x64-gnu": "1.5.29",
-				"@swc/core-linux-x64-musl": "1.5.29",
-				"@swc/core-win32-arm64-msvc": "1.5.29",
-				"@swc/core-win32-ia32-msvc": "1.5.29",
-				"@swc/core-win32-x64-msvc": "1.5.29"
+				"@swc/core-darwin-arm64": "1.12.7",
+				"@swc/core-darwin-x64": "1.12.7",
+				"@swc/core-linux-arm-gnueabihf": "1.12.7",
+				"@swc/core-linux-arm64-gnu": "1.12.7",
+				"@swc/core-linux-arm64-musl": "1.12.7",
+				"@swc/core-linux-x64-gnu": "1.12.7",
+				"@swc/core-linux-x64-musl": "1.12.7",
+				"@swc/core-win32-arm64-msvc": "1.12.7",
+				"@swc/core-win32-ia32-msvc": "1.12.7",
+				"@swc/core-win32-x64-msvc": "1.12.7"
 			},
 			"peerDependencies": {
-				"@swc/helpers": "*"
+				"@swc/helpers": ">=0.5.17"
 			},
 			"peerDependenciesMeta": {
 				"@swc/helpers": {
@@ -7661,9 +7938,9 @@
 			}
 		},
 		"node_modules/@swc/core-darwin-arm64": {
-			"version": "1.5.29",
-			"resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.5.29.tgz",
-			"integrity": "sha512-6F/sSxpHaq3nzg2ADv9FHLi4Fu2A8w8vP8Ich8gIl16D2htStlwnaPmCLjRswO+cFkzgVqy/l01gzNGWd4DFqA==",
+			"version": "1.12.7",
+			"resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.12.7.tgz",
+			"integrity": "sha512-w6BBT0hBRS56yS+LbReVym0h+iB7/PpCddqrn1ha94ra4rZ4R/A91A/rkv+LnQlPqU/+fhqdlXtCJU9mrhCBtA==",
 			"cpu": [
 				"arm64"
 			],
@@ -7678,9 +7955,9 @@
 			}
 		},
 		"node_modules/@swc/core-darwin-x64": {
-			"version": "1.5.29",
-			"resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.5.29.tgz",
-			"integrity": "sha512-rF/rXkvUOTdTIfoYbmszbSUGsCyvqACqy1VeP3nXONS+LxFl4bRmRcUTRrblL7IE5RTMCKUuPbqbQSE2hK7bqg==",
+			"version": "1.12.7",
+			"resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.12.7.tgz",
+			"integrity": "sha512-jN6LhFfGOpm4DY2mXPgwH4aa9GLOwublwMVFFZ/bGnHYYCRitLZs9+JWBbyWs7MyGcA246Ew+EREx36KVEAxjA==",
 			"cpu": [
 				"x64"
 			],
@@ -7695,9 +7972,9 @@
 			}
 		},
 		"node_modules/@swc/core-linux-arm-gnueabihf": {
-			"version": "1.5.29",
-			"resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.5.29.tgz",
-			"integrity": "sha512-2OAPL8iWBsmmwkjGXqvuUhbmmoLxS1xNXiMq87EsnCNMAKohGc7wJkdAOUL6J/YFpean/vwMWg64rJD4pycBeg==",
+			"version": "1.12.7",
+			"resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.12.7.tgz",
+			"integrity": "sha512-rHn8XXi7G2StEtZRAeJ6c7nhJPDnqsHXmeNrAaYwk8Tvpa6ZYG2nT9E1OQNXj1/dfbSFTjdiA8M8ZvGYBlpBoA==",
 			"cpu": [
 				"arm"
 			],
@@ -7712,9 +7989,9 @@
 			}
 		},
 		"node_modules/@swc/core-linux-arm64-gnu": {
-			"version": "1.5.29",
-			"resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.5.29.tgz",
-			"integrity": "sha512-eH/Q9+8O5qhSxMestZnhuS1xqQMr6M7SolZYxiXJqxArXYILLCF+nq2R9SxuMl0CfjHSpb6+hHPk/HXy54eIRA==",
+			"version": "1.12.7",
+			"resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.12.7.tgz",
+			"integrity": "sha512-N15hKizSSh+hkZ2x3TDVrxq0TDcbvDbkQJi2ZrLb9fK+NdFUV/x+XF16ZDPlbxtrGXl1CT7VD439SNaMN9F7qw==",
 			"cpu": [
 				"arm64"
 			],
@@ -7729,9 +8006,9 @@
 			}
 		},
 		"node_modules/@swc/core-linux-arm64-musl": {
-			"version": "1.5.29",
-			"resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.5.29.tgz",
-			"integrity": "sha512-TERh2OICAJz+SdDIK9+0GyTUwF6r4xDlFmpoiHKHrrD/Hh3u+6Zue0d7jQ/he/i80GDn4tJQkHlZys+RZL5UZg==",
+			"version": "1.12.7",
+			"resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.12.7.tgz",
+			"integrity": "sha512-jxyINtBezpxd3eIUDiDXv7UQ87YWlPsM9KumOwJk09FkFSO4oYxV2RT+Wu+Nt5tVWue4N0MdXT/p7SQsDEk4YA==",
 			"cpu": [
 				"arm64"
 			],
@@ -7746,9 +8023,9 @@
 			}
 		},
 		"node_modules/@swc/core-linux-x64-gnu": {
-			"version": "1.5.29",
-			"resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.5.29.tgz",
-			"integrity": "sha512-WMDPqU7Ji9dJpA+Llek2p9t7pcy7Bob8ggPUvgsIlv3R/eesF9DIzSbrgl6j3EAEPB9LFdSafsgf6kT/qnvqFg==",
+			"version": "1.12.7",
+			"resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.12.7.tgz",
+			"integrity": "sha512-PR4tPVwU1BQBfFDk2XfzXxsEIjF3x/bOV1BzZpYvrlkU0TKUDbR4t2wzvsYwD/coW7/yoQmlL70/qnuPtTp1Zw==",
 			"cpu": [
 				"x64"
 			],
@@ -7763,9 +8040,9 @@
 			}
 		},
 		"node_modules/@swc/core-linux-x64-musl": {
-			"version": "1.5.29",
-			"resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.5.29.tgz",
-			"integrity": "sha512-DO14glwpdKY4POSN0201OnGg1+ziaSVr6/RFzuSLggshwXeeyVORiHv3baj7NENhJhWhUy3NZlDsXLnRFkmhHQ==",
+			"version": "1.12.7",
+			"resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.12.7.tgz",
+			"integrity": "sha512-zy7JWfQtQItgMfUjSbbcS3DZqQUn2d9VuV0LSGpJxtTXwgzhRpF1S2Sj7cU9hGpbM27Y8RJ4DeFb3qbAufjbrw==",
 			"cpu": [
 				"x64"
 			],
@@ -7780,9 +8057,9 @@
 			}
 		},
 		"node_modules/@swc/core-win32-arm64-msvc": {
-			"version": "1.5.29",
-			"resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.5.29.tgz",
-			"integrity": "sha512-V3Y1+a1zG1zpYXUMqPIHEMEOd+rHoVnIpO/KTyFwAmKVu8v+/xPEVx/AGoYE67x4vDAAvPQrKI3Aokilqa5yVg==",
+			"version": "1.12.7",
+			"resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.12.7.tgz",
+			"integrity": "sha512-52PeF0tyX04ZFD8nibNhy/GjMFOZWTEWPmIB3wpD1vIJ1po+smtBnEdRRll5WIXITKoiND8AeHlBNBPqcsdcwA==",
 			"cpu": [
 				"arm64"
 			],
@@ -7797,9 +8074,9 @@
 			}
 		},
 		"node_modules/@swc/core-win32-ia32-msvc": {
-			"version": "1.5.29",
-			"resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.5.29.tgz",
-			"integrity": "sha512-OrM6yfXw4wXhnVFosOJzarw0Fdz5Y0okgHfn9oFbTPJhoqxV5Rdmd6kXxWu2RiVKs6kGSJFZXHDeUq2w5rTIMg==",
+			"version": "1.12.7",
+			"resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.12.7.tgz",
+			"integrity": "sha512-WzQwkNMuhB1qQShT9uUgz/mX2j7NIEPExEtzvGsBT7TlZ9j1kGZ8NJcZH/fwOFcSJL4W7DnkL7nAhx6DBlSPaA==",
 			"cpu": [
 				"ia32"
 			],
@@ -7814,9 +8091,9 @@
 			}
 		},
 		"node_modules/@swc/core-win32-x64-msvc": {
-			"version": "1.5.29",
-			"resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.5.29.tgz",
-			"integrity": "sha512-eD/gnxqKyZQQR0hR7TMkIlJ+nCF9dzYmVVNbYZWuA1Xy94aBPUsEk3Uw3oG7q6R3ErrEUPP0FNf2ztEnv+I+dw==",
+			"version": "1.12.7",
+			"resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.12.7.tgz",
+			"integrity": "sha512-R52ivBi2lgjl+Bd3XCPum0YfgbZq/W1AUExITysddP9ErsNSwnreYyNB3exEijiazWGcqHEas2ChiuMOP7NYrA==",
 			"cpu": [
 				"x64"
 			],
@@ -7838,9 +8115,9 @@
 			"license": "Apache-2.0"
 		},
 		"node_modules/@swc/helpers": {
-			"version": "0.5.15",
-			"resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.15.tgz",
-			"integrity": "sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==",
+			"version": "0.5.17",
+			"resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.17.tgz",
+			"integrity": "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -7848,9 +8125,9 @@
 			}
 		},
 		"node_modules/@swc/types": {
-			"version": "0.1.17",
-			"resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.17.tgz",
-			"integrity": "sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==",
+			"version": "0.1.23",
+			"resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.23.tgz",
+			"integrity": "sha512-u1iIVZV9Q0jxY+yM2vw/hZGDNudsN85bBpTqzAQ9rzkxW9D+e3aEM4Han+ow518gSewkXgjmEK0BD79ZcNVgPw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -8055,9 +8332,9 @@
 			}
 		},
 		"node_modules/@types/estree": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-			"integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+			"integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -8236,21 +8513,21 @@
 			"license": "MIT"
 		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
-			"version": "8.12.2",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.12.2.tgz",
-			"integrity": "sha512-gQxbxM8mcxBwaEmWdtLCIGLfixBMHhQjBqR8sVWNTPpcj45WlYL2IObS/DNMLH1DBP0n8qz+aiiLTGfopPEebw==",
+			"version": "8.35.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.0.tgz",
+			"integrity": "sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/regexpp": "^4.10.0",
-				"@typescript-eslint/scope-manager": "8.12.2",
-				"@typescript-eslint/type-utils": "8.12.2",
-				"@typescript-eslint/utils": "8.12.2",
-				"@typescript-eslint/visitor-keys": "8.12.2",
+				"@typescript-eslint/scope-manager": "8.35.0",
+				"@typescript-eslint/type-utils": "8.35.0",
+				"@typescript-eslint/utils": "8.35.0",
+				"@typescript-eslint/visitor-keys": "8.35.0",
 				"graphemer": "^1.4.0",
-				"ignore": "^5.3.1",
+				"ignore": "^7.0.0",
 				"natural-compare": "^1.4.0",
-				"ts-api-utils": "^1.3.0"
+				"ts-api-utils": "^2.1.0"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -8260,26 +8537,32 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			},
 			"peerDependencies": {
-				"@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
-				"eslint": "^8.57.0 || ^9.0.0"
-			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
+				"@typescript-eslint/parser": "^8.35.0",
+				"eslint": "^8.57.0 || ^9.0.0",
+				"typescript": ">=4.8.4 <5.9.0"
+			}
+		},
+		"node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+			"version": "7.0.5",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+			"integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 4"
 			}
 		},
 		"node_modules/@typescript-eslint/parser": {
-			"version": "8.12.2",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.12.2.tgz",
-			"integrity": "sha512-MrvlXNfGPLH3Z+r7Tk+Z5moZAc0dzdVjTgUgwsdGweH7lydysQsnSww3nAmsq8blFuRD5VRlAr9YdEFw3e6PBw==",
+			"version": "8.35.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.0.tgz",
+			"integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==",
 			"dev": true,
-			"license": "BSD-2-Clause",
+			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/scope-manager": "8.12.2",
-				"@typescript-eslint/types": "8.12.2",
-				"@typescript-eslint/typescript-estree": "8.12.2",
-				"@typescript-eslint/visitor-keys": "8.12.2",
+				"@typescript-eslint/scope-manager": "8.35.0",
+				"@typescript-eslint/types": "8.35.0",
+				"@typescript-eslint/typescript-estree": "8.35.0",
+				"@typescript-eslint/visitor-keys": "8.35.0",
 				"debug": "^4.3.4"
 			},
 			"engines": {
@@ -8290,43 +8573,78 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			},
 			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0"
+				"eslint": "^8.57.0 || ^9.0.0",
+				"typescript": ">=4.8.4 <5.9.0"
+			}
+		},
+		"node_modules/@typescript-eslint/project-service": {
+			"version": "8.35.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
+			"integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@typescript-eslint/tsconfig-utils": "^8.35.0",
+				"@typescript-eslint/types": "^8.35.0",
+				"debug": "^4.3.4"
 			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"typescript": ">=4.8.4 <5.9.0"
 			}
 		},
 		"node_modules/@typescript-eslint/scope-manager": {
-			"version": "8.12.2",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.12.2.tgz",
-			"integrity": "sha512-gPLpLtrj9aMHOvxJkSbDBmbRuYdtiEbnvO25bCMza3DhMjTQw0u7Y1M+YR5JPbMsXXnSPuCf5hfq0nEkQDL/JQ==",
+			"version": "8.35.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
+			"integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.12.2",
-				"@typescript-eslint/visitor-keys": "8.12.2"
+				"@typescript-eslint/types": "8.35.0",
+				"@typescript-eslint/visitor-keys": "8.35.0"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/tsconfig-utils": {
+			"version": "8.35.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
+			"integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
+			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"typescript": ">=4.8.4 <5.9.0"
 			}
 		},
 		"node_modules/@typescript-eslint/type-utils": {
-			"version": "8.12.2",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.12.2.tgz",
-			"integrity": "sha512-bwuU4TAogPI+1q/IJSKuD4shBLc/d2vGcRT588q+jzayQyjVK2X6v/fbR4InY2U2sgf8MEvVCqEWUzYzgBNcGQ==",
+			"version": "8.35.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.0.tgz",
+			"integrity": "sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/typescript-estree": "8.12.2",
-				"@typescript-eslint/utils": "8.12.2",
+				"@typescript-eslint/typescript-estree": "8.35.0",
+				"@typescript-eslint/utils": "8.35.0",
 				"debug": "^4.3.4",
-				"ts-api-utils": "^1.3.0"
+				"ts-api-utils": "^2.1.0"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -8335,16 +8653,15 @@
 				"type": "opencollective",
 				"url": "https://opencollective.com/typescript-eslint"
 			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
+			"peerDependencies": {
+				"eslint": "^8.57.0 || ^9.0.0",
+				"typescript": ">=4.8.4 <5.9.0"
 			}
 		},
 		"node_modules/@typescript-eslint/types": {
-			"version": "8.12.2",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.12.2.tgz",
-			"integrity": "sha512-VwDwMF1SZ7wPBUZwmMdnDJ6sIFk4K4s+ALKLP6aIQsISkPv8jhiw65sAK6SuWODN/ix+m+HgbYDkH+zLjrzvOA==",
+			"version": "8.35.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
+			"integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -8356,20 +8673,22 @@
 			}
 		},
 		"node_modules/@typescript-eslint/typescript-estree": {
-			"version": "8.12.2",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.12.2.tgz",
-			"integrity": "sha512-mME5MDwGe30Pq9zKPvyduyU86PH7aixwqYR2grTglAdB+AN8xXQ1vFGpYaUSJ5o5P/5znsSBeNcs5g5/2aQwow==",
+			"version": "8.35.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
+			"integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
 			"dev": true,
-			"license": "BSD-2-Clause",
+			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.12.2",
-				"@typescript-eslint/visitor-keys": "8.12.2",
+				"@typescript-eslint/project-service": "8.35.0",
+				"@typescript-eslint/tsconfig-utils": "8.35.0",
+				"@typescript-eslint/types": "8.35.0",
+				"@typescript-eslint/visitor-keys": "8.35.0",
 				"debug": "^4.3.4",
 				"fast-glob": "^3.3.2",
 				"is-glob": "^4.0.3",
 				"minimatch": "^9.0.4",
 				"semver": "^7.6.0",
-				"ts-api-utils": "^1.3.0"
+				"ts-api-utils": "^2.1.0"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -8378,10 +8697,8 @@
 				"type": "opencollective",
 				"url": "https://opencollective.com/typescript-eslint"
 			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
+			"peerDependencies": {
+				"typescript": ">=4.8.4 <5.9.0"
 			}
 		},
 		"node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
@@ -8401,16 +8718,16 @@
 			}
 		},
 		"node_modules/@typescript-eslint/utils": {
-			"version": "8.12.2",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.12.2.tgz",
-			"integrity": "sha512-UTTuDIX3fkfAz6iSVa5rTuSfWIYZ6ATtEocQ/umkRSyC9O919lbZ8dcH7mysshrCdrAM03skJOEYaBugxN+M6A==",
+			"version": "8.35.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.0.tgz",
+			"integrity": "sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@eslint-community/eslint-utils": "^4.4.0",
-				"@typescript-eslint/scope-manager": "8.12.2",
-				"@typescript-eslint/types": "8.12.2",
-				"@typescript-eslint/typescript-estree": "8.12.2"
+				"@eslint-community/eslint-utils": "^4.7.0",
+				"@typescript-eslint/scope-manager": "8.35.0",
+				"@typescript-eslint/types": "8.35.0",
+				"@typescript-eslint/typescript-estree": "8.35.0"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -8420,18 +8737,19 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			},
 			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0"
+				"eslint": "^8.57.0 || ^9.0.0",
+				"typescript": ">=4.8.4 <5.9.0"
 			}
 		},
 		"node_modules/@typescript-eslint/visitor-keys": {
-			"version": "8.12.2",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.12.2.tgz",
-			"integrity": "sha512-PChz8UaKQAVNHghsHcPyx1OMHoFRUEA7rJSK/mDhdq85bk+PLsUHUBqTQTFt18VJZbmxBovM65fezlheQRsSDA==",
+			"version": "8.35.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
+			"integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.12.2",
-				"eslint-visitor-keys": "^3.4.3"
+				"@typescript-eslint/types": "8.35.0",
+				"eslint-visitor-keys": "^4.2.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -8441,6 +8759,19 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			}
 		},
+		"node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+			"integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
 		"node_modules/@ungap/structured-clone": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
@@ -8449,31 +8780,57 @@
 			"license": "ISC"
 		},
 		"node_modules/@vitest/coverage-v8": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.6.0.tgz",
-			"integrity": "sha512-KvapcbMY/8GYIG0rlwwOKCVNRc0OL20rrhFkg/CHNzncV03TE2XWvO5w9uZYoxNiMEBacAJt3unSOiZ7svePew==",
+			"version": "2.1.9",
+			"resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.1.9.tgz",
+			"integrity": "sha512-Z2cOr0ksM00MpEfyVE8KXIYPEcBFxdbLSs56L8PO0QQMxt/6bDj45uQfxoc96v05KW3clk7vvgP0qfDit9DmfQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@ampproject/remapping": "^2.2.1",
+				"@ampproject/remapping": "^2.3.0",
 				"@bcoe/v8-coverage": "^0.2.3",
-				"debug": "^4.3.4",
+				"debug": "^4.3.7",
 				"istanbul-lib-coverage": "^3.2.2",
 				"istanbul-lib-report": "^3.0.1",
-				"istanbul-lib-source-maps": "^5.0.4",
-				"istanbul-reports": "^3.1.6",
-				"magic-string": "^0.30.5",
-				"magicast": "^0.3.3",
-				"picocolors": "^1.0.0",
-				"std-env": "^3.5.0",
-				"strip-literal": "^2.0.0",
-				"test-exclude": "^6.0.0"
+				"istanbul-lib-source-maps": "^5.0.6",
+				"istanbul-reports": "^3.1.7",
+				"magic-string": "^0.30.12",
+				"magicast": "^0.3.5",
+				"std-env": "^3.8.0",
+				"test-exclude": "^7.0.1",
+				"tinyrainbow": "^1.2.0"
 			},
 			"funding": {
 				"url": "https://opencollective.com/vitest"
 			},
 			"peerDependencies": {
-				"vitest": "1.6.0"
+				"@vitest/browser": "2.1.9",
+				"vitest": "2.1.9"
+			},
+			"peerDependenciesMeta": {
+				"@vitest/browser": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@vitest/coverage-v8/node_modules/glob": {
+			"version": "10.4.5",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+			"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"foreground-child": "^3.1.0",
+				"jackspeak": "^3.1.2",
+				"minimatch": "^9.0.4",
+				"minipass": "^7.1.2",
+				"package-json-from-dist": "^1.0.0",
+				"path-scurry": "^1.11.1"
+			},
+			"bin": {
+				"glob": "dist/esm/bin.mjs"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
 		"node_modules/@vitest/coverage-v8/node_modules/istanbul-lib-source-maps": {
@@ -8491,126 +8848,175 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/@vitest/expect": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.6.0.tgz",
-			"integrity": "sha512-ixEvFVQjycy/oNgHjqsL6AZCDduC+tflRluaHIzKIsdbzkLn2U/iBnVeJwB6HsIjQBdfMR8Z0tRxKUsvFJEeWQ==",
+		"node_modules/@vitest/coverage-v8/node_modules/magic-string": {
+			"version": "0.30.17",
+			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
+			"integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@vitest/spy": "1.6.0",
-				"@vitest/utils": "1.6.0",
-				"chai": "^4.3.10"
+				"@jridgewell/sourcemap-codec": "^1.5.0"
+			}
+		},
+		"node_modules/@vitest/coverage-v8/node_modules/minimatch": {
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
 			},
 			"funding": {
-				"url": "https://opencollective.com/vitest"
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"node_modules/@vitest/runner": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.6.0.tgz",
-			"integrity": "sha512-P4xgwPjwesuBiHisAVz/LSSZtDjOTPYZVmNAnpHHSR6ONrf8eCJOFRvUwdHn30F5M1fxhqtl7QZQUk2dprIXAg==",
+		"node_modules/@vitest/coverage-v8/node_modules/test-exclude": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz",
+			"integrity": "sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"@istanbuljs/schema": "^0.1.2",
+				"glob": "^10.4.1",
+				"minimatch": "^9.0.4"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@vitest/expect": {
+			"version": "2.1.9",
+			"resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.9.tgz",
+			"integrity": "sha512-UJCIkTBenHeKT1TTlKMJWy1laZewsRIzYighyYiJKZreqtdxSos/S1t+ktRMQWu2CKqaarrkeszJx1cgC5tGZw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@vitest/utils": "1.6.0",
-				"p-limit": "^5.0.0",
-				"pathe": "^1.1.1"
+				"@vitest/spy": "2.1.9",
+				"@vitest/utils": "2.1.9",
+				"chai": "^5.1.2",
+				"tinyrainbow": "^1.2.0"
 			},
 			"funding": {
 				"url": "https://opencollective.com/vitest"
 			}
 		},
-		"node_modules/@vitest/runner/node_modules/p-limit": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-5.0.0.tgz",
-			"integrity": "sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==",
+		"node_modules/@vitest/pretty-format": {
+			"version": "2.1.9",
+			"resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.9.tgz",
+			"integrity": "sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"yocto-queue": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=18"
+				"tinyrainbow": "^1.2.0"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"url": "https://opencollective.com/vitest"
 			}
 		},
-		"node_modules/@vitest/runner/node_modules/yocto-queue": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz",
-			"integrity": "sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==",
+		"node_modules/@vitest/runner": {
+			"version": "2.1.9",
+			"resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.9.tgz",
+			"integrity": "sha512-ZXSSqTFIrzduD63btIfEyOmNcBmQvgOVsPNPe0jYtESiXkhd8u2erDLnMxmGrDCwHCCHE7hxwRDCT3pt0esT4g==",
 			"dev": true,
 			"license": "MIT",
-			"engines": {
-				"node": ">=12.20"
+			"dependencies": {
+				"@vitest/utils": "2.1.9",
+				"pathe": "^1.1.2"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"url": "https://opencollective.com/vitest"
 			}
 		},
 		"node_modules/@vitest/snapshot": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.6.0.tgz",
-			"integrity": "sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==",
+			"version": "2.1.9",
+			"resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.9.tgz",
+			"integrity": "sha512-oBO82rEjsxLNJincVhLhaxxZdEtV0EFHMK5Kmx5sJ6H9L183dHECjiefOAdnqpIgT5eZwT04PoggUnW88vOBNQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"magic-string": "^0.30.5",
-				"pathe": "^1.1.1",
-				"pretty-format": "^29.7.0"
+				"@vitest/pretty-format": "2.1.9",
+				"magic-string": "^0.30.12",
+				"pathe": "^1.1.2"
 			},
 			"funding": {
 				"url": "https://opencollective.com/vitest"
 			}
 		},
+		"node_modules/@vitest/snapshot/node_modules/magic-string": {
+			"version": "0.30.17",
+			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
+			"integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jridgewell/sourcemap-codec": "^1.5.0"
+			}
+		},
 		"node_modules/@vitest/spy": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.6.0.tgz",
-			"integrity": "sha512-leUTap6B/cqi/bQkXUu6bQV5TZPx7pmMBKBQiI0rJA8c3pB56ZsaTbREnF7CJfmvAS4V2cXIBAh/3rVwrrCYgw==",
+			"version": "2.1.9",
+			"resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.9.tgz",
+			"integrity": "sha512-E1B35FwzXXTs9FHNK6bDszs7mtydNi5MIfUWpceJ8Xbfb1gBMscAnwLbEu+B44ed6W3XjL9/ehLPHR1fkf1KLQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"tinyspy": "^2.2.0"
+				"tinyspy": "^3.0.2"
 			},
 			"funding": {
 				"url": "https://opencollective.com/vitest"
 			}
 		},
 		"node_modules/@vitest/ui": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-1.6.0.tgz",
-			"integrity": "sha512-k3Lyo+ONLOgylctiGovRKy7V4+dIN2yxstX3eY5cWFXH6WP+ooVX79YSyi0GagdTQzLmT43BF27T0s6dOIPBXA==",
+			"version": "2.1.9",
+			"resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-2.1.9.tgz",
+			"integrity": "sha512-izzd2zmnk8Nl5ECYkW27328RbQ1nKvkm6Bb5DAaz1Gk59EbLkiCMa6OLT0NoaAYTjOFS6N+SMYW1nh4/9ljPiw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@vitest/utils": "1.6.0",
-				"fast-glob": "^3.3.2",
-				"fflate": "^0.8.1",
-				"flatted": "^3.2.9",
-				"pathe": "^1.1.1",
-				"picocolors": "^1.0.0",
-				"sirv": "^2.0.4"
+				"@vitest/utils": "2.1.9",
+				"fflate": "^0.8.2",
+				"flatted": "^3.3.1",
+				"pathe": "^1.1.2",
+				"sirv": "^3.0.0",
+				"tinyglobby": "^0.2.10",
+				"tinyrainbow": "^1.2.0"
 			},
 			"funding": {
 				"url": "https://opencollective.com/vitest"
 			},
 			"peerDependencies": {
-				"vitest": "1.6.0"
+				"vitest": "2.1.9"
+			}
+		},
+		"node_modules/@vitest/ui/node_modules/sirv": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.1.tgz",
+			"integrity": "sha512-FoqMu0NCGBLCcAkS1qA+XJIQTR6/JHfQXl+uGteNCQ76T91DMUjPa9xfmeqMY3z80nLSg9yQmNjK0Px6RWsH/A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@polka/url": "^1.0.0-next.24",
+				"mrmime": "^2.0.0",
+				"totalist": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=18"
 			}
 		},
 		"node_modules/@vitest/utils": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.6.0.tgz",
-			"integrity": "sha512-21cPiuGMoMZwiOHa2i4LXkMkMkCGzA+MVFV70jRwHo95dL4x/ts5GZhML1QWuy7yfp3WzK3lRvZi3JnXTYqrBw==",
+			"version": "2.1.9",
+			"resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.9.tgz",
+			"integrity": "sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"diff-sequences": "^29.6.3",
-				"estree-walker": "^3.0.3",
-				"loupe": "^2.3.7",
-				"pretty-format": "^29.7.0"
+				"@vitest/pretty-format": "2.1.9",
+				"loupe": "^3.1.2",
+				"tinyrainbow": "^1.2.0"
 			},
 			"funding": {
 				"url": "https://opencollective.com/vitest"
@@ -9007,9 +9413,9 @@
 			}
 		},
 		"node_modules/acorn": {
-			"version": "8.14.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-			"integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+			"version": "8.15.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+			"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -9534,13 +9940,13 @@
 			"license": "MIT"
 		},
 		"node_modules/assertion-error": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-			"integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+			"integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
-				"node": "*"
+				"node": ">=12"
 			}
 		},
 		"node_modules/astral-regex": {
@@ -9793,15 +10199,19 @@
 			}
 		},
 		"node_modules/babel-plugin-macros": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
-			"integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
+			"integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.7.2",
-				"cosmiconfig": "^6.0.0",
-				"resolve": "^1.12.0"
+				"@babel/runtime": "^7.12.5",
+				"cosmiconfig": "^7.0.0",
+				"resolve": "^1.19.0"
+			},
+			"engines": {
+				"node": ">=10",
+				"npm": ">=6"
 			}
 		},
 		"node_modules/babel-plugin-polyfill-corejs2": {
@@ -10222,22 +10632,6 @@
 				"node": "*"
 			}
 		},
-		"node_modules/bundle-name": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
-			"integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"run-applescript": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/byline": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz",
@@ -10430,22 +10824,20 @@
 			"license": "CC-BY-4.0"
 		},
 		"node_modules/chai": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz",
-			"integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==",
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz",
+			"integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"assertion-error": "^1.1.0",
-				"check-error": "^1.0.3",
-				"deep-eql": "^4.1.3",
-				"get-func-name": "^2.0.2",
-				"loupe": "^2.3.6",
-				"pathval": "^1.1.1",
-				"type-detect": "^4.1.0"
+				"assertion-error": "^2.0.1",
+				"check-error": "^2.1.1",
+				"deep-eql": "^5.0.1",
+				"loupe": "^3.1.0",
+				"pathval": "^2.0.0"
 			},
 			"engines": {
-				"node": ">=4"
+				"node": ">=12"
 			}
 		},
 		"node_modules/chalk": {
@@ -10481,16 +10873,13 @@
 			"license": "MIT"
 		},
 		"node_modules/check-error": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
-			"integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
+			"integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
 			"dev": true,
 			"license": "MIT",
-			"dependencies": {
-				"get-func-name": "^2.0.2"
-			},
 			"engines": {
-				"node": "*"
+				"node": ">= 16"
 			}
 		},
 		"node_modules/chevrotain": {
@@ -11007,17 +11396,17 @@
 			"license": "MIT"
 		},
 		"node_modules/color": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/color/-/color-5.0.0.tgz",
-			"integrity": "sha512-16BlyiuyLq3MLxpRWyOTiWsO3ii/eLQLJUQXBSNcxMBBSnyt1ee9YUdaozQp03ifwm5woztEZGDbk9RGVuCsdw==",
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
+			"integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"color-convert": "^3.0.1",
-				"color-string": "^2.0.0"
+				"color-convert": "^2.0.1",
+				"color-string": "^1.9.0"
 			},
 			"engines": {
-				"node": ">=18"
+				"node": ">=12.5.0"
 			}
 		},
 		"node_modules/color-convert": {
@@ -11038,50 +11427,35 @@
 			"license": "MIT"
 		},
 		"node_modules/color-string": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-string/-/color-string-2.0.1.tgz",
-			"integrity": "sha512-5z9FbYTZPAo8iKsNEqRNv+OlpBbDcoE+SY9GjLfDUHEfcNNV7tS9eSAlFHEaub/r5tBL9LtskAeq1l9SaoZ5tQ==",
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
+			"integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"color-name": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/color-string/node_modules/color-name": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-2.0.0.tgz",
-			"integrity": "sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12.20"
+				"color-name": "^1.0.0",
+				"simple-swizzle": "^0.2.2"
 			}
 		},
 		"node_modules/color/node_modules/color-convert": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.0.1.tgz",
-			"integrity": "sha512-5kQah2eolfQV7HCrxtsBBArPfT5dwaKYMCXeMQsdRO7ihTO/cuNLGjd50ITCDn+ZU/YbS0Go64SjP9154eopxg==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"color-name": "^2.0.0"
+				"color-name": "~1.1.4"
 			},
 			"engines": {
-				"node": ">=14.6"
+				"node": ">=7.0.0"
 			}
 		},
 		"node_modules/color/node_modules/color-name": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-2.0.0.tgz",
-			"integrity": "sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow==",
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12.20"
-			}
+			"license": "MIT"
 		},
 		"node_modules/colorette": {
 			"version": "2.0.20",
@@ -11234,13 +11608,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/confbox": {
-			"version": "0.1.8",
-			"resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
-			"integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/confusing-browser-globals": {
 			"version": "1.0.11",
 			"resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
@@ -11270,21 +11637,20 @@
 			"license": "MIT"
 		},
 		"node_modules/copy-webpack-plugin": {
-			"version": "9.1.0",
-			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz",
-			"integrity": "sha512-rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA==",
+			"version": "13.0.0",
+			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-13.0.0.tgz",
+			"integrity": "sha512-FgR/h5a6hzJqATDGd9YG41SeDViH+0bkHn6WNXCi5zKAZkeESeSxLySSsFLHqLEVCh0E+rITmCf0dusXWYukeQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"fast-glob": "^3.2.7",
 				"glob-parent": "^6.0.1",
-				"globby": "^11.0.3",
 				"normalize-path": "^3.0.0",
-				"schema-utils": "^3.1.1",
-				"serialize-javascript": "^6.0.0"
+				"schema-utils": "^4.2.0",
+				"serialize-javascript": "^6.0.2",
+				"tinyglobby": "^0.2.12"
 			},
 			"engines": {
-				"node": ">= 12.13.0"
+				"node": ">= 18.12.0"
 			},
 			"funding": {
 				"type": "opencollective",
@@ -11294,6 +11660,44 @@
 				"webpack": "^5.1.0"
 			}
 		},
+		"node_modules/copy-webpack-plugin/node_modules/ajv-formats": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+			"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ajv": "^8.0.0"
+			},
+			"peerDependencies": {
+				"ajv": "^8.0.0"
+			},
+			"peerDependenciesMeta": {
+				"ajv": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/copy-webpack-plugin/node_modules/schema-utils": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+			"integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
 		"node_modules/copyfiles": {
 			"version": "2.4.1",
 			"resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-2.4.1.tgz",
@@ -11465,20 +11869,30 @@
 			}
 		},
 		"node_modules/cosmiconfig": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-			"integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+			"integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@types/parse-json": "^4.0.0",
-				"import-fresh": "^3.1.0",
+				"import-fresh": "^3.2.1",
 				"parse-json": "^5.0.0",
 				"path-type": "^4.0.0",
-				"yaml": "^1.7.2"
+				"yaml": "^1.10.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=10"
+			}
+		},
+		"node_modules/cosmiconfig/node_modules/yaml": {
+			"version": "1.10.2",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">= 6"
 			}
 		},
 		"node_modules/crc-32": {
@@ -11944,14 +12358,11 @@
 			}
 		},
 		"node_modules/deep-eql": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz",
-			"integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==",
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
+			"integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
 			"dev": true,
 			"license": "MIT",
-			"dependencies": {
-				"type-detect": "^4.0.0"
-			},
 			"engines": {
 				"node": ">=6"
 			}
@@ -11973,40 +12384,10 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/default-browser": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
-			"integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"bundle-name": "^4.1.0",
-				"default-browser-id": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/default-browser-id": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz",
-			"integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/defaults": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-			"integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+		"node_modules/defaults": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+			"integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -12521,9 +12902,9 @@
 			}
 		},
 		"node_modules/esbuild": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-			"integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.5.tgz",
+			"integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
 			"dev": true,
 			"hasInstallScript": true,
 			"license": "MIT",
@@ -12531,32 +12912,34 @@
 				"esbuild": "bin/esbuild"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			},
 			"optionalDependencies": {
-				"@esbuild/aix-ppc64": "0.21.5",
-				"@esbuild/android-arm": "0.21.5",
-				"@esbuild/android-arm64": "0.21.5",
-				"@esbuild/android-x64": "0.21.5",
-				"@esbuild/darwin-arm64": "0.21.5",
-				"@esbuild/darwin-x64": "0.21.5",
-				"@esbuild/freebsd-arm64": "0.21.5",
-				"@esbuild/freebsd-x64": "0.21.5",
-				"@esbuild/linux-arm": "0.21.5",
-				"@esbuild/linux-arm64": "0.21.5",
-				"@esbuild/linux-ia32": "0.21.5",
-				"@esbuild/linux-loong64": "0.21.5",
-				"@esbuild/linux-mips64el": "0.21.5",
-				"@esbuild/linux-ppc64": "0.21.5",
-				"@esbuild/linux-riscv64": "0.21.5",
-				"@esbuild/linux-s390x": "0.21.5",
-				"@esbuild/linux-x64": "0.21.5",
-				"@esbuild/netbsd-x64": "0.21.5",
-				"@esbuild/openbsd-x64": "0.21.5",
-				"@esbuild/sunos-x64": "0.21.5",
-				"@esbuild/win32-arm64": "0.21.5",
-				"@esbuild/win32-ia32": "0.21.5",
-				"@esbuild/win32-x64": "0.21.5"
+				"@esbuild/aix-ppc64": "0.25.5",
+				"@esbuild/android-arm": "0.25.5",
+				"@esbuild/android-arm64": "0.25.5",
+				"@esbuild/android-x64": "0.25.5",
+				"@esbuild/darwin-arm64": "0.25.5",
+				"@esbuild/darwin-x64": "0.25.5",
+				"@esbuild/freebsd-arm64": "0.25.5",
+				"@esbuild/freebsd-x64": "0.25.5",
+				"@esbuild/linux-arm": "0.25.5",
+				"@esbuild/linux-arm64": "0.25.5",
+				"@esbuild/linux-ia32": "0.25.5",
+				"@esbuild/linux-loong64": "0.25.5",
+				"@esbuild/linux-mips64el": "0.25.5",
+				"@esbuild/linux-ppc64": "0.25.5",
+				"@esbuild/linux-riscv64": "0.25.5",
+				"@esbuild/linux-s390x": "0.25.5",
+				"@esbuild/linux-x64": "0.25.5",
+				"@esbuild/netbsd-arm64": "0.25.5",
+				"@esbuild/netbsd-x64": "0.25.5",
+				"@esbuild/openbsd-arm64": "0.25.5",
+				"@esbuild/openbsd-x64": "0.25.5",
+				"@esbuild/sunos-x64": "0.25.5",
+				"@esbuild/win32-arm64": "0.25.5",
+				"@esbuild/win32-ia32": "0.25.5",
+				"@esbuild/win32-x64": "0.25.5"
 			}
 		},
 		"node_modules/escalade": {
@@ -12670,14 +13053,17 @@
 			}
 		},
 		"node_modules/eslint-config-prettier": {
-			"version": "9.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
-			"integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
+			"version": "10.1.5",
+			"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.5.tgz",
+			"integrity": "sha512-zc1UmCpNltmVY34vuLRV61r1K27sWuX39E+uyUnY8xS2Bex88VV9cugG+UZbRSRGtGyFboj+D8JODyme1plMpw==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
 				"eslint-config-prettier": "bin/cli.js"
 			},
+			"funding": {
+				"url": "https://opencollective.com/eslint-config-prettier"
+			},
 			"peerDependencies": {
 				"eslint": ">=7.0.0"
 			}
@@ -13166,6 +13552,16 @@
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
+		"node_modules/expect-type": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.1.tgz",
+			"integrity": "sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=12.0.0"
+			}
+		},
 		"node_modules/exponential-backoff": {
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
@@ -13618,23 +14014,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/fork-ts-checker-webpack-plugin/node_modules/cosmiconfig": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
-			"integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/parse-json": "^4.0.0",
-				"import-fresh": "^3.2.1",
-				"parse-json": "^5.0.0",
-				"path-type": "^4.0.0",
-				"yaml": "^1.10.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": {
 			"version": "10.1.0",
 			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
@@ -13849,16 +14228,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/get-func-name": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
-			"integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "*"
-			}
-		},
 		"node_modules/get-intrinsic": {
 			"version": "1.2.6",
 			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.6.tgz",
@@ -14074,6 +14443,13 @@
 				"node": ">8.0.0"
 			}
 		},
+		"node_modules/get-them-args": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/get-them-args/-/get-them-args-1.3.2.tgz",
+			"integrity": "sha512-LRn8Jlk+DwZE4GTlDbT3Hikd1wSHgLMme/+7ddlqKd7ldwR6LjJgTVWzBnR01wnYGe4KgrXjg287RaI22UHmAw==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/gifwrap": {
 			"version": "0.10.1",
 			"resolved": "https://registry.npmjs.org/gifwrap/-/gifwrap-0.10.1.tgz",
@@ -15146,6 +15522,16 @@
 				"node": ">= 12"
 			}
 		},
+		"node_modules/ip-regex": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
+			"integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/is-arrayish": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -15244,41 +15630,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/is-inside-container": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
-			"integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-docker": "^3.0.0"
-			},
-			"bin": {
-				"is-inside-container": "cli.js"
-			},
-			"engines": {
-				"node": ">=14.16"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/is-inside-container/node_modules/is-docker": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
-			"integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"is-docker": "cli.js"
-			},
-			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/is-interactive": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
@@ -15408,6 +15759,13 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/is-url": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
+			"integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/is-wsl": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
@@ -15421,6 +15779,21 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/is2": {
+			"version": "2.0.9",
+			"resolved": "https://registry.npmjs.org/is2/-/is2-2.0.9.tgz",
+			"integrity": "sha512-rZkHeBn9Zzq52sd9IUIV3a5mfwBY+o2HePMh0wkGBM4z4qjvy2GwVxQ6nNXSfw6MmVP6gf1QIlWjiOavhM3x5g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"deep-is": "^0.1.3",
+				"ip-regex": "^4.1.0",
+				"is-url": "^1.2.4"
+			},
+			"engines": {
+				"node": ">=v0.10.0"
+			}
+		},
 		"node_modules/isarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -15864,24 +16237,6 @@
 				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"node_modules/jest-circus/node_modules/babel-plugin-macros": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
-			"integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@babel/runtime": "^7.12.5",
-				"cosmiconfig": "^7.0.0",
-				"resolve": "^1.19.0"
-			},
-			"engines": {
-				"node": ">=10",
-				"npm": ">=6"
-			}
-		},
 		"node_modules/jest-circus/node_modules/chalk": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -15919,25 +16274,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/jest-circus/node_modules/cosmiconfig": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
-			"integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@types/parse-json": "^4.0.0",
-				"import-fresh": "^3.2.1",
-				"parse-json": "^5.0.0",
-				"path-type": "^4.0.0",
-				"yaml": "^1.10.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/jest-circus/node_modules/dedent": {
 			"version": "1.5.3",
 			"resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
@@ -17680,13 +18016,13 @@
 			}
 		},
 		"node_modules/jiti": {
-			"version": "1.21.7",
-			"resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
-			"integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
+			"integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
-				"jiti": "bin/jiti.js"
+				"jiti": "lib/jiti-cli.mjs"
 			}
 		},
 		"node_modules/jpeg-js": {
@@ -17955,6 +18291,20 @@
 				"json-buffer": "3.0.1"
 			}
 		},
+		"node_modules/kill-port": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/kill-port/-/kill-port-1.6.1.tgz",
+			"integrity": "sha512-un0Y55cOM7JKGaLnGja28T38tDDop0AQ8N0KlAdyh+B1nmMoX8AnNmqPNZbS3mUMgiST51DCVqmbFT1gNJpVNw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"get-them-args": "1.3.2",
+				"shell-exec": "1.0.2"
+			},
+			"bin": {
+				"kill-port": "cli.js"
+			}
+		},
 		"node_modules/kind-of": {
 			"version": "6.0.3",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -18387,23 +18737,6 @@
 				"node": ">= 12.13.0"
 			}
 		},
-		"node_modules/local-pkg": {
-			"version": "0.5.1",
-			"resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.1.tgz",
-			"integrity": "sha512-9rrA30MRRP3gBD3HTGnC6cDFpaE1kVDWxWgqWJUN0RvDNAo+Nz/9GxB+nHOH0ifbVFy0hSA1V6vFDvnx54lTEQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"mlly": "^1.7.3",
-				"pkg-types": "^1.2.1"
-			},
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/antfu"
-			}
-		},
 		"node_modules/locate-path": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -18773,14 +19106,11 @@
 			}
 		},
 		"node_modules/loupe": {
-			"version": "2.3.7",
-			"resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
-			"integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
+			"version": "3.1.4",
+			"resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.4.tgz",
+			"integrity": "sha512-wJzkKwJrheKtknCOKNEtDK4iqg/MxmZheEMtSTYvnzRdEYaZzmgH976nenp8WdJRdx5Vc1X/9MO0Oszl6ezeXg==",
 			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"get-func-name": "^2.0.1"
-			}
+			"license": "MIT"
 		},
 		"node_modules/lru-cache": {
 			"version": "5.1.1",
@@ -19441,19 +19771,6 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/mlly": {
-			"version": "1.7.3",
-			"resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.3.tgz",
-			"integrity": "sha512-xUsx5n/mN0uQf4V548PKQ+YShA4/IW0KI1dZhrNrPCLG+xizETbHTkOa1f8/xut9JRPp8kQuMnz0oqwkTiLo/A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"acorn": "^8.14.0",
-				"pathe": "^1.1.2",
-				"pkg-types": "^1.2.1",
-				"ufo": "^1.5.4"
-			}
-		},
 		"node_modules/modify-values": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
@@ -19508,9 +19825,9 @@
 			}
 		},
 		"node_modules/nanoid": {
-			"version": "3.3.8",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-			"integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+			"version": "3.3.11",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+			"integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
 			"dev": true,
 			"funding": [
 				{
@@ -19527,9 +19844,9 @@
 			}
 		},
 		"node_modules/nativescript": {
-			"version": "8.9.0",
-			"resolved": "https://registry.npmjs.org/nativescript/-/nativescript-8.9.0.tgz",
-			"integrity": "sha512-9p8yGTqLeHpyI7adXBcuiqTZpRFXYeCp7QS34fKbgWOUePikt7svC6KI1HdNHKbZObMnqE3s2lqWlMFkxT++2Q==",
+			"version": "9.0.0-alpha.0",
+			"resolved": "https://registry.npmjs.org/nativescript/-/nativescript-9.0.0-alpha.0.tgz",
+			"integrity": "sha512-MbkRXy1Ee/gRHAM17K56pqt/hux6STlH1PB29lshY70VKeltgLM5UP1xOwom6MNBmYODXyRipDx50wlBQ4DGQg==",
 			"dev": true,
 			"hasInstallScript": true,
 			"license": "Apache-2.0",
@@ -19543,12 +19860,12 @@
 				"archiver": "^7.0.1",
 				"axios": "1.7.9",
 				"byline": "5.0.0",
-				"chalk": "^5.4.1",
+				"chalk": "4.1.2",
 				"chokidar": "4.0.3",
 				"cli-table3": "0.6.5",
-				"color": "5.0.0",
+				"color": "4.2.3",
 				"convert-source-map": "2.0.0",
-				"detect-newline": "4.0.1",
+				"detect-newline": "3.1.0",
 				"email-validator": "2.0.4",
 				"esprima": "4.0.1",
 				"font-finder": "1.1.0",
@@ -19565,8 +19882,8 @@
 				"mkdirp": "3.0.1",
 				"mute-stream": "2.0.0",
 				"nativescript-dev-xcode": "0.8.1",
-				"open": "10.1.0",
-				"ora": "8.2.0",
+				"open": "8.4.2",
+				"ora": "5.4.1",
 				"pacote": "21.0.0",
 				"pbxproj-dom": "1.2.0",
 				"plist": "3.1.0",
@@ -19601,7 +19918,7 @@
 				"tns": "bin/tns"
 			},
 			"engines": {
-				"node": ">=22.12.0"
+				"node": ">=20.0.0"
 			},
 			"optionalDependencies": {
 				"fsevents": "*"
@@ -19683,27 +20000,34 @@
 			"dev": true,
 			"license": "Apache-2.0"
 		},
-		"node_modules/nativescript/node_modules/ansi-regex": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-			"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+		"node_modules/nativescript/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
 			"license": "MIT",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=8"
 			},
 			"funding": {
-				"url": "https://github.com/chalk/ansi-regex?sponsor=1"
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
 		"node_modules/nativescript/node_modules/chalk": {
-			"version": "5.4.1",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
-			"integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
 			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
 			"engines": {
-				"node": "^12.17.0 || ^14.13 || >=16.0.0"
+				"node": ">=10"
 			},
 			"funding": {
 				"url": "https://github.com/chalk/chalk?sponsor=1"
@@ -19725,60 +20049,25 @@
 				"url": "https://paulmillr.com/funding/"
 			}
 		},
-		"node_modules/nativescript/node_modules/cli-cursor": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
-			"integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
+		"node_modules/nativescript/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"restore-cursor": "^5.0.0"
+				"color-name": "~1.1.4"
 			},
 			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"node": ">=7.0.0"
 			}
 		},
-		"node_modules/nativescript/node_modules/cli-spinners": {
-			"version": "2.9.2",
-			"resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
-			"integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
+		"node_modules/nativescript/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/nativescript/node_modules/define-lazy-prop": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
-			"integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/nativescript/node_modules/detect-newline": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-4.0.1.tgz",
-			"integrity": "sha512-qE3Veg1YXzGHQhlA6jzebZN2qVf6NX+A7m7qlhCGG30dJixrAQhYOsJjsnBjJkCSmuOPpCk30145fr8FV0bzog==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
+			"license": "MIT"
 		},
 		"node_modules/nativescript/node_modules/glob": {
 			"version": "11.0.1",
@@ -19804,46 +20093,14 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"node_modules/nativescript/node_modules/is-interactive": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz",
-			"integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/nativescript/node_modules/is-unicode-supported": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz",
-			"integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/nativescript/node_modules/is-wsl": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
-			"integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
+		"node_modules/nativescript/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
 			"license": "MIT",
-			"dependencies": {
-				"is-inside-container": "^1.0.0"
-			},
 			"engines": {
-				"node": ">=16"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"node": ">=8"
 			}
 		},
 		"node_modules/nativescript/node_modules/jackspeak": {
@@ -19862,36 +20119,6 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"node_modules/nativescript/node_modules/log-symbols": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-6.0.0.tgz",
-			"integrity": "sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"chalk": "^5.3.0",
-				"is-unicode-supported": "^1.3.0"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/nativescript/node_modules/log-symbols/node_modules/is-unicode-supported": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz",
-			"integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/nativescript/node_modules/lru-cache": {
 			"version": "11.0.2",
 			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz",
@@ -19944,83 +20171,6 @@
 				"node": "^18.17.0 || >=20.5.0"
 			}
 		},
-		"node_modules/nativescript/node_modules/onetime": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
-			"integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"mimic-function": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/nativescript/node_modules/open": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/open/-/open-10.1.0.tgz",
-			"integrity": "sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"default-browser": "^5.2.1",
-				"define-lazy-prop": "^3.0.0",
-				"is-inside-container": "^1.0.0",
-				"is-wsl": "^3.1.0"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/nativescript/node_modules/ora": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/ora/-/ora-8.2.0.tgz",
-			"integrity": "sha512-weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"chalk": "^5.3.0",
-				"cli-cursor": "^5.0.0",
-				"cli-spinners": "^2.9.2",
-				"is-interactive": "^2.0.0",
-				"is-unicode-supported": "^2.0.0",
-				"log-symbols": "^6.0.0",
-				"stdin-discarder": "^0.2.2",
-				"string-width": "^7.2.0",
-				"strip-ansi": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/nativescript/node_modules/ora/node_modules/string-width": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-			"integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"emoji-regex": "^10.3.0",
-				"get-east-asian-width": "^1.0.0",
-				"strip-ansi": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/nativescript/node_modules/path-scurry": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz",
@@ -20052,23 +20202,6 @@
 				"url": "https://paulmillr.com/funding/"
 			}
 		},
-		"node_modules/nativescript/node_modules/restore-cursor": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
-			"integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"onetime": "^7.0.0",
-				"signal-exit": "^4.1.0"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/nativescript/node_modules/semver": {
 			"version": "7.7.1",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
@@ -20082,33 +20215,17 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/nativescript/node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/nativescript/node_modules/strip-ansi": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-			"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+		"node_modules/nativescript/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"ansi-regex": "^6.0.1"
+				"has-flag": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
+				"node": ">=8"
 			}
 		},
 		"node_modules/nativescript/node_modules/typescript": {
@@ -20749,9 +20866,9 @@
 			"license": "MIT"
 		},
 		"node_modules/nx": {
-			"version": "20.3.0",
-			"resolved": "https://registry.npmjs.org/nx/-/nx-20.3.0.tgz",
-			"integrity": "sha512-Nzi4k7tV22zwO2iBLk+pHxorLEWPJpPrVCACtz0SQ63j/LiAgfhoqruJO+VU+V+E9qdyPsvmqIL/Iaf/GRQlqA==",
+			"version": "21.2.1",
+			"resolved": "https://registry.npmjs.org/nx/-/nx-21.2.1.tgz",
+			"integrity": "sha512-wwLa9BSb/wH2KI6CrM356DerDxf8hnzqXx/OvXuKgWsPtOciUdULisJEzdCvehZYg/l2RH84jOLmMVq7OWNuaw==",
 			"dev": true,
 			"hasInstallScript": true,
 			"license": "MIT",
@@ -20760,7 +20877,7 @@
 				"@yarnpkg/lockfile": "^1.1.0",
 				"@yarnpkg/parsers": "3.0.2",
 				"@zkochan/js-yaml": "0.0.7",
-				"axios": "^1.7.4",
+				"axios": "^1.8.3",
 				"chalk": "^4.1.0",
 				"cli-cursor": "3.1.0",
 				"cli-spinners": "2.6.1",
@@ -20785,6 +20902,7 @@
 				"string-width": "^4.2.3",
 				"tar-stream": "~2.2.0",
 				"tmp": "~0.2.1",
+				"tree-kill": "^1.2.2",
 				"tsconfig-paths": "^4.1.2",
 				"tslib": "^2.3.0",
 				"yaml": "^2.6.0",
@@ -20796,16 +20914,16 @@
 				"nx-cloud": "bin/nx-cloud.js"
 			},
 			"optionalDependencies": {
-				"@nx/nx-darwin-arm64": "20.3.0",
-				"@nx/nx-darwin-x64": "20.3.0",
-				"@nx/nx-freebsd-x64": "20.3.0",
-				"@nx/nx-linux-arm-gnueabihf": "20.3.0",
-				"@nx/nx-linux-arm64-gnu": "20.3.0",
-				"@nx/nx-linux-arm64-musl": "20.3.0",
-				"@nx/nx-linux-x64-gnu": "20.3.0",
-				"@nx/nx-linux-x64-musl": "20.3.0",
-				"@nx/nx-win32-arm64-msvc": "20.3.0",
-				"@nx/nx-win32-x64-msvc": "20.3.0"
+				"@nx/nx-darwin-arm64": "21.2.1",
+				"@nx/nx-darwin-x64": "21.2.1",
+				"@nx/nx-freebsd-x64": "21.2.1",
+				"@nx/nx-linux-arm-gnueabihf": "21.2.1",
+				"@nx/nx-linux-arm64-gnu": "21.2.1",
+				"@nx/nx-linux-arm64-musl": "21.2.1",
+				"@nx/nx-linux-x64-gnu": "21.2.1",
+				"@nx/nx-linux-x64-musl": "21.2.1",
+				"@nx/nx-win32-arm64-msvc": "21.2.1",
+				"@nx/nx-win32-x64-msvc": "21.2.1"
 			},
 			"peerDependencies": {
 				"@swc-node/register": "^1.8.0",
@@ -20836,6 +20954,18 @@
 				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
+		"node_modules/nx/node_modules/axios": {
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-1.10.0.tgz",
+			"integrity": "sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"follow-redirects": "^1.15.6",
+				"form-data": "^4.0.0",
+				"proxy-from-env": "^1.1.0"
+			}
+		},
 		"node_modules/nx/node_modules/chalk": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -20932,19 +21062,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/nx/node_modules/yaml": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz",
-			"integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==",
-			"dev": true,
-			"license": "ISC",
-			"bin": {
-				"yaml": "bin.mjs"
-			},
-			"engines": {
-				"node": ">= 14"
-			}
-		},
 		"node_modules/nx/node_modules/yargs": {
 			"version": "17.7.2",
 			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
@@ -21186,6 +21303,31 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/oxc-resolver": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-5.3.0.tgz",
+			"integrity": "sha512-FHqtZx0idP5QRPSNcI5g2ItmADg7fhR3XIeWg5eRMGfp44xqRpfkdvo+EX4ZceqV9bxvl0Z8vaqMqY0gYaNYNA==",
+			"dev": true,
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/Boshen"
+			},
+			"optionalDependencies": {
+				"@oxc-resolver/binding-darwin-arm64": "5.3.0",
+				"@oxc-resolver/binding-darwin-x64": "5.3.0",
+				"@oxc-resolver/binding-freebsd-x64": "5.3.0",
+				"@oxc-resolver/binding-linux-arm-gnueabihf": "5.3.0",
+				"@oxc-resolver/binding-linux-arm64-gnu": "5.3.0",
+				"@oxc-resolver/binding-linux-arm64-musl": "5.3.0",
+				"@oxc-resolver/binding-linux-riscv64-gnu": "5.3.0",
+				"@oxc-resolver/binding-linux-s390x-gnu": "5.3.0",
+				"@oxc-resolver/binding-linux-x64-gnu": "5.3.0",
+				"@oxc-resolver/binding-linux-x64-musl": "5.3.0",
+				"@oxc-resolver/binding-wasm32-wasi": "5.3.0",
+				"@oxc-resolver/binding-win32-arm64-msvc": "5.3.0",
+				"@oxc-resolver/binding-win32-x64-msvc": "5.3.0"
+			}
+		},
 		"node_modules/p-limit": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -21692,13 +21834,13 @@
 			"license": "MIT"
 		},
 		"node_modules/pathval": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-			"integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.1.tgz",
+			"integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
-				"node": "*"
+				"node": ">= 14.16"
 			}
 		},
 		"node_modules/pause-stream": {
@@ -21897,18 +22039,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/pkg-types": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.0.tgz",
-			"integrity": "sha512-kS7yWjVFCkIw9hqdJBoMxDdzEngmkr5FXeWZZfQ6GoYacjVnsW6l2CcYW/0ThD0vF4LPJgVYnrg4d0uuhwYQbg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"confbox": "^0.1.8",
-				"mlly": "^1.7.3",
-				"pathe": "^1.1.2"
-			}
-		},
 		"node_modules/plist": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
@@ -22018,9 +22148,9 @@
 			}
 		},
 		"node_modules/postcss": {
-			"version": "8.4.49",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-			"integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+			"version": "8.5.6",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+			"integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
 			"dev": true,
 			"funding": [
 				{
@@ -22038,7 +22168,7 @@
 			],
 			"license": "MIT",
 			"dependencies": {
-				"nanoid": "^3.3.7",
+				"nanoid": "^3.3.11",
 				"picocolors": "^1.1.1",
 				"source-map-js": "^1.2.1"
 			},
@@ -22047,9 +22177,9 @@
 			}
 		},
 		"node_modules/postcss-import": {
-			"version": "14.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz",
-			"integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==",
+			"version": "16.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-16.1.1.tgz",
+			"integrity": "sha512-2xVS1NCZAfjtVdvXiyegxzJ447GyqCeEI5V7ApgQVOWnros1p5lGNovJNapwPpMombyFBfqDwt7AD3n2l0KOfQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -22058,46 +22188,55 @@
 				"resolve": "^1.1.7"
 			},
 			"engines": {
-				"node": ">=10.0.0"
+				"node": ">=18.0.0"
 			},
 			"peerDependencies": {
 				"postcss": "^8.0.0"
 			}
 		},
 		"node_modules/postcss-loader": {
-			"version": "7.3.4",
-			"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.4.tgz",
-			"integrity": "sha512-iW5WTTBSC5BfsBJ9daFMPVrLT36MrNiC6fqOZTTaHjBNX6Pfd5p+hSBqe/fEeNd7pc13QiAyGt7VdGMw4eRC4A==",
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-8.1.1.tgz",
+			"integrity": "sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"cosmiconfig": "^8.3.5",
+				"cosmiconfig": "^9.0.0",
 				"jiti": "^1.20.0",
 				"semver": "^7.5.4"
 			},
 			"engines": {
-				"node": ">= 14.15.0"
+				"node": ">= 18.12.0"
 			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/webpack"
 			},
 			"peerDependencies": {
+				"@rspack/core": "0.x || 1.x",
 				"postcss": "^7.0.0 || ^8.0.1",
 				"webpack": "^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@rspack/core": {
+					"optional": true
+				},
+				"webpack": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/postcss-loader/node_modules/cosmiconfig": {
-			"version": "8.3.6",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
-			"integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+			"integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
+				"env-paths": "^2.2.1",
 				"import-fresh": "^3.3.0",
 				"js-yaml": "^4.1.0",
-				"parse-json": "^5.2.0",
-				"path-type": "^4.0.0"
+				"parse-json": "^5.2.0"
 			},
 			"engines": {
 				"node": ">=14"
@@ -22114,6 +22253,26 @@
 				}
 			}
 		},
+		"node_modules/postcss-loader/node_modules/env-paths": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+			"integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/postcss-loader/node_modules/jiti": {
+			"version": "1.21.7",
+			"resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
+			"integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"jiti": "bin/jiti.js"
+			}
+		},
 		"node_modules/postcss-loader/node_modules/js-yaml": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -23309,13 +23468,13 @@
 			}
 		},
 		"node_modules/rollup": {
-			"version": "4.29.1",
-			"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.29.1.tgz",
-			"integrity": "sha512-RaJ45M/kmJUzSWDs1Nnd5DdV4eerC98idtUOVr6FfKcgxqvjwHmxc5upLF9qZU9EpsVzzhleFahrT3shLuJzIw==",
+			"version": "4.44.1",
+			"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.1.tgz",
+			"integrity": "sha512-x8H8aPvD+xbl0Do8oez5f5o8eMS3trfCghc4HhLAnCkj7Vl0d1JWGs0UF/D886zLW2rOj2QymV/JcSSsw+XDNg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@types/estree": "1.0.6"
+				"@types/estree": "1.0.8"
 			},
 			"bin": {
 				"rollup": "dist/bin/rollup"
@@ -23325,25 +23484,26 @@
 				"npm": ">=8.0.0"
 			},
 			"optionalDependencies": {
-				"@rollup/rollup-android-arm-eabi": "4.29.1",
-				"@rollup/rollup-android-arm64": "4.29.1",
-				"@rollup/rollup-darwin-arm64": "4.29.1",
-				"@rollup/rollup-darwin-x64": "4.29.1",
-				"@rollup/rollup-freebsd-arm64": "4.29.1",
-				"@rollup/rollup-freebsd-x64": "4.29.1",
-				"@rollup/rollup-linux-arm-gnueabihf": "4.29.1",
-				"@rollup/rollup-linux-arm-musleabihf": "4.29.1",
-				"@rollup/rollup-linux-arm64-gnu": "4.29.1",
-				"@rollup/rollup-linux-arm64-musl": "4.29.1",
-				"@rollup/rollup-linux-loongarch64-gnu": "4.29.1",
-				"@rollup/rollup-linux-powerpc64le-gnu": "4.29.1",
-				"@rollup/rollup-linux-riscv64-gnu": "4.29.1",
-				"@rollup/rollup-linux-s390x-gnu": "4.29.1",
-				"@rollup/rollup-linux-x64-gnu": "4.29.1",
-				"@rollup/rollup-linux-x64-musl": "4.29.1",
-				"@rollup/rollup-win32-arm64-msvc": "4.29.1",
-				"@rollup/rollup-win32-ia32-msvc": "4.29.1",
-				"@rollup/rollup-win32-x64-msvc": "4.29.1",
+				"@rollup/rollup-android-arm-eabi": "4.44.1",
+				"@rollup/rollup-android-arm64": "4.44.1",
+				"@rollup/rollup-darwin-arm64": "4.44.1",
+				"@rollup/rollup-darwin-x64": "4.44.1",
+				"@rollup/rollup-freebsd-arm64": "4.44.1",
+				"@rollup/rollup-freebsd-x64": "4.44.1",
+				"@rollup/rollup-linux-arm-gnueabihf": "4.44.1",
+				"@rollup/rollup-linux-arm-musleabihf": "4.44.1",
+				"@rollup/rollup-linux-arm64-gnu": "4.44.1",
+				"@rollup/rollup-linux-arm64-musl": "4.44.1",
+				"@rollup/rollup-linux-loongarch64-gnu": "4.44.1",
+				"@rollup/rollup-linux-powerpc64le-gnu": "4.44.1",
+				"@rollup/rollup-linux-riscv64-gnu": "4.44.1",
+				"@rollup/rollup-linux-riscv64-musl": "4.44.1",
+				"@rollup/rollup-linux-s390x-gnu": "4.44.1",
+				"@rollup/rollup-linux-x64-gnu": "4.44.1",
+				"@rollup/rollup-linux-x64-musl": "4.44.1",
+				"@rollup/rollup-win32-arm64-msvc": "4.44.1",
+				"@rollup/rollup-win32-ia32-msvc": "4.44.1",
+				"@rollup/rollup-win32-x64-msvc": "4.44.1",
 				"fsevents": "~2.3.2"
 			}
 		},
@@ -23354,19 +23514,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/run-applescript": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz",
-			"integrity": "sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/run-async": {
 			"version": "2.4.1",
 			"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
@@ -23460,7 +23607,48 @@
 				"@parcel/watcher": "^2.4.1"
 			}
 		},
-		"node_modules/sass/node_modules/chokidar": {
+		"node_modules/sass-loader": {
+			"version": "16.0.5",
+			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.5.tgz",
+			"integrity": "sha512-oL+CMBXrj6BZ/zOq4os+UECPL+bWqt6OAC6DWS8Ln8GZRcMDjlJ4JC3FBDuHJdYaFWIdKNIBYmtZtK2MaMkNIw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"neo-async": "^2.6.2"
+			},
+			"engines": {
+				"node": ">= 18.12.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"@rspack/core": "0.x || 1.x",
+				"node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+				"sass": "^1.3.0",
+				"sass-embedded": "*",
+				"webpack": "^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@rspack/core": {
+					"optional": true
+				},
+				"node-sass": {
+					"optional": true
+				},
+				"sass": {
+					"optional": true
+				},
+				"sass-embedded": {
+					"optional": true
+				},
+				"webpack": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/sass/node_modules/chokidar": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
 			"integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
@@ -23643,6 +23831,13 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/shell-exec": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/shell-exec/-/shell-exec-1.0.2.tgz",
+			"integrity": "sha512-jyVd+kU2X+mWKMmGhx4fpWbPsjvD53k9ivqetutVW/BQ+WIZoDoP4d8vUMGezV6saZsiNoW2f9GIhg9Dondohg==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/shelljs": {
 			"version": "0.8.5",
 			"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
@@ -23797,6 +23992,23 @@
 				"plist": "^3.0.5"
 			}
 		},
+		"node_modules/simple-swizzle": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+			"integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-arrayish": "^0.3.1"
+			}
+		},
+		"node_modules/simple-swizzle/node_modules/is-arrayish": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+			"integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/simple-update-notifier": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
@@ -24149,19 +24361,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/stdin-discarder": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.2.2.tgz",
-			"integrity": "sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/stream-buffers": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
@@ -24421,26 +24620,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/strip-literal": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.1.1.tgz",
-			"integrity": "sha512-631UJ6O00eNGfMiWG78ck80dfBab8X6IVFB51jZK5Icd7XAs60Z5y7QdSd/wGIklnWvRbUNloVzhOKKmutxQ6Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"js-tokens": "^9.0.1"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/antfu"
-			}
-		},
-		"node_modules/strip-literal/node_modules/js-tokens": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
-			"integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/strnum": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
@@ -24610,6 +24789,42 @@
 				"node": ">=18"
 			}
 		},
+		"node_modules/tcp-port-used": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz",
+			"integrity": "sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"debug": "4.3.1",
+				"is2": "^2.0.6"
+			}
+		},
+		"node_modules/tcp-port-used/node_modules/debug": {
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+			"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ms": "2.1.2"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/tcp-port-used/node_modules/ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/temp": {
 			"version": "0.9.4",
 			"resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz",
@@ -25022,24 +25237,34 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/tinyexec": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
+			"integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/tinyglobby": {
-			"version": "0.2.10",
-			"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.10.tgz",
-			"integrity": "sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==",
+			"version": "0.2.14",
+			"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+			"integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"fdir": "^6.4.2",
+				"fdir": "^6.4.4",
 				"picomatch": "^4.0.2"
 			},
 			"engines": {
 				"node": ">=12.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/SuperchupuDev"
 			}
 		},
 		"node_modules/tinyglobby/node_modules/fdir": {
-			"version": "6.4.2",
-			"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.2.tgz",
-			"integrity": "sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==",
+			"version": "6.4.6",
+			"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
+			"integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
 			"dev": true,
 			"license": "MIT",
 			"peerDependencies": {
@@ -25065,9 +25290,19 @@
 			}
 		},
 		"node_modules/tinypool": {
-			"version": "0.8.4",
-			"resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.4.tgz",
-			"integrity": "sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
+			"integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.0.0 || >=20.0.0"
+			}
+		},
+		"node_modules/tinyrainbow": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz",
+			"integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -25075,9 +25310,9 @@
 			}
 		},
 		"node_modules/tinyspy": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.1.tgz",
-			"integrity": "sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
+			"integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -25222,16 +25457,16 @@
 			}
 		},
 		"node_modules/ts-api-utils": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.0.tgz",
-			"integrity": "sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+			"integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
-				"node": ">=16"
+				"node": ">=18.12"
 			},
 			"peerDependencies": {
-				"typescript": ">=4.2.0"
+				"typescript": ">=4.8.4"
 			}
 		},
 		"node_modules/ts-dedent": {
@@ -25245,20 +25480,20 @@
 			}
 		},
 		"node_modules/ts-jest": {
-			"version": "29.2.5",
-			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.5.tgz",
-			"integrity": "sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==",
+			"version": "29.4.0",
+			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.0.tgz",
+			"integrity": "sha512-d423TJMnJGu80/eSgfQ5w/R+0zFJvdtTxwtF9KzFFunOpSeD+79lHJQIiAhluJoyGRbvj9NZJsl9WjCUo0ND7Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"bs-logger": "^0.2.6",
 				"ejs": "^3.1.10",
 				"fast-json-stable-stringify": "^2.1.0",
-				"jest-util": "^29.0.0",
 				"json5": "^2.2.3",
 				"lodash.memoize": "^4.1.2",
 				"make-error": "^1.3.6",
-				"semver": "^7.6.3",
+				"semver": "^7.7.2",
+				"type-fest": "^4.41.0",
 				"yargs-parser": "^21.1.1"
 			},
 			"bin": {
@@ -25269,10 +25504,11 @@
 			},
 			"peerDependencies": {
 				"@babel/core": ">=7.0.0-beta.0 <8",
-				"@jest/transform": "^29.0.0",
-				"@jest/types": "^29.0.0",
-				"babel-jest": "^29.0.0",
-				"jest": "^29.0.0",
+				"@jest/transform": "^29.0.0 || ^30.0.0",
+				"@jest/types": "^29.0.0 || ^30.0.0",
+				"babel-jest": "^29.0.0 || ^30.0.0",
+				"jest": "^29.0.0 || ^30.0.0",
+				"jest-util": "^29.0.0 || ^30.0.0",
 				"typescript": ">=4.3 <6"
 			},
 			"peerDependenciesMeta": {
@@ -25290,9 +25526,38 @@
 				},
 				"esbuild": {
 					"optional": true
+				},
+				"jest-util": {
+					"optional": true
 				}
 			}
 		},
+		"node_modules/ts-jest/node_modules/semver": {
+			"version": "7.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+			"integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/ts-jest/node_modules/type-fest": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+			"integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+			"dev": true,
+			"license": "(MIT OR CC0-1.0)",
+			"engines": {
+				"node": ">=16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/ts-loader": {
 			"version": "9.5.2",
 			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.2.tgz",
@@ -25644,26 +25909,27 @@
 			}
 		},
 		"node_modules/typedoc": {
-			"version": "0.27.6",
-			"resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.27.6.tgz",
-			"integrity": "sha512-oBFRoh2Px6jFx366db0lLlihcalq/JzyCVp7Vaq1yphL/tbgx2e+bkpkCgJPunaPvPwoTOXSwasfklWHm7GfAw==",
+			"version": "0.28.6",
+			"resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.28.6.tgz",
+			"integrity": "sha512-2VvfK6z3yupcu75qZB00LGICg4qa0lw4yPBrFcnZgqIMwpLjLWopTqNeJ4SSS/s92myvWBECY5zcOSMqpvW3CA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
-				"@gerrit0/mini-shiki": "^1.24.0",
+				"@gerrit0/mini-shiki": "^3.2.2",
 				"lunr": "^2.3.9",
 				"markdown-it": "^14.1.0",
 				"minimatch": "^9.0.5",
-				"yaml": "^2.6.1"
+				"yaml": "^2.7.1"
 			},
 			"bin": {
 				"typedoc": "bin/typedoc"
 			},
 			"engines": {
-				"node": ">= 18"
+				"node": ">= 18",
+				"pnpm": ">= 10"
 			},
 			"peerDependencies": {
-				"typescript": "5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x || 5.7.x"
+				"typescript": "5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x || 5.7.x || 5.8.x"
 			}
 		},
 		"node_modules/typedoc/node_modules/minimatch": {
@@ -25682,23 +25948,10 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"node_modules/typedoc/node_modules/yaml": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz",
-			"integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==",
-			"dev": true,
-			"license": "ISC",
-			"bin": {
-				"yaml": "bin.mjs"
-			},
-			"engines": {
-				"node": ">= 14"
-			}
-		},
 		"node_modules/typescript": {
-			"version": "5.6.3",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
-			"integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
+			"version": "5.8.3",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
+			"integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"bin": {
@@ -25716,13 +25969,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/ufo": {
-			"version": "1.5.4",
-			"resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.4.tgz",
-			"integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/uglify-js": {
 			"version": "3.19.3",
 			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
@@ -25995,48 +26241,1197 @@
 			"resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
 			"integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
 			"dev": true,
-			"license": "MIT"
+			"license": "MIT"
+		},
+		"node_modules/v8-to-istanbul": {
+			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+			"integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.12",
+				"@types/istanbul-lib-coverage": "^2.0.1",
+				"convert-source-map": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10.12.0"
+			}
+		},
+		"node_modules/validate-npm-package-license": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"spdx-correct": "^3.0.0",
+				"spdx-expression-parse": "^3.0.0"
+			}
+		},
+		"node_modules/validate-npm-package-name": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
+			"integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+			}
+		},
+		"node_modules/vite": {
+			"version": "6.3.5",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
+			"integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"esbuild": "^0.25.0",
+				"fdir": "^6.4.4",
+				"picomatch": "^4.0.2",
+				"postcss": "^8.5.3",
+				"rollup": "^4.34.9",
+				"tinyglobby": "^0.2.13"
+			},
+			"bin": {
+				"vite": "bin/vite.js"
+			},
+			"engines": {
+				"node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/vitejs/vite?sponsor=1"
+			},
+			"optionalDependencies": {
+				"fsevents": "~2.3.3"
+			},
+			"peerDependencies": {
+				"@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+				"jiti": ">=1.21.0",
+				"less": "*",
+				"lightningcss": "^1.21.0",
+				"sass": "*",
+				"sass-embedded": "*",
+				"stylus": "*",
+				"sugarss": "*",
+				"terser": "^5.16.0",
+				"tsx": "^4.8.1",
+				"yaml": "^2.4.2"
+			},
+			"peerDependenciesMeta": {
+				"@types/node": {
+					"optional": true
+				},
+				"jiti": {
+					"optional": true
+				},
+				"less": {
+					"optional": true
+				},
+				"lightningcss": {
+					"optional": true
+				},
+				"sass": {
+					"optional": true
+				},
+				"sass-embedded": {
+					"optional": true
+				},
+				"stylus": {
+					"optional": true
+				},
+				"sugarss": {
+					"optional": true
+				},
+				"terser": {
+					"optional": true
+				},
+				"tsx": {
+					"optional": true
+				},
+				"yaml": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/vite-node": {
+			"version": "2.1.9",
+			"resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.9.tgz",
+			"integrity": "sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cac": "^6.7.14",
+				"debug": "^4.3.7",
+				"es-module-lexer": "^1.5.4",
+				"pathe": "^1.1.2",
+				"vite": "^5.0.0"
+			},
+			"bin": {
+				"vite-node": "vite-node.mjs"
+			},
+			"engines": {
+				"node": "^18.0.0 || >=20.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/vitest"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/aix-ppc64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+			"integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+			"cpu": [
+				"ppc64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"aix"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/android-arm": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+			"integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/android-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+			"integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/android-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+			"integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/darwin-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+			"integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/darwin-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+			"integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/freebsd-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+			"integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/freebsd-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+			"integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/linux-arm": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+			"integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/linux-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+			"integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/linux-ia32": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+			"integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/linux-loong64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+			"integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+			"cpu": [
+				"loong64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/linux-mips64el": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+			"integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+			"cpu": [
+				"mips64el"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/linux-ppc64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+			"integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+			"cpu": [
+				"ppc64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/linux-riscv64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+			"integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+			"cpu": [
+				"riscv64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/linux-s390x": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+			"integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+			"cpu": [
+				"s390x"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/linux-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+			"integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/netbsd-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+			"integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"netbsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/openbsd-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+			"integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"openbsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/sunos-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+			"integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"sunos"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/win32-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+			"integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/win32-ia32": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+			"integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/@esbuild/win32-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+			"integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vite-node/node_modules/esbuild": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+			"integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT",
+			"bin": {
+				"esbuild": "bin/esbuild"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"optionalDependencies": {
+				"@esbuild/aix-ppc64": "0.21.5",
+				"@esbuild/android-arm": "0.21.5",
+				"@esbuild/android-arm64": "0.21.5",
+				"@esbuild/android-x64": "0.21.5",
+				"@esbuild/darwin-arm64": "0.21.5",
+				"@esbuild/darwin-x64": "0.21.5",
+				"@esbuild/freebsd-arm64": "0.21.5",
+				"@esbuild/freebsd-x64": "0.21.5",
+				"@esbuild/linux-arm": "0.21.5",
+				"@esbuild/linux-arm64": "0.21.5",
+				"@esbuild/linux-ia32": "0.21.5",
+				"@esbuild/linux-loong64": "0.21.5",
+				"@esbuild/linux-mips64el": "0.21.5",
+				"@esbuild/linux-ppc64": "0.21.5",
+				"@esbuild/linux-riscv64": "0.21.5",
+				"@esbuild/linux-s390x": "0.21.5",
+				"@esbuild/linux-x64": "0.21.5",
+				"@esbuild/netbsd-x64": "0.21.5",
+				"@esbuild/openbsd-x64": "0.21.5",
+				"@esbuild/sunos-x64": "0.21.5",
+				"@esbuild/win32-arm64": "0.21.5",
+				"@esbuild/win32-ia32": "0.21.5",
+				"@esbuild/win32-x64": "0.21.5"
+			}
+		},
+		"node_modules/vite-node/node_modules/vite": {
+			"version": "5.4.19",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.19.tgz",
+			"integrity": "sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"esbuild": "^0.21.3",
+				"postcss": "^8.4.43",
+				"rollup": "^4.20.0"
+			},
+			"bin": {
+				"vite": "bin/vite.js"
+			},
+			"engines": {
+				"node": "^18.0.0 || >=20.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/vitejs/vite?sponsor=1"
+			},
+			"optionalDependencies": {
+				"fsevents": "~2.3.3"
+			},
+			"peerDependencies": {
+				"@types/node": "^18.0.0 || >=20.0.0",
+				"less": "*",
+				"lightningcss": "^1.21.0",
+				"sass": "*",
+				"sass-embedded": "*",
+				"stylus": "*",
+				"sugarss": "*",
+				"terser": "^5.4.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/node": {
+					"optional": true
+				},
+				"less": {
+					"optional": true
+				},
+				"lightningcss": {
+					"optional": true
+				},
+				"sass": {
+					"optional": true
+				},
+				"sass-embedded": {
+					"optional": true
+				},
+				"stylus": {
+					"optional": true
+				},
+				"sugarss": {
+					"optional": true
+				},
+				"terser": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/vite/node_modules/fdir": {
+			"version": "6.4.6",
+			"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
+			"integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+			"dev": true,
+			"license": "MIT",
+			"peerDependencies": {
+				"picomatch": "^3 || ^4"
+			},
+			"peerDependenciesMeta": {
+				"picomatch": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/vite/node_modules/picomatch": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+			"integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/vitest": {
+			"version": "2.1.9",
+			"resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.9.tgz",
+			"integrity": "sha512-MSmPM9REYqDGBI8439mA4mWhV5sKmDlBKWIYbA3lRb2PTHACE0mgKwA8yQ2xq9vxDTuk4iPrECBAEW2aoFXY0Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@vitest/expect": "2.1.9",
+				"@vitest/mocker": "2.1.9",
+				"@vitest/pretty-format": "^2.1.9",
+				"@vitest/runner": "2.1.9",
+				"@vitest/snapshot": "2.1.9",
+				"@vitest/spy": "2.1.9",
+				"@vitest/utils": "2.1.9",
+				"chai": "^5.1.2",
+				"debug": "^4.3.7",
+				"expect-type": "^1.1.0",
+				"magic-string": "^0.30.12",
+				"pathe": "^1.1.2",
+				"std-env": "^3.8.0",
+				"tinybench": "^2.9.0",
+				"tinyexec": "^0.3.1",
+				"tinypool": "^1.0.1",
+				"tinyrainbow": "^1.2.0",
+				"vite": "^5.0.0",
+				"vite-node": "2.1.9",
+				"why-is-node-running": "^2.3.0"
+			},
+			"bin": {
+				"vitest": "vitest.mjs"
+			},
+			"engines": {
+				"node": "^18.0.0 || >=20.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/vitest"
+			},
+			"peerDependencies": {
+				"@edge-runtime/vm": "*",
+				"@types/node": "^18.0.0 || >=20.0.0",
+				"@vitest/browser": "2.1.9",
+				"@vitest/ui": "2.1.9",
+				"happy-dom": "*",
+				"jsdom": "*"
+			},
+			"peerDependenciesMeta": {
+				"@edge-runtime/vm": {
+					"optional": true
+				},
+				"@types/node": {
+					"optional": true
+				},
+				"@vitest/browser": {
+					"optional": true
+				},
+				"@vitest/ui": {
+					"optional": true
+				},
+				"happy-dom": {
+					"optional": true
+				},
+				"jsdom": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/aix-ppc64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+			"integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+			"cpu": [
+				"ppc64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"aix"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/android-arm": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+			"integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/android-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+			"integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/android-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+			"integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/darwin-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+			"integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/darwin-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+			"integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/freebsd-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+			"integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/freebsd-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+			"integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/linux-arm": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+			"integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/linux-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+			"integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/linux-ia32": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+			"integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/linux-loong64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+			"integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+			"cpu": [
+				"loong64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/linux-mips64el": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+			"integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+			"cpu": [
+				"mips64el"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/linux-ppc64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+			"integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+			"cpu": [
+				"ppc64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/linux-riscv64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+			"integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+			"cpu": [
+				"riscv64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/linux-s390x": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+			"integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+			"cpu": [
+				"s390x"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/linux-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+			"integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/netbsd-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+			"integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"netbsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/openbsd-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+			"integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"openbsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/sunos-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+			"integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"sunos"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/win32-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+			"integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/win32-ia32": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+			"integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/vitest/node_modules/@esbuild/win32-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+			"integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=12"
+			}
 		},
-		"node_modules/v8-to-istanbul": {
-			"version": "9.3.0",
-			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
-			"integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+		"node_modules/vitest/node_modules/@vitest/mocker": {
+			"version": "2.1.9",
+			"resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.9.tgz",
+			"integrity": "sha512-tVL6uJgoUdi6icpxmdrn5YNo3g3Dxv+IHJBr0GXHaEdTcw3F+cPKnsXFhli6nO+f/6SDKPHEK1UN+k+TQv0Ehg==",
 			"dev": true,
-			"license": "ISC",
+			"license": "MIT",
 			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.12",
-				"@types/istanbul-lib-coverage": "^2.0.1",
-				"convert-source-map": "^2.0.0"
+				"@vitest/spy": "2.1.9",
+				"estree-walker": "^3.0.3",
+				"magic-string": "^0.30.12"
 			},
-			"engines": {
-				"node": ">=10.12.0"
+			"funding": {
+				"url": "https://opencollective.com/vitest"
+			},
+			"peerDependencies": {
+				"msw": "^2.4.9",
+				"vite": "^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"msw": {
+					"optional": true
+				},
+				"vite": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/validate-npm-package-license": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+		"node_modules/vitest/node_modules/esbuild": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+			"integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
 			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"spdx-correct": "^3.0.0",
-				"spdx-expression-parse": "^3.0.0"
+			"hasInstallScript": true,
+			"license": "MIT",
+			"bin": {
+				"esbuild": "bin/esbuild"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"optionalDependencies": {
+				"@esbuild/aix-ppc64": "0.21.5",
+				"@esbuild/android-arm": "0.21.5",
+				"@esbuild/android-arm64": "0.21.5",
+				"@esbuild/android-x64": "0.21.5",
+				"@esbuild/darwin-arm64": "0.21.5",
+				"@esbuild/darwin-x64": "0.21.5",
+				"@esbuild/freebsd-arm64": "0.21.5",
+				"@esbuild/freebsd-x64": "0.21.5",
+				"@esbuild/linux-arm": "0.21.5",
+				"@esbuild/linux-arm64": "0.21.5",
+				"@esbuild/linux-ia32": "0.21.5",
+				"@esbuild/linux-loong64": "0.21.5",
+				"@esbuild/linux-mips64el": "0.21.5",
+				"@esbuild/linux-ppc64": "0.21.5",
+				"@esbuild/linux-riscv64": "0.21.5",
+				"@esbuild/linux-s390x": "0.21.5",
+				"@esbuild/linux-x64": "0.21.5",
+				"@esbuild/netbsd-x64": "0.21.5",
+				"@esbuild/openbsd-x64": "0.21.5",
+				"@esbuild/sunos-x64": "0.21.5",
+				"@esbuild/win32-arm64": "0.21.5",
+				"@esbuild/win32-ia32": "0.21.5",
+				"@esbuild/win32-x64": "0.21.5"
 			}
 		},
-		"node_modules/validate-npm-package-name": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
-			"integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
+		"node_modules/vitest/node_modules/magic-string": {
+			"version": "0.30.17",
+			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
+			"integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
 			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+			"license": "MIT",
+			"dependencies": {
+				"@jridgewell/sourcemap-codec": "^1.5.0"
 			}
 		},
-		"node_modules/vite": {
-			"version": "5.4.11",
-			"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz",
-			"integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==",
+		"node_modules/vitest/node_modules/vite": {
+			"version": "5.4.19",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.19.tgz",
+			"integrity": "sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -26093,194 +27488,6 @@
 				}
 			}
 		},
-		"node_modules/vite-node": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.6.0.tgz",
-			"integrity": "sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"cac": "^6.7.14",
-				"debug": "^4.3.4",
-				"pathe": "^1.1.1",
-				"picocolors": "^1.0.0",
-				"vite": "^5.0.0"
-			},
-			"bin": {
-				"vite-node": "vite-node.mjs"
-			},
-			"engines": {
-				"node": "^18.0.0 || >=20.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/vitest"
-			}
-		},
-		"node_modules/vitest": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/vitest/-/vitest-1.6.0.tgz",
-			"integrity": "sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@vitest/expect": "1.6.0",
-				"@vitest/runner": "1.6.0",
-				"@vitest/snapshot": "1.6.0",
-				"@vitest/spy": "1.6.0",
-				"@vitest/utils": "1.6.0",
-				"acorn-walk": "^8.3.2",
-				"chai": "^4.3.10",
-				"debug": "^4.3.4",
-				"execa": "^8.0.1",
-				"local-pkg": "^0.5.0",
-				"magic-string": "^0.30.5",
-				"pathe": "^1.1.1",
-				"picocolors": "^1.0.0",
-				"std-env": "^3.5.0",
-				"strip-literal": "^2.0.0",
-				"tinybench": "^2.5.1",
-				"tinypool": "^0.8.3",
-				"vite": "^5.0.0",
-				"vite-node": "1.6.0",
-				"why-is-node-running": "^2.2.2"
-			},
-			"bin": {
-				"vitest": "vitest.mjs"
-			},
-			"engines": {
-				"node": "^18.0.0 || >=20.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/vitest"
-			},
-			"peerDependencies": {
-				"@edge-runtime/vm": "*",
-				"@types/node": "^18.0.0 || >=20.0.0",
-				"@vitest/browser": "1.6.0",
-				"@vitest/ui": "1.6.0",
-				"happy-dom": "*",
-				"jsdom": "*"
-			},
-			"peerDependenciesMeta": {
-				"@edge-runtime/vm": {
-					"optional": true
-				},
-				"@types/node": {
-					"optional": true
-				},
-				"@vitest/browser": {
-					"optional": true
-				},
-				"@vitest/ui": {
-					"optional": true
-				},
-				"happy-dom": {
-					"optional": true
-				},
-				"jsdom": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/vitest/node_modules/execa": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
-			"integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"cross-spawn": "^7.0.3",
-				"get-stream": "^8.0.1",
-				"human-signals": "^5.0.0",
-				"is-stream": "^3.0.0",
-				"merge-stream": "^2.0.0",
-				"npm-run-path": "^5.1.0",
-				"onetime": "^6.0.0",
-				"signal-exit": "^4.1.0",
-				"strip-final-newline": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=16.17"
-			},
-			"funding": {
-				"url": "https://github.com/sindresorhus/execa?sponsor=1"
-			}
-		},
-		"node_modules/vitest/node_modules/get-stream": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
-			"integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=16"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/vitest/node_modules/human-signals": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
-			"integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=16.17.0"
-			}
-		},
-		"node_modules/vitest/node_modules/magic-string": {
-			"version": "0.30.17",
-			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
-			"integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/sourcemap-codec": "^1.5.0"
-			}
-		},
-		"node_modules/vitest/node_modules/npm-run-path": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
-			"integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"path-key": "^4.0.0"
-			},
-			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/vitest/node_modules/path-key": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
-			"integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/vitest/node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/vue-hot-reload-api": {
 			"version": "2.3.4",
 			"resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
@@ -27185,13 +28392,16 @@
 			"license": "ISC"
 		},
 		"node_modules/yaml": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
+			"integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
 			"dev": true,
 			"license": "ISC",
+			"bin": {
+				"yaml": "bin.mjs"
+			},
 			"engines": {
-				"node": ">= 6"
+				"node": ">= 14.6"
 			}
 		},
 		"node_modules/yargs": {
diff --git a/package.json b/package.json
index c1fae66c80..0df6925a34 100644
--- a/package.json
+++ b/package.json
@@ -1,109 +1,111 @@
 {
-	"name": "nativescript",
-	"version": "8.9.0",
-	"license": "MIT",
-	"scripts": {
-		"clean": "git clean -f -X -d --exclude=!.idea/ --exclude=!.vscode/* --exclude=!.npmrc",
-		"clean.all": "npm run setup && nx run-many --target=clean --all",
-		"setup": "npm run clean && npm install",
-		"setup:yarn": "yarn clean && yarn",
-		"setup:pnpm": "pnpm run clean && pnpm install",
-		"postinstall": "ts-patch install && husky",
-		"start": "nps"
-	},
-	"private": true,
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/NativeScript/NativeScript.git"
-	},
-	"dependencies": {
-		"nativescript-theme-core": "^1.0.4"
-	},
-	"devDependencies": {
-		"@csstools/css-calc": "~2.1.2",
-		"@csstools/css-color-parser": "^3.0.8",
-		"@csstools/css-parser-algorithms": "^3.0.4",
-		"@csstools/css-tokenizer": "^3.0.3",
-		"@nativescript/hook": "^2.0.0",
-		"@nativescript/nx": "^20.0.0",
-		"@nstudio/focus": "^20.0.2",
-		"@nstudio/nps-i": "~2.0.0",
-		"@nx/devkit": "20.3.0",
-		"@nx/eslint-plugin": "20.3.0",
-		"@nx/jest": "20.3.0",
-		"@nx/js": "20.3.0",
-		"@nx/node": "20.3.0",
-		"@nx/plugin": "20.3.0",
-		"@nx/vite": "20.3.0",
-		"@nx/web": "20.3.0",
-		"@nx/workspace": "20.3.0",
-		"@prettier/plugin-xml": "^3.4.1",
-		"@swc-node/register": "~1.9.1",
-		"@swc/core": "~1.5.7",
-		"@swc/helpers": "~0.5.11",
-		"@types/jest": "~29.5.0",
-		"@types/node": "^20.0.0",
-		"@typescript-eslint/eslint-plugin": "^8.6.0",
-		"@typescript-eslint/parser": "^8.6.0",
-		"@vitest/coverage-v8": "^1.0.4",
-		"@vitest/ui": "^1.3.1",
-		"acorn-stage3": "^4.0.0",
-		"acorn": "^8.7.0",
-		"copy-webpack-plugin": "^9.0.0",
-		"copyfiles": "^2.4.0",
-		"css": "^3.0.0",
-		"css-tree": "^1.1.2",
-		"css-what": "^6.1.0",
-		"dotenv-webpack": "^7.0.0",
-		"dotenv": "~16.4.0",
-		"emoji-regex": "^10.3.0",
-		"enhanced-resolve": "^5.8.3",
-		"eslint": "~8.57.0",
-		"eslint-config-prettier": "~9.1.0",
-		"fork-ts-checker-webpack-plugin": "^7.0.0",
-		"gonzales": "^1.0.7",
-		"husky": "^9.0.0",
-		"jest": "~29.7.0",
-		"jest-environment-jsdom": "~29.7.0",
-		"jsdom": "~22.1.0",
-		"lint-staged": "^15.2.0",
-		"loader-utils": "^2.0.0 || ^3.0.0",
-		"module-alias": "^2.2.2",
-		"nativescript": "~8.9.0",
-		"nativescript-typedoc-theme": "1.1.0",
-		"nx": "20.3.0",
-		"parse-css": "git+https://github.com/tabatkins/parse-css.git",
-		"parserlib": "^1.1.1",
-		"postcss": "^8.0.0",
-		"postcss-import": "^14.0.0",
-		"postcss-loader": "^7.0.0",
-		"prettier": "^3.2.5",
-		"sass": "^1.72.0",
-		"shady-css-parser": "^0.1.0",
-		"terser-webpack-plugin": "^5.0.0",
-		"tree-kill": "^1.2.2",
-		"ts-dedent": "^2.2.0",
-		"ts-jest": "29.2.5",
-		"ts-loader": "^9.0.0",
-		"ts-node": "10.9.2",
-		"ts-patch": "^3.0.0",
-		"tslib": "^2.6.0",
-		"typedoc": "^0.27.6",
-		"typescript": "~5.6.0",
-		"vite": "^5.0.0",
-		"vitest": "^1.3.1",
-		"vue-loader": "^15.0.0 <= 15.9.8",
-		"webpack-bundle-analyzer": "^4.0.0",
-		"webpack-chain": "^6.0.0",
-		"webpack-cli": "^4.0.0",
-		"webpack-merge": "^5.0.0",
-		"webpack-virtual-modules": "^0.4.0",
-		"webpack": "^5.30.0 <= 5.50.0 || ^5.51.2",
-		"zx": "^8.3.0"
-	},
-	"lint-staged": {
-		"**/*.{js,ts,css,scss,json,html}": [
-			"npx prettier --write"
-		]
-	}
+  "name": "nativescript",
+  "version": "8.9.0",
+  "license": "MIT",
+  "scripts": {
+    "clean": "git clean -f -X -d --exclude=!.idea/ --exclude=!.vscode/* --exclude=!.npmrc",
+    "clean.all": "npm run setup && nx run-many --target=clean --all",
+    "setup": "npm run clean && npm install",
+    "setup:yarn": "yarn clean && yarn",
+    "setup:pnpm": "pnpm run clean && pnpm install",
+    "postinstall": "ts-patch install && husky",
+    "start": "nps"
+  },
+  "private": true,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/NativeScript/NativeScript.git"
+  },
+  "dependencies": {
+    "nativescript-theme-core": "^1.0.4"
+  },
+  "devDependencies": {
+    "@csstools/css-calc": "~2.1.2",
+    "@csstools/css-color-parser": "^3.0.8",
+    "@csstools/css-parser-algorithms": "^3.0.4",
+    "@csstools/css-tokenizer": "^3.0.3",
+    "@nativescript/hook": "^3.0.1",
+    "@nativescript/nx": "^21.0.0",
+    "@nstudio/focus": "^20.0.2",
+    "@nstudio/nps-i": "~2.0.0",
+    "@nx/devkit": "21.2.1",
+    "@nx/eslint-plugin": "21.2.1",
+    "@nx/jest": "21.2.1",
+    "@nx/js": "21.2.1",
+    "@nx/node": "21.2.1",
+    "@nx/plugin": "21.2.1",
+    "@nx/vite": "21.2.1",
+    "@nx/web": "21.2.1",
+    "@nx/workspace": "21.2.1",
+    "@prettier/plugin-xml": "^3.4.1",
+    "@swc-node/register": "~1.10.1",
+    "@swc/core": "~1.12.7",
+    "@swc/helpers": "~0.5.17",
+    "@types/jest": "~29.5.0",
+    "@types/node": "^20.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.35.0",
+    "@typescript-eslint/parser": "^8.35.0",
+    "@vitest/coverage-v8": "^2.0.0",
+    "@vitest/ui": "^2.0.0",
+    "acorn": "^8.15.0",
+    "acorn-stage3": "^4.0.0",
+    "copy-webpack-plugin": "^13.0.0",
+    "copyfiles": "^2.4.0",
+    "css": "^3.0.0",
+    "css-tree": "^1.1.2",
+    "css-what": "^6.1.0",
+    "dotenv": "~16.4.0",
+    "dotenv-webpack": "^7.0.0",
+    "emoji-regex": "^10.3.0",
+    "enhanced-resolve": "^5.8.3",
+    "eslint": "~8.57.0",
+    "eslint-config-prettier": "^10.0.0",
+    "fork-ts-checker-webpack-plugin": "^7.0.0",
+    "gonzales": "^1.0.7",
+    "husky": "^9.0.0",
+    "jest": "~29.7.0",
+    "jest-environment-jsdom": "~29.7.0",
+    "jiti": "2.4.2",
+    "jsdom": "~22.1.0",
+    "lint-staged": "^15.2.0",
+    "loader-utils": "^2.0.0 || ^3.0.0",
+    "module-alias": "^2.2.2",
+    "nativescript": "^9.0.0-alpha.0",
+    "nativescript-typedoc-theme": "1.1.0",
+    "nx": "21.2.1",
+    "parse-css": "git+https://github.com/tabatkins/parse-css.git",
+    "parserlib": "^1.1.1",
+    "postcss": "^8.0.0",
+    "postcss-import": "^16.0.0",
+    "postcss-loader": "^8.0.0",
+    "prettier": "^3.2.5",
+    "sass": "^1.72.0",
+    "sass-loader": "^16.0.5",
+    "shady-css-parser": "^0.1.0",
+    "terser-webpack-plugin": "^5.0.0",
+    "tree-kill": "^1.2.2",
+    "ts-dedent": "^2.2.0",
+    "ts-jest": "29.4.0",
+    "ts-loader": "^9.0.0",
+    "ts-node": "10.9.2",
+    "ts-patch": "^3.0.0",
+    "tslib": "^2.6.0",
+    "typedoc": "^0.28.6",
+    "typescript": "5.8.3",
+    "vite": "^6.0.0",
+    "vitest": "^2.0.0",
+    "vue-loader": "^15.0.0 <= 15.9.8",
+    "webpack": "^5.30.0 <= 5.50.0 || ^5.51.2",
+    "webpack-bundle-analyzer": "^4.0.0",
+    "webpack-chain": "^6.0.0",
+    "webpack-cli": "^4.0.0",
+    "webpack-merge": "^5.0.0",
+    "webpack-virtual-modules": "^0.4.0",
+    "zx": "^8.3.0"
+  },
+  "lint-staged": {
+    "**/*.{js,ts,css,scss,json,html}": [
+      "npx prettier --write"
+    ]
+  }
 }
diff --git a/packages/core/.eslintrc.json b/packages/core/.eslintrc.json
index 510ded2917..0673f3d061 100644
--- a/packages/core/.eslintrc.json
+++ b/packages/core/.eslintrc.json
@@ -1,7 +1,7 @@
 {
 	"extends": "../../.eslintrc.json",
 	"rules": {},
-	"ignorePatterns": ["!**/*", "**/global-types.d.ts", "**/node_modules/**/*", "**/__tests__/**/*"],
+	"ignorePatterns": ["!**/*", "**/global-types.d.ts", "**/node_modules/**/*", "**/__tests__/**/*", "**/vite.config.*.timestamp*", "**/vitest.config.*.timestamp*"],
 	"overrides": [
 		{
 			"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
diff --git a/packages/core/accessibility/accessibility-common.ts b/packages/core/accessibility/accessibility-common.ts
index 7ca9cdfd98..5eaea0569b 100644
--- a/packages/core/accessibility/accessibility-common.ts
+++ b/packages/core/accessibility/accessibility-common.ts
@@ -1,4 +1,5 @@
-import { EventData, EventDataValue } from '../data/observable';
+import type { EventData, EventDataValue } from '../data/observable';
+import { Observable } from '../data/observable';
 import type { View } from '../ui/core/view';
 import type { Page } from '../ui/page';
 
@@ -72,3 +73,443 @@ export function getLastFocusedViewOnPage(page: Page): View | null {
 
 	return null;
 }
+
+export class SharedA11YObservable extends Observable {
+	accessibilityServiceEnabled?: boolean;
+}
+
+export const AccessibilityServiceEnabledPropName = 'accessibilityServiceEnabled';
+
+export class CommonA11YServiceEnabledObservable extends SharedA11YObservable {
+	constructor(sharedA11YObservable: SharedA11YObservable) {
+		super();
+
+		const ref = new WeakRef(this);
+		let lastValue: boolean;
+
+		function callback() {
+			const self = ref?.get();
+			if (!self) {
+				sharedA11YObservable.off(Observable.propertyChangeEvent, callback);
+
+				return;
+			}
+
+			const newValue = !!sharedA11YObservable.accessibilityServiceEnabled;
+			if (newValue !== lastValue) {
+				self.set(AccessibilityServiceEnabledPropName, newValue);
+				lastValue = newValue;
+			}
+		}
+
+		sharedA11YObservable.on(Observable.propertyChangeEvent, callback);
+
+		this.set(AccessibilityServiceEnabledPropName, !!sharedA11YObservable.accessibilityServiceEnabled);
+	}
+}
+
+let a11yServiceEnabled: boolean;
+export function isA11yEnabled(): boolean {
+	if (typeof a11yServiceEnabled === 'boolean') {
+		return a11yServiceEnabled;
+	}
+	return undefined;
+}
+export function setA11yEnabled(value: boolean): void {
+	a11yServiceEnabled = value;
+}
+
+export function enforceArray(val: string | string[]): string[] {
+	if (Array.isArray(val)) {
+		return val;
+	}
+
+	if (typeof val === 'string') {
+		return val.split(/[, ]/g).filter((v: string) => !!v);
+	}
+
+	return [];
+}
+
+export const VALID_FONT_SCALES = __APPLE__ // Apple supports a wider number of font scales than Android does.
+	? [0.5, 0.7, 0.85, 1, 1.15, 1.3, 1.5, 2, 2.5, 3, 3.5, 4]
+	: [0.85, 1, 1.15, 1.3];
+
+export function getClosestValidFontScale(fontScale: number): number {
+	fontScale = Number(fontScale) || 1;
+
+	return VALID_FONT_SCALES.sort((a, b) => Math.abs(fontScale - a) - Math.abs(fontScale - b))[0];
+}
+
+export enum FontScaleCategory {
+	ExtraSmall = 'extra-small',
+	Medium = 'medium',
+	ExtraLarge = 'extra-large',
+}
+
+export const fontScaleExtraSmallCategoryClass = `a11y-fontscale-xs`;
+export const fontScaleMediumCategoryClass = `a11y-fontscale-m`;
+export const fontScaleExtraLargeCategoryClass = `a11y-fontscale-xl`;
+
+export const fontScaleCategoryClasses = [fontScaleExtraSmallCategoryClass, fontScaleMediumCategoryClass, fontScaleExtraLargeCategoryClass];
+
+export const a11yServiceEnabledClass = `a11y-service-enabled`;
+export const a11yServiceDisabledClass = `a11y-service-disabled`;
+export const a11yServiceClasses = [a11yServiceEnabledClass, a11yServiceDisabledClass];
+
+let currentFontScale: number = null;
+export function setFontScale(scale: number) {
+	currentFontScale = scale;
+}
+
+export function getFontScale() {
+	return currentFontScale;
+}
+
+export function getFontScaleCategory(): FontScaleCategory {
+	if (__ANDROID__) {
+		return FontScaleCategory.Medium;
+	}
+
+	if (getFontScale() < 0.85) {
+		return FontScaleCategory.ExtraSmall;
+	}
+
+	if (getFontScale() > 1.5) {
+		return FontScaleCategory.ExtraLarge;
+	}
+
+	return FontScaleCategory.Medium;
+}
+
+let initAccessibilityCssHelperCallback: () => void;
+export function setInitAccessibilityCssHelper(callback: () => void) {
+	initAccessibilityCssHelperCallback = callback;
+}
+
+export function readyInitAccessibilityCssHelper() {
+	if (initAccessibilityCssHelperCallback) {
+		initAccessibilityCssHelperCallback();
+		initAccessibilityCssHelperCallback = null;
+	}
+}
+
+let initFontScaleCallback: () => void;
+export function setInitFontScale(callback: () => void) {
+	initFontScaleCallback = callback;
+}
+
+export function readyInitFontScale() {
+	if (initFontScaleCallback) {
+		initFontScaleCallback();
+		initFontScaleCallback = null;
+	}
+}
+
+let fontScaleCssClasses: Map<number, string>;
+export function setFontScaleCssClasses(value: Map<number, string>) {
+	fontScaleCssClasses = value;
+}
+
+export function getFontScaleCssClasses() {
+	return fontScaleCssClasses;
+}
+
+let currentFontScaleClass = '';
+export function setCurrentFontScaleClass(value: string) {
+	currentFontScaleClass = value;
+}
+
+export function getCurrentFontScaleClass() {
+	return currentFontScaleClass;
+}
+let currentFontScaleCategory = '';
+export function setCurrentFontScaleCategory(value: string) {
+	currentFontScaleCategory = value;
+}
+
+export function getCurrentFontScaleCategory() {
+	return currentFontScaleCategory;
+}
+let currentA11YServiceClass = '';
+export function setCurrentA11YServiceClass(value: string) {
+	currentA11YServiceClass = value;
+}
+
+export function getCurrentA11YServiceClass() {
+	return currentA11YServiceClass;
+}
+
+export enum AccessibilityTrait {
+	/**
+	 * The element allows direct touch interaction for VoiceOver users.
+	 */
+	AllowsDirectInteraction = 'allowsDirectInteraction',
+
+	/**
+	 * The element should cause an automatic page turn when VoiceOver finishes reading the text within it.
+	 * Note: Requires custom view with accessibilityScroll(...)
+	 */
+	CausesPageTurn = 'pageTurn',
+
+	/**
+	 * The element is not enabled and does not respond to user interaction.
+	 */
+	NotEnabled = 'disabled',
+
+	/**
+	 * The element is currently selected.
+	 */
+	Selected = 'selected',
+
+	/**
+	 * The element frequently updates its label or value.
+	 */
+	UpdatesFrequently = 'frequentUpdates',
+}
+
+export enum AccessibilityRole {
+	/**
+	 * The element allows continuous adjustment through a range of values.
+	 */
+	Adjustable = 'adjustable',
+
+	/**
+	 * The element should be treated as a button.
+	 */
+	Button = 'button',
+
+	/**
+	 * The element behaves like a Checkbox
+	 */
+	Checkbox = 'checkbox',
+
+	/**
+	 * The element is a header that divides content into sections, such as the title of a navigation bar.
+	 */
+	Header = 'header',
+
+	/**
+	 * The element should be treated as an image.
+	 */
+	Image = 'image',
+
+	/**
+	 * The element should be treated as a image button.
+	 */
+	ImageButton = 'imageButton',
+
+	/**
+	 * The element behaves as a keyboard key.
+	 */
+	KeyboardKey = 'keyboardKey',
+
+	/**
+	 * The element should be treated as a link.
+	 */
+	Link = 'link',
+
+	/**
+	 * The element has no traits.
+	 */
+	None = 'none',
+
+	/**
+	 * The element plays its own sound when activated.
+	 */
+	PlaysSound = 'plays',
+
+	/**
+	 * The element behaves like a ProgressBar
+	 */
+	ProgressBar = 'progressBar',
+
+	/**
+	 * The element behaves like a RadioButton
+	 */
+	RadioButton = 'radioButton',
+
+	/**
+	 * The element should be treated as a search field.
+	 */
+	Search = 'search',
+
+	/**
+	 * The element behaves like a SpinButton
+	 */
+	SpinButton = 'spinButton',
+
+	/**
+	 * The element starts a media session when it is activated.
+	 */
+	StartsMediaSession = 'startsMedia',
+
+	/**
+	 * The element should be treated as static text that cannot change.
+	 */
+	StaticText = 'text',
+
+	/**
+	 * The element provides summary information when the application starts.
+	 */
+	Summary = 'summary',
+
+	/**
+	 * The element behaves like a switch
+	 */
+	Switch = 'switch',
+}
+
+export enum AccessibilityState {
+	Selected = 'selected',
+	Checked = 'checked',
+	Unchecked = 'unchecked',
+	Disabled = 'disabled',
+}
+
+export enum AccessibilityLiveRegion {
+	None = 'none',
+	Polite = 'polite',
+	Assertive = 'assertive',
+}
+
+export enum IOSPostAccessibilityNotificationType {
+	Announcement = 'announcement',
+	Screen = 'screen',
+	Layout = 'layout',
+}
+
+export enum AndroidAccessibilityEvent {
+	/**
+	 * Invalid selection/focus position.
+	 */
+	INVALID_POSITION = 'invalid_position',
+
+	/**
+	 * Maximum length of the text fields.
+	 */
+	MAX_TEXT_LENGTH = 'max_text_length',
+
+	/**
+	 * Represents the event of clicking on a android.view.View like android.widget.Button, android.widget.CompoundButton, etc.
+	 */
+	VIEW_CLICKED = 'view_clicked',
+
+	/**
+	 * Represents the event of long clicking on a android.view.View like android.widget.Button, android.widget.CompoundButton, etc.
+	 */
+	VIEW_LONG_CLICKED = 'view_long_clicked',
+
+	/**
+	 * Represents the event of selecting an item usually in the context of an android.widget.AdapterView.
+	 */
+	VIEW_SELECTED = 'view_selected',
+
+	/**
+	 * Represents the event of setting input focus of a android.view.View.
+	 */
+	VIEW_FOCUSED = 'view_focused',
+
+	/**
+	 * Represents the event of changing the text of an android.widget.EditText.
+	 */
+	VIEW_TEXT_CHANGED = 'view_text_changed',
+
+	/**
+	 * Represents the event of opening a android.widget.PopupWindow, android.view.Menu, android.app.Dialog, etc.
+	 */
+	WINDOW_STATE_CHANGED = 'window_state_changed',
+
+	/**
+	 * Represents the event showing a android.app.Notification.
+	 */
+	NOTIFICATION_STATE_CHANGED = 'notification_state_changed',
+
+	/**
+	 * Represents the event of a hover enter over a android.view.View.
+	 */
+	VIEW_HOVER_ENTER = 'view_hover_enter',
+
+	/**
+	 * Represents the event of a hover exit over a android.view.View.
+	 */
+	VIEW_HOVER_EXIT = 'view_hover_exit',
+	/**
+	 * Represents the event of starting a touch exploration gesture.
+	 */
+	TOUCH_EXPLORATION_GESTURE_START = 'touch_exploration_gesture_start',
+	/**
+	 * Represents the event of ending a touch exploration gesture.
+	 */
+	TOUCH_EXPLORATION_GESTURE_END = 'touch_exploration_gesture_end',
+
+	/**
+	 * Represents the event of changing the content of a window and more specifically the sub-tree rooted at the event's source.
+	 */
+	WINDOW_CONTENT_CHANGED = 'window_content_changed',
+
+	/**
+	 * Represents the event of scrolling a view.
+	 */
+	VIEW_SCROLLED = 'view_scrolled',
+
+	/**
+	 * Represents the event of changing the selection in an android.widget.EditText.
+	 */
+	VIEW_TEXT_SELECTION_CHANGED = 'view_text_selection_changed',
+
+	/**
+	 * Represents the event of an application making an announcement.
+	 */
+	ANNOUNCEMENT = 'announcement',
+
+	/**
+	 * Represents the event of gaining accessibility focus.
+	 */
+	VIEW_ACCESSIBILITY_FOCUSED = 'view_accessibility_focused',
+
+	/**
+	 * Represents the event of clearing accessibility focus.
+	 */
+	VIEW_ACCESSIBILITY_FOCUS_CLEARED = 'view_accessibility_focus_cleared',
+
+	/**
+	 * Represents the event of traversing the text of a view at a given movement granularity.
+	 */
+	VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY = 'view_text_traversed_at_movement_granularity',
+
+	/**
+	 * Represents the event of beginning gesture detection.
+	 */
+	GESTURE_DETECTION_START = 'gesture_detection_start',
+
+	/**
+	 * Represents the event of ending gesture detection.
+	 */
+	GESTURE_DETECTION_END = 'gesture_detection_end',
+
+	/**
+	 * Represents the event of the user starting to touch the screen.
+	 */
+	TOUCH_INTERACTION_START = 'touch_interaction_start',
+
+	/**
+	 * Represents the event of the user ending to touch the screen.
+	 */
+	TOUCH_INTERACTION_END = 'touch_interaction_end',
+
+	/**
+	 * Mask for AccessibilityEvent all types.
+	 */
+	ALL_MASK = 'all',
+}
+
+export interface AccessibilityEventPerformEscape extends EventData {
+	cancel?: boolean;
+}
+
+export interface AccessibilityEventOptions {
+	androidAccessibilityEvent?: AndroidAccessibilityEvent;
+	iosNotificationType?: IOSPostAccessibilityNotificationType;
+	message?: string;
+}
diff --git a/packages/core/accessibility/accessibility-css-helper.ts b/packages/core/accessibility/accessibility-css-helper.ts
deleted file mode 100644
index ec17906146..0000000000
--- a/packages/core/accessibility/accessibility-css-helper.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import { Application } from '../application';
-import type { View } from '../ui/core/view';
-import { AccessibilityServiceEnabledObservable } from './accessibility-service';
-import { FontScaleCategory, getCurrentFontScale, getFontScaleCategory, VALID_FONT_SCALES } from './font-scale';
-
-// CSS-classes
-const fontScaleExtraSmallCategoryClass = `a11y-fontscale-xs`;
-const fontScaleMediumCategoryClass = `a11y-fontscale-m`;
-const fontScaleExtraLargeCategoryClass = `a11y-fontscale-xl`;
-
-const fontScaleCategoryClasses = [fontScaleExtraSmallCategoryClass, fontScaleMediumCategoryClass, fontScaleExtraLargeCategoryClass];
-
-const a11yServiceEnabledClass = `a11y-service-enabled`;
-const a11yServiceDisabledClass = `a11y-service-disabled`;
-const a11yServiceClasses = [a11yServiceEnabledClass, a11yServiceDisabledClass];
-
-let accessibilityServiceObservable: AccessibilityServiceEnabledObservable;
-let fontScaleCssClasses: Map<number, string>;
-
-let currentFontScaleClass = '';
-let currentFontScaleCategory = '';
-let currentA11YServiceClass = '';
-
-function ensureClasses() {
-	if (accessibilityServiceObservable) {
-		return;
-	}
-
-	fontScaleCssClasses = new Map(VALID_FONT_SCALES.map((fs) => [fs, `a11y-fontscale-${Number(fs * 100).toFixed(0)}`]));
-
-	accessibilityServiceObservable = new AccessibilityServiceEnabledObservable();
-}
-
-function applyRootCssClass(cssClasses: string[], newCssClass: string): void {
-	const rootView = Application.getRootView();
-	if (!rootView) {
-		return;
-	}
-
-	Application.applyCssClass(rootView, cssClasses, newCssClass);
-
-	const rootModalViews = <Array<View>>rootView._getRootModalViews();
-	rootModalViews.forEach((rootModalView) => Application.applyCssClass(rootModalView, cssClasses, newCssClass));
-}
-
-function applyFontScaleToRootViews(): void {
-	const rootView = Application.getRootView();
-	if (!rootView) {
-		return;
-	}
-
-	const fontScale = getCurrentFontScale();
-
-	rootView.style.fontScaleInternal = fontScale;
-
-	const rootModalViews = <Array<View>>rootView._getRootModalViews();
-	rootModalViews.forEach((rootModalView) => (rootModalView.style.fontScaleInternal = fontScale));
-}
-
-export function initAccessibilityCssHelper(): void {
-	ensureClasses();
-
-	Application.on(Application.fontScaleChangedEvent, () => {
-		updateCurrentHelperClasses();
-
-		applyFontScaleToRootViews();
-	});
-
-	accessibilityServiceObservable.on(AccessibilityServiceEnabledObservable.propertyChangeEvent, updateCurrentHelperClasses);
-}
-
-/**
- * Update the helper CSS-classes.
- * Return true is any changes.
- */
-function updateCurrentHelperClasses(): void {
-	const fontScale = getCurrentFontScale();
-	const fontScaleCategory = getFontScaleCategory();
-
-	const oldFontScaleClass = currentFontScaleClass;
-	if (fontScaleCssClasses.has(fontScale)) {
-		currentFontScaleClass = fontScaleCssClasses.get(fontScale);
-	} else {
-		currentFontScaleClass = fontScaleCssClasses.get(1);
-	}
-
-	if (oldFontScaleClass !== currentFontScaleClass) {
-		applyRootCssClass([...fontScaleCssClasses.values()], currentFontScaleClass);
-	}
-
-	const oldActiveFontScaleCategory = currentFontScaleCategory;
-	switch (fontScaleCategory) {
-		case FontScaleCategory.ExtraSmall: {
-			currentFontScaleCategory = fontScaleExtraSmallCategoryClass;
-			break;
-		}
-		case FontScaleCategory.Medium: {
-			currentFontScaleCategory = fontScaleMediumCategoryClass;
-			break;
-		}
-		case FontScaleCategory.ExtraLarge: {
-			currentFontScaleCategory = fontScaleExtraLargeCategoryClass;
-			break;
-		}
-		default: {
-			currentFontScaleCategory = fontScaleMediumCategoryClass;
-			break;
-		}
-	}
-
-	if (oldActiveFontScaleCategory !== currentFontScaleCategory) {
-		applyRootCssClass(fontScaleCategoryClasses, currentFontScaleCategory);
-	}
-
-	const oldA11YStatusClass = currentA11YServiceClass;
-	if (accessibilityServiceObservable.accessibilityServiceEnabled) {
-		currentA11YServiceClass = a11yServiceEnabledClass;
-	} else {
-		currentA11YServiceClass = a11yServiceDisabledClass;
-	}
-
-	if (oldA11YStatusClass !== currentA11YServiceClass) {
-		applyRootCssClass(a11yServiceClasses, currentA11YServiceClass);
-	}
-}
diff --git a/packages/core/accessibility/accessibility-properties.ts b/packages/core/accessibility/accessibility-properties.ts
index 96d99df747..0ff7bbece8 100644
--- a/packages/core/accessibility/accessibility-properties.ts
+++ b/packages/core/accessibility/accessibility-properties.ts
@@ -1,8 +1,8 @@
 import { CssProperty, InheritedCssProperty, Property } from '../ui/core/properties';
 import type { View } from '../ui/core/view';
-import { booleanConverter } from '../ui/core/view-base';
+import { booleanConverter } from '../ui/core/view-base/utils';
 import { Style } from '../ui/styling/style';
-import { AccessibilityLiveRegion, AccessibilityRole, AccessibilityState, AccessibilityTrait } from './accessibility-types';
+import { AccessibilityLiveRegion, AccessibilityRole, AccessibilityState, AccessibilityTrait } from './accessibility-common';
 
 function makePropertyEnumConverter<T>(enumValues) {
 	return (value: string): T | null => {
diff --git a/packages/core/accessibility/accessibility-service-common.ts b/packages/core/accessibility/accessibility-service-common.ts
deleted file mode 100644
index 8ea7503be7..0000000000
--- a/packages/core/accessibility/accessibility-service-common.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Observable } from '../data/observable';
-
-export class SharedA11YObservable extends Observable {
-	accessibilityServiceEnabled?: boolean;
-}
-
-export const AccessibilityServiceEnabledPropName = 'accessibilityServiceEnabled';
-
-export class CommonA11YServiceEnabledObservable extends SharedA11YObservable {
-	constructor(sharedA11YObservable: SharedA11YObservable) {
-		super();
-
-		const ref = new WeakRef(this);
-		let lastValue: boolean;
-
-		function callback() {
-			const self = ref?.get();
-			if (!self) {
-				sharedA11YObservable.off(Observable.propertyChangeEvent, callback);
-
-				return;
-			}
-
-			const newValue = !!sharedA11YObservable.accessibilityServiceEnabled;
-			if (newValue !== lastValue) {
-				self.set(AccessibilityServiceEnabledPropName, newValue);
-				lastValue = newValue;
-			}
-		}
-
-		sharedA11YObservable.on(Observable.propertyChangeEvent, callback);
-
-		this.set(AccessibilityServiceEnabledPropName, !!sharedA11YObservable.accessibilityServiceEnabled);
-	}
-}
diff --git a/packages/core/accessibility/accessibility-service.android.ts b/packages/core/accessibility/accessibility-service.android.ts
deleted file mode 100644
index 757963c35b..0000000000
--- a/packages/core/accessibility/accessibility-service.android.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import { Application, ApplicationEventData } from '../application';
-import { Observable } from '../data/observable';
-import { Trace } from '../trace';
-import * as Utils from '../utils';
-import { SDK_VERSION } from '../utils/constants';
-import { CommonA11YServiceEnabledObservable, SharedA11YObservable } from './accessibility-service-common';
-
-export function getAndroidAccessibilityManager(): android.view.accessibility.AccessibilityManager | null {
-	const context = Utils.ad.getApplicationContext() as android.content.Context;
-	if (!context) {
-		return null;
-	}
-
-	return context.getSystemService(android.content.Context.ACCESSIBILITY_SERVICE) as android.view.accessibility.AccessibilityManager;
-}
-
-const accessibilityStateEnabledPropName = 'accessibilityStateEnabled';
-const touchExplorationStateEnabledPropName = 'touchExplorationStateEnabled';
-
-class AndroidSharedA11YObservable extends SharedA11YObservable {
-	[accessibilityStateEnabledPropName]: boolean;
-	[touchExplorationStateEnabledPropName]: boolean;
-
-	// @ts-ignore todo: fix
-	get accessibilityServiceEnabled(): boolean {
-		return !!this[accessibilityStateEnabledPropName] && !!this[touchExplorationStateEnabledPropName];
-	}
-
-	set accessibilityServiceEnabled(v) {
-		return;
-	}
-}
-
-let accessibilityStateChangeListener: android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener;
-let touchExplorationStateChangeListener: android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener;
-let sharedA11YObservable: AndroidSharedA11YObservable;
-
-function updateAccessibilityState(): void {
-	const accessibilityManager = getAndroidAccessibilityManager();
-	if (!accessibilityManager) {
-		sharedA11YObservable.set(accessibilityStateEnabledPropName, false);
-		sharedA11YObservable.set(touchExplorationStateEnabledPropName, false);
-
-		return;
-	}
-
-	sharedA11YObservable.set(accessibilityStateEnabledPropName, !!accessibilityManager.isEnabled());
-	sharedA11YObservable.set(touchExplorationStateEnabledPropName, !!accessibilityManager.isTouchExplorationEnabled());
-}
-
-function ensureStateListener(): SharedA11YObservable {
-	if (sharedA11YObservable) {
-		return sharedA11YObservable;
-	}
-
-	const accessibilityManager = getAndroidAccessibilityManager();
-	sharedA11YObservable = new AndroidSharedA11YObservable();
-
-	if (!accessibilityManager) {
-		sharedA11YObservable.set(accessibilityStateEnabledPropName, false);
-		sharedA11YObservable.set(touchExplorationStateEnabledPropName, false);
-
-		return sharedA11YObservable;
-	}
-
-	accessibilityStateChangeListener = new android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener({
-		onAccessibilityStateChanged(enabled) {
-			updateAccessibilityState();
-
-			if (Trace.isEnabled()) {
-				Trace.write(`AccessibilityStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
-			}
-		},
-	});
-	accessibilityManager.addAccessibilityStateChangeListener(accessibilityStateChangeListener);
-
-	if (SDK_VERSION >= 19) {
-		touchExplorationStateChangeListener = new android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener({
-			onTouchExplorationStateChanged(enabled) {
-				updateAccessibilityState();
-
-				if (Trace.isEnabled()) {
-					Trace.write(`TouchExplorationStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
-				}
-			},
-		});
-		accessibilityManager.addTouchExplorationStateChangeListener(touchExplorationStateChangeListener);
-	}
-
-	updateAccessibilityState();
-
-	Application.on(Application.resumeEvent, updateAccessibilityState);
-	Application.on(Application.exitEvent, (args: ApplicationEventData) => {
-		const activity = args.android as android.app.Activity;
-		if (activity && !activity.isFinishing()) {
-			return;
-		}
-
-		const accessibilityManager = getAndroidAccessibilityManager();
-		if (accessibilityManager) {
-			if (accessibilityStateChangeListener) {
-				accessibilityManager.removeAccessibilityStateChangeListener(accessibilityStateChangeListener);
-			}
-
-			if (touchExplorationStateChangeListener) {
-				accessibilityManager.removeTouchExplorationStateChangeListener(touchExplorationStateChangeListener);
-			}
-		}
-
-		accessibilityStateChangeListener = null;
-		touchExplorationStateChangeListener = null;
-
-		if (sharedA11YObservable) {
-			sharedA11YObservable.removeEventListener(Observable.propertyChangeEvent);
-			sharedA11YObservable = null;
-		}
-
-		Application.off(Application.resumeEvent, updateAccessibilityState);
-	});
-
-	return sharedA11YObservable;
-}
-
-export function isAccessibilityServiceEnabled(): boolean {
-	return ensureStateListener().accessibilityServiceEnabled;
-}
-
-export class AccessibilityServiceEnabledObservable extends CommonA11YServiceEnabledObservable {
-	constructor() {
-		super(ensureStateListener());
-	}
-}
diff --git a/packages/core/accessibility/accessibility-service.d.ts b/packages/core/accessibility/accessibility-service.d.ts
deleted file mode 100644
index 4a7fbd2dbb..0000000000
--- a/packages/core/accessibility/accessibility-service.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Observable } from '../data/observable';
-
-export class AccessibilityServiceEnabledObservable extends Observable {
-	public readonly accessibilityServiceEnabled?: boolean;
-}
-
-/**
- * Get the Android platform's AccessibilityManager.
- */
-export function getAndroidAccessibilityManager(): /* android.view.accessibility.AccessibilityManager */ any | null;
diff --git a/packages/core/accessibility/accessibility-service.ios.ts b/packages/core/accessibility/accessibility-service.ios.ts
deleted file mode 100644
index 116986a49b..0000000000
--- a/packages/core/accessibility/accessibility-service.ios.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { Application } from '../application';
-import { Observable } from '../data/observable';
-import { Trace } from '../trace';
-import { AccessibilityServiceEnabledPropName, CommonA11YServiceEnabledObservable, SharedA11YObservable } from './accessibility-service-common';
-
-export function isAccessibilityServiceEnabled(): boolean {
-	return getSharedA11YObservable().accessibilityServiceEnabled;
-}
-
-export function getAndroidAccessibilityManager(): null {
-	return null;
-}
-
-let sharedA11YObservable: SharedA11YObservable;
-let nativeObserver;
-
-function getSharedA11YObservable(): SharedA11YObservable {
-	if (sharedA11YObservable) {
-		return sharedA11YObservable;
-	}
-
-	sharedA11YObservable = new SharedA11YObservable();
-
-	let isVoiceOverRunning: () => boolean;
-	if (typeof UIAccessibilityIsVoiceOverRunning === 'function') {
-		isVoiceOverRunning = UIAccessibilityIsVoiceOverRunning;
-	} else {
-		if (typeof UIAccessibilityIsVoiceOverRunning !== 'function') {
-			Trace.write(`UIAccessibilityIsVoiceOverRunning() - is not a function`, Trace.categories.Accessibility, Trace.messageType.error);
-
-			isVoiceOverRunning = () => false;
-		}
-	}
-
-	sharedA11YObservable.set(AccessibilityServiceEnabledPropName, isVoiceOverRunning());
-
-	let voiceOverStatusChangedNotificationName: string | null = null;
-	if (typeof UIAccessibilityVoiceOverStatusDidChangeNotification !== 'undefined') {
-		// iOS 11+
-		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusDidChangeNotification;
-	} else if (typeof UIAccessibilityVoiceOverStatusChanged !== 'undefined') {
-		// iOS <11
-		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusChanged;
-	}
-
-	if (voiceOverStatusChangedNotificationName) {
-		nativeObserver = Application.ios.addNotificationObserver(voiceOverStatusChangedNotificationName, () => {
-			sharedA11YObservable?.set(AccessibilityServiceEnabledPropName, isVoiceOverRunning());
-		});
-
-		Application.on(Application.exitEvent, () => {
-			if (nativeObserver) {
-				Application.ios.removeNotificationObserver(nativeObserver, voiceOverStatusChangedNotificationName);
-			}
-
-			nativeObserver = null;
-
-			if (sharedA11YObservable) {
-				sharedA11YObservable.removeEventListener(Observable.propertyChangeEvent);
-
-				sharedA11YObservable = null;
-			}
-		});
-	}
-
-	Application.on(Application.resumeEvent, () => sharedA11YObservable.set(AccessibilityServiceEnabledPropName, isVoiceOverRunning()));
-
-	return sharedA11YObservable;
-}
-
-export class AccessibilityServiceEnabledObservable extends CommonA11YServiceEnabledObservable {
-	constructor() {
-		super(getSharedA11YObservable());
-	}
-}
diff --git a/packages/core/accessibility/accessibility-types.ts b/packages/core/accessibility/accessibility-types.ts
deleted file mode 100644
index 48e3cac44b..0000000000
--- a/packages/core/accessibility/accessibility-types.ts
+++ /dev/null
@@ -1,275 +0,0 @@
-import type { EventData } from '../data/observable';
-
-export enum AccessibilityTrait {
-	/**
-	 * The element allows direct touch interaction for VoiceOver users.
-	 */
-	AllowsDirectInteraction = 'allowsDirectInteraction',
-
-	/**
-	 * The element should cause an automatic page turn when VoiceOver finishes reading the text within it.
-	 * Note: Requires custom view with accessibilityScroll(...)
-	 */
-	CausesPageTurn = 'pageTurn',
-
-	/**
-	 * The element is not enabled and does not respond to user interaction.
-	 */
-	NotEnabled = 'disabled',
-
-	/**
-	 * The element is currently selected.
-	 */
-	Selected = 'selected',
-
-	/**
-	 * The element frequently updates its label or value.
-	 */
-	UpdatesFrequently = 'frequentUpdates',
-}
-
-export enum AccessibilityRole {
-	/**
-	 * The element allows continuous adjustment through a range of values.
-	 */
-	Adjustable = 'adjustable',
-
-	/**
-	 * The element should be treated as a button.
-	 */
-	Button = 'button',
-
-	/**
-	 * The element behaves like a Checkbox
-	 */
-	Checkbox = 'checkbox',
-
-	/**
-	 * The element is a header that divides content into sections, such as the title of a navigation bar.
-	 */
-	Header = 'header',
-
-	/**
-	 * The element should be treated as an image.
-	 */
-	Image = 'image',
-
-	/**
-	 * The element should be treated as a image button.
-	 */
-	ImageButton = 'imageButton',
-
-	/**
-	 * The element behaves as a keyboard key.
-	 */
-	KeyboardKey = 'keyboardKey',
-
-	/**
-	 * The element should be treated as a link.
-	 */
-	Link = 'link',
-
-	/**
-	 * The element has no traits.
-	 */
-	None = 'none',
-
-	/**
-	 * The element plays its own sound when activated.
-	 */
-	PlaysSound = 'plays',
-
-	/**
-	 * The element behaves like a ProgressBar
-	 */
-	ProgressBar = 'progressBar',
-
-	/**
-	 * The element behaves like a RadioButton
-	 */
-	RadioButton = 'radioButton',
-
-	/**
-	 * The element should be treated as a search field.
-	 */
-	Search = 'search',
-
-	/**
-	 * The element behaves like a SpinButton
-	 */
-	SpinButton = 'spinButton',
-
-	/**
-	 * The element starts a media session when it is activated.
-	 */
-	StartsMediaSession = 'startsMedia',
-
-	/**
-	 * The element should be treated as static text that cannot change.
-	 */
-	StaticText = 'text',
-
-	/**
-	 * The element provides summary information when the application starts.
-	 */
-	Summary = 'summary',
-
-	/**
-	 * The element behaves like a switch
-	 */
-	Switch = 'switch',
-}
-
-export enum AccessibilityState {
-	Selected = 'selected',
-	Checked = 'checked',
-	Unchecked = 'unchecked',
-	Disabled = 'disabled',
-}
-
-export enum AccessibilityLiveRegion {
-	None = 'none',
-	Polite = 'polite',
-	Assertive = 'assertive',
-}
-
-export enum IOSPostAccessibilityNotificationType {
-	Announcement = 'announcement',
-	Screen = 'screen',
-	Layout = 'layout',
-}
-
-export enum AndroidAccessibilityEvent {
-	/**
-	 * Invalid selection/focus position.
-	 */
-	INVALID_POSITION = 'invalid_position',
-
-	/**
-	 * Maximum length of the text fields.
-	 */
-	MAX_TEXT_LENGTH = 'max_text_length',
-
-	/**
-	 * Represents the event of clicking on a android.view.View like android.widget.Button, android.widget.CompoundButton, etc.
-	 */
-	VIEW_CLICKED = 'view_clicked',
-
-	/**
-	 * Represents the event of long clicking on a android.view.View like android.widget.Button, android.widget.CompoundButton, etc.
-	 */
-	VIEW_LONG_CLICKED = 'view_long_clicked',
-
-	/**
-	 * Represents the event of selecting an item usually in the context of an android.widget.AdapterView.
-	 */
-	VIEW_SELECTED = 'view_selected',
-
-	/**
-	 * Represents the event of setting input focus of a android.view.View.
-	 */
-	VIEW_FOCUSED = 'view_focused',
-
-	/**
-	 * Represents the event of changing the text of an android.widget.EditText.
-	 */
-	VIEW_TEXT_CHANGED = 'view_text_changed',
-
-	/**
-	 * Represents the event of opening a android.widget.PopupWindow, android.view.Menu, android.app.Dialog, etc.
-	 */
-	WINDOW_STATE_CHANGED = 'window_state_changed',
-
-	/**
-	 * Represents the event showing a android.app.Notification.
-	 */
-	NOTIFICATION_STATE_CHANGED = 'notification_state_changed',
-
-	/**
-	 * Represents the event of a hover enter over a android.view.View.
-	 */
-	VIEW_HOVER_ENTER = 'view_hover_enter',
-
-	/**
-	 * Represents the event of a hover exit over a android.view.View.
-	 */
-	VIEW_HOVER_EXIT = 'view_hover_exit',
-	/**
-	 * Represents the event of starting a touch exploration gesture.
-	 */
-	TOUCH_EXPLORATION_GESTURE_START = 'touch_exploration_gesture_start',
-	/**
-	 * Represents the event of ending a touch exploration gesture.
-	 */
-	TOUCH_EXPLORATION_GESTURE_END = 'touch_exploration_gesture_end',
-
-	/**
-	 * Represents the event of changing the content of a window and more specifically the sub-tree rooted at the event's source.
-	 */
-	WINDOW_CONTENT_CHANGED = 'window_content_changed',
-
-	/**
-	 * Represents the event of scrolling a view.
-	 */
-	VIEW_SCROLLED = 'view_scrolled',
-
-	/**
-	 * Represents the event of changing the selection in an android.widget.EditText.
-	 */
-	VIEW_TEXT_SELECTION_CHANGED = 'view_text_selection_changed',
-
-	/**
-	 * Represents the event of an application making an announcement.
-	 */
-	ANNOUNCEMENT = 'announcement',
-
-	/**
-	 * Represents the event of gaining accessibility focus.
-	 */
-	VIEW_ACCESSIBILITY_FOCUSED = 'view_accessibility_focused',
-
-	/**
-	 * Represents the event of clearing accessibility focus.
-	 */
-	VIEW_ACCESSIBILITY_FOCUS_CLEARED = 'view_accessibility_focus_cleared',
-
-	/**
-	 * Represents the event of traversing the text of a view at a given movement granularity.
-	 */
-	VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY = 'view_text_traversed_at_movement_granularity',
-
-	/**
-	 * Represents the event of beginning gesture detection.
-	 */
-	GESTURE_DETECTION_START = 'gesture_detection_start',
-
-	/**
-	 * Represents the event of ending gesture detection.
-	 */
-	GESTURE_DETECTION_END = 'gesture_detection_end',
-
-	/**
-	 * Represents the event of the user starting to touch the screen.
-	 */
-	TOUCH_INTERACTION_START = 'touch_interaction_start',
-
-	/**
-	 * Represents the event of the user ending to touch the screen.
-	 */
-	TOUCH_INTERACTION_END = 'touch_interaction_end',
-
-	/**
-	 * Mask for AccessibilityEvent all types.
-	 */
-	ALL_MASK = 'all',
-}
-
-export interface AccessibilityEventPerformEscape extends EventData {
-	cancel?: boolean;
-}
-
-export interface AccessibilityEventOptions {
-	androidAccessibilityEvent?: AndroidAccessibilityEvent;
-	iosNotificationType?: IOSPostAccessibilityNotificationType;
-	message?: string;
-}
diff --git a/packages/core/accessibility/font-scale-common.ts b/packages/core/accessibility/font-scale-common.ts
deleted file mode 100644
index 976793f434..0000000000
--- a/packages/core/accessibility/font-scale-common.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export const VALID_FONT_SCALES = __APPLE__ // Apple supports a wider number of font scales than Android does.
-	? [0.5, 0.7, 0.85, 1, 1.15, 1.3, 1.5, 2, 2.5, 3, 3.5, 4]
-	: [0.85, 1, 1.15, 1.3];
-
-export function getClosestValidFontScale(fontScale: number): number {
-	fontScale = Number(fontScale) || 1;
-
-	return VALID_FONT_SCALES.sort((a, b) => Math.abs(fontScale - a) - Math.abs(fontScale - b))[0];
-}
-
-export enum FontScaleCategory {
-	ExtraSmall = 'extra-small',
-	Medium = 'medium',
-	ExtraLarge = 'extra-large',
-}
diff --git a/packages/core/accessibility/font-scale.android.ts b/packages/core/accessibility/font-scale.android.ts
deleted file mode 100644
index 46469b305e..0000000000
--- a/packages/core/accessibility/font-scale.android.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { Application, ApplicationEventData } from '../application';
-import { FontScaleCategory, getClosestValidFontScale } from './font-scale-common';
-export * from './font-scale-common';
-
-let currentFontScale: number = null;
-function fontScaleChanged(origFontScale: number) {
-	const oldValue = currentFontScale;
-	currentFontScale = getClosestValidFontScale(origFontScale);
-
-	if (oldValue !== currentFontScale) {
-		Application.notify({
-			eventName: Application.fontScaleChangedEvent,
-			object: Application,
-			newValue: currentFontScale,
-		} as ApplicationEventData);
-	}
-}
-
-export function getCurrentFontScale(): number {
-	setupConfigListener();
-
-	return currentFontScale;
-}
-
-export function getFontScaleCategory(): FontScaleCategory {
-	return FontScaleCategory.Medium;
-}
-
-function useAndroidFontScale() {
-	fontScaleChanged(Number(Application.android.context.getResources().getConfiguration().fontScale));
-}
-
-let configChangedCallback: android.content.ComponentCallbacks2;
-function setupConfigListener() {
-	if (configChangedCallback) {
-		return;
-	}
-
-	Application.off(Application.launchEvent, setupConfigListener);
-	const context = Application.android?.context as android.content.Context;
-	if (!context) {
-		Application.on(Application.launchEvent, setupConfigListener);
-
-		return;
-	}
-
-	useAndroidFontScale();
-
-	configChangedCallback = new android.content.ComponentCallbacks2({
-		onLowMemory() {
-			// Dummy
-		},
-		onTrimMemory() {
-			// Dummy
-		},
-		onConfigurationChanged(newConfig: android.content.res.Configuration) {
-			fontScaleChanged(Number(newConfig.fontScale));
-		},
-	});
-
-	context.registerComponentCallbacks(configChangedCallback);
-	Application.on(Application.resumeEvent, useAndroidFontScale);
-}
-
-export function initAccessibilityFontScale(): void {
-	setupConfigListener();
-}
diff --git a/packages/core/accessibility/font-scale.d.ts b/packages/core/accessibility/font-scale.d.ts
deleted file mode 100644
index bfc8635f2d..0000000000
--- a/packages/core/accessibility/font-scale.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export const VALID_FONT_SCALES: number[];
-export function getCurrentFontScale(): number;
-export enum FontScaleCategory {
-	ExtraSmall = 'extra-small',
-	Medium = 'medium',
-	ExtraLarge = 'extra-large',
-}
-export function getFontScaleCategory(): FontScaleCategory;
-export function initAccessibilityFontScale(): void;
diff --git a/packages/core/accessibility/font-scale.ios.ts b/packages/core/accessibility/font-scale.ios.ts
deleted file mode 100644
index 054366b61d..0000000000
--- a/packages/core/accessibility/font-scale.ios.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { Application } from '../application';
-import { FontScaleCategory, getClosestValidFontScale } from './font-scale-common';
-export * from './font-scale-common';
-
-let currentFontScale: number = null;
-function fontScaleChanged(origFontScale: number) {
-	const oldValue = currentFontScale;
-	currentFontScale = getClosestValidFontScale(origFontScale);
-
-	if (oldValue !== currentFontScale) {
-		Application.notify({
-			eventName: Application.fontScaleChangedEvent,
-			object: Application,
-			newValue: currentFontScale,
-		});
-	}
-}
-
-export function getCurrentFontScale(): number {
-	setupConfigListener();
-
-	return currentFontScale;
-}
-
-export function getFontScaleCategory(): FontScaleCategory {
-	if (currentFontScale < 0.85) {
-		return FontScaleCategory.ExtraSmall;
-	}
-
-	if (currentFontScale > 1.5) {
-		return FontScaleCategory.ExtraLarge;
-	}
-
-	return FontScaleCategory.Medium;
-}
-
-const sizeMap = new Map<string, number>([
-	[UIContentSizeCategoryExtraSmall, 0.5],
-	[UIContentSizeCategorySmall, 0.7],
-	[UIContentSizeCategoryMedium, 0.85],
-	[UIContentSizeCategoryLarge, 1],
-	[UIContentSizeCategoryExtraLarge, 1.15],
-	[UIContentSizeCategoryExtraExtraLarge, 1.3],
-	[UIContentSizeCategoryExtraExtraExtraLarge, 1.5],
-	[UIContentSizeCategoryAccessibilityMedium, 2],
-	[UIContentSizeCategoryAccessibilityLarge, 2.5],
-	[UIContentSizeCategoryAccessibilityExtraLarge, 3],
-	[UIContentSizeCategoryAccessibilityExtraExtraLarge, 3.5],
-	[UIContentSizeCategoryAccessibilityExtraExtraExtraLarge, 4],
-]);
-
-function contentSizeUpdated(fontSize: string) {
-	if (sizeMap.has(fontSize)) {
-		fontScaleChanged(sizeMap.get(fontSize));
-
-		return;
-	}
-
-	fontScaleChanged(1);
-}
-
-function useIOSFontScale() {
-	if (Application.ios.nativeApp) {
-		contentSizeUpdated(Application.ios.nativeApp.preferredContentSizeCategory);
-	} else {
-		fontScaleChanged(1);
-	}
-}
-
-let fontSizeObserver;
-function setupConfigListener(attempt = 0) {
-	if (fontSizeObserver) {
-		return;
-	}
-
-	if (!Application.ios.nativeApp) {
-		if (attempt > 100) {
-			fontScaleChanged(1);
-
-			return;
-		}
-
-		// Couldn't get launchEvent to trigger.
-		setTimeout(() => setupConfigListener(attempt + 1), 1);
-
-		return;
-	}
-
-	fontSizeObserver = Application.ios.addNotificationObserver(UIContentSizeCategoryDidChangeNotification, (args) => {
-		const fontSize = args.userInfo.valueForKey(UIContentSizeCategoryNewValueKey);
-		contentSizeUpdated(fontSize);
-	});
-
-	Application.on(Application.exitEvent, () => {
-		if (fontSizeObserver) {
-			Application.ios.removeNotificationObserver(fontSizeObserver, UIContentSizeCategoryDidChangeNotification);
-			fontSizeObserver = null;
-		}
-
-		Application.off(Application.resumeEvent, useIOSFontScale);
-	});
-
-	Application.on(Application.resumeEvent, useIOSFontScale);
-
-	useIOSFontScale();
-}
-
-export function initAccessibilityFontScale(): void {
-	setupConfigListener();
-}
diff --git a/packages/core/accessibility/index.android.ts b/packages/core/accessibility/index.android.ts
deleted file mode 100644
index cadd85e992..0000000000
--- a/packages/core/accessibility/index.android.ts
+++ /dev/null
@@ -1,690 +0,0 @@
-import { Application, ApplicationEventData } from '../application';
-import { Trace } from '../trace';
-import { SDK_VERSION } from '../utils/constants';
-import { resources } from '../utils/android';
-import type { View } from '../ui/core/view';
-import { GestureTypes } from '../ui/gestures';
-import { notifyAccessibilityFocusState } from './accessibility-common';
-import { getAndroidAccessibilityManager } from './accessibility-service';
-import { AccessibilityRole, AccessibilityState, AndroidAccessibilityEvent } from './accessibility-types';
-
-export * from './accessibility-common';
-export * from './accessibility-types';
-export * from './font-scale';
-
-let clickableRolesMap = new Set<string>();
-
-let lastFocusedView: WeakRef<View>;
-function accessibilityEventHelper(view: View, eventType: number) {
-	const eventName = accessibilityEventTypeMap.get(eventType);
-	if (!isAccessibilityServiceEnabled()) {
-		if (Trace.isEnabled()) {
-			Trace.write(`accessibilityEventHelper: Service not active`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	if (!eventName) {
-		Trace.write(`accessibilityEventHelper: unknown eventType: ${eventType}`, Trace.categories.Accessibility, Trace.messageType.error);
-
-		return;
-	}
-
-	if (!view) {
-		if (Trace.isEnabled()) {
-			Trace.write(`accessibilityEventHelper: no owner: ${eventName}`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	const androidView = view.nativeViewProtected as android.view.View;
-	if (!androidView) {
-		if (Trace.isEnabled()) {
-			Trace.write(`accessibilityEventHelper: no nativeView`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	switch (eventType) {
-		case android.view.accessibility.AccessibilityEvent.TYPE_VIEW_CLICKED: {
-			/**
-			 * Android API >= 26 handles accessibility tap-events by converting them to TYPE_VIEW_CLICKED
-			 * These aren't triggered for custom tap events in NativeScript.
-			 */
-			if (SDK_VERSION >= 26) {
-				// Find all tap gestures and trigger them.
-				for (const tapGesture of view.getGestureObservers(GestureTypes.tap) ?? []) {
-					tapGesture.callback({
-						android: view.android,
-						eventName: 'tap',
-						ios: null,
-						object: view,
-						type: GestureTypes.tap,
-						view: view,
-					});
-				}
-			}
-
-			return;
-		}
-		case android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED: {
-			const lastView = lastFocusedView?.get();
-			if (lastView && view !== lastView) {
-				const lastAndroidView = lastView.nativeViewProtected as android.view.View;
-				if (lastAndroidView) {
-					lastAndroidView.clearFocus();
-					lastFocusedView = null;
-
-					notifyAccessibilityFocusState(lastView, false, true);
-				}
-			}
-
-			lastFocusedView = new WeakRef(view);
-
-			notifyAccessibilityFocusState(view, true, false);
-
-			return;
-		}
-		case android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED: {
-			const lastView = lastFocusedView?.get();
-			if (lastView && view === lastView) {
-				lastFocusedView = null;
-				androidView.clearFocus();
-			}
-
-			notifyAccessibilityFocusState(view, false, true);
-
-			return;
-		}
-	}
-}
-
-let TNSAccessibilityDelegate: android.view.View.androidviewViewAccessibilityDelegate;
-
-const androidViewToTNSView = new WeakMap<android.view.View, WeakRef<View>>();
-
-let accessibilityEventMap: Map<AndroidAccessibilityEvent, number>;
-let accessibilityEventTypeMap: Map<number, string>;
-
-function ensureNativeClasses() {
-	if (TNSAccessibilityDelegate) {
-		return;
-	}
-
-	// WORKAROUND: Typing refers to android.view.View.androidviewViewAccessibilityDelegate but it is called android.view.View.AccessibilityDelegate at runtime
-	const AccessibilityDelegate: typeof android.view.View.androidviewViewAccessibilityDelegate = android.view.View['AccessibilityDelegate'];
-
-	const RoleTypeMap = new Map<AccessibilityRole, string>([
-		[AccessibilityRole.Button, android.widget.Button.class.getName()],
-		[AccessibilityRole.Search, android.widget.EditText.class.getName()],
-		[AccessibilityRole.Image, android.widget.ImageView.class.getName()],
-		[AccessibilityRole.ImageButton, android.widget.ImageButton.class.getName()],
-		[AccessibilityRole.KeyboardKey, android.inputmethodservice.Keyboard.Key.class.getName()],
-		[AccessibilityRole.StaticText, android.widget.TextView.class.getName()],
-		[AccessibilityRole.Adjustable, android.widget.SeekBar.class.getName()],
-		[AccessibilityRole.Checkbox, android.widget.CheckBox.class.getName()],
-		[AccessibilityRole.RadioButton, android.widget.RadioButton.class.getName()],
-		[AccessibilityRole.SpinButton, android.widget.Spinner.class.getName()],
-		[AccessibilityRole.Switch, android.widget.Switch.class.getName()],
-		[AccessibilityRole.ProgressBar, android.widget.ProgressBar.class.getName()],
-	]);
-
-	clickableRolesMap = new Set<string>([AccessibilityRole.Button, AccessibilityRole.ImageButton]);
-
-	const ignoreRoleTypesForTrace = new Set([AccessibilityRole.Header, AccessibilityRole.Link, AccessibilityRole.None, AccessibilityRole.Summary]);
-
-	@NativeClass()
-	class TNSAccessibilityDelegateImpl extends AccessibilityDelegate {
-		constructor() {
-			super();
-
-			return global.__native(this);
-		}
-
-		private getTnsView(androidView: android.view.View) {
-			const view = androidViewToTNSView.get(androidView)?.get();
-			if (!view) {
-				androidViewToTNSView.delete(androidView);
-
-				return null;
-			}
-
-			return view;
-		}
-
-		public onInitializeAccessibilityNodeInfo(host: android.view.View, info: android.view.accessibility.AccessibilityNodeInfo) {
-			super.onInitializeAccessibilityNodeInfo(host, info);
-
-			const view = this.getTnsView(host);
-			if (!view) {
-				if (Trace.isEnabled()) {
-					Trace.write(`onInitializeAccessibilityNodeInfo ${host} ${info} no tns-view`, Trace.categories.Accessibility);
-				}
-
-				return;
-			}
-
-			// Set resource id that can be used with test frameworks without polluting the content description.
-			const id = host.getTag(resources.getId(`:id/nativescript_accessibility_id`));
-			if (id != null) {
-				info.setViewIdResourceName(id);
-			}
-
-			const accessibilityRole = view.accessibilityRole;
-			if (accessibilityRole) {
-				const androidClassName = RoleTypeMap.get(accessibilityRole);
-				if (androidClassName) {
-					const oldClassName = info.getClassName() || (SDK_VERSION >= 28 && host.getAccessibilityClassName()) || null;
-					info.setClassName(androidClassName);
-
-					if (Trace.isEnabled()) {
-						Trace.write(`${view}.accessibilityRole = "${accessibilityRole}" is mapped to "${androidClassName}" (was ${oldClassName}). ${info.getClassName()}`, Trace.categories.Accessibility);
-					}
-				} else if (!ignoreRoleTypesForTrace.has(accessibilityRole)) {
-					if (Trace.isEnabled()) {
-						Trace.write(`${view}.accessibilityRole = "${accessibilityRole}" is unknown`, Trace.categories.Accessibility);
-					}
-				}
-
-				if (clickableRolesMap.has(accessibilityRole)) {
-					if (Trace.isEnabled()) {
-						Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set clickable role=${accessibilityRole}`, Trace.categories.Accessibility);
-					}
-
-					info.setClickable(true);
-				}
-
-				if (SDK_VERSION >= 28) {
-					if (accessibilityRole === AccessibilityRole.Header) {
-						if (Trace.isEnabled()) {
-							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set heading role=${accessibilityRole}`, Trace.categories.Accessibility);
-						}
-
-						info.setHeading(true);
-					} else if (host.isAccessibilityHeading()) {
-						if (Trace.isEnabled()) {
-							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set heading from host`, Trace.categories.Accessibility);
-						}
-
-						info.setHeading(true);
-					} else {
-						if (Trace.isEnabled()) {
-							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set not heading`, Trace.categories.Accessibility);
-						}
-
-						info.setHeading(false);
-					}
-				}
-
-				switch (accessibilityRole) {
-					case AccessibilityRole.Switch:
-					case AccessibilityRole.RadioButton:
-					case AccessibilityRole.Checkbox: {
-						if (Trace.isEnabled()) {
-							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set checkable and check=${view.accessibilityState === AccessibilityState.Checked}`, Trace.categories.Accessibility);
-						}
-
-						info.setCheckable(true);
-						info.setChecked(view.accessibilityState === AccessibilityState.Checked);
-						break;
-					}
-					default: {
-						if (Trace.isEnabled()) {
-							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set enabled=${view.accessibilityState !== AccessibilityState.Disabled} and selected=${view.accessibilityState === AccessibilityState.Selected}`, Trace.categories.Accessibility);
-						}
-
-						info.setEnabled(view.accessibilityState !== AccessibilityState.Disabled);
-						info.setSelected(view.accessibilityState === AccessibilityState.Selected);
-						break;
-					}
-				}
-			}
-
-			if (view.accessible) {
-				info.setFocusable(true);
-			}
-		}
-
-		public sendAccessibilityEvent(host: android.view.ViewGroup, eventType: number) {
-			super.sendAccessibilityEvent(host, eventType);
-			const view = this.getTnsView(host);
-			if (!view) {
-				console.log(`skip - ${host} - ${accessibilityEventTypeMap.get(eventType)}`);
-
-				return;
-			}
-
-			try {
-				accessibilityEventHelper(view, eventType);
-			} catch (err) {
-				console.error(err);
-			}
-		}
-	}
-
-	TNSAccessibilityDelegate = new TNSAccessibilityDelegateImpl();
-
-	accessibilityEventMap = new Map<AndroidAccessibilityEvent, number>([
-		/**
-		 * Invalid selection/focus position.
-		 */
-		[AndroidAccessibilityEvent.INVALID_POSITION, android.view.accessibility.AccessibilityEvent.INVALID_POSITION],
-		/**
-		 * Maximum length of the text fields.
-		 */
-		[AndroidAccessibilityEvent.MAX_TEXT_LENGTH, android.view.accessibility.AccessibilityEvent.MAX_TEXT_LENGTH],
-		/**
-		 * Represents the event of clicking on a android.view.View like android.widget.Button, android.widget.CompoundButton, etc.
-		 */
-		[AndroidAccessibilityEvent.VIEW_CLICKED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_CLICKED],
-		/**
-		 * Represents the event of long clicking on a android.view.View like android.widget.Button, android.widget.CompoundButton, etc.
-		 */
-		[AndroidAccessibilityEvent.VIEW_LONG_CLICKED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_LONG_CLICKED],
-		/**
-		 * Represents the event of selecting an item usually in the context of an android.widget.AdapterView.
-		 */
-		[AndroidAccessibilityEvent.VIEW_SELECTED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_SELECTED],
-		/**
-		 * Represents the event of setting input focus of a android.view.View.
-		 */
-		[AndroidAccessibilityEvent.VIEW_FOCUSED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED],
-		/**
-		 * Represents the event of changing the text of an android.widget.EditText.
-		 */
-		[AndroidAccessibilityEvent.VIEW_TEXT_CHANGED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED],
-		/**
-		 * Represents the event of opening a android.widget.PopupWindow, android.view.Menu, android.app.Dialog, etc.
-		 */
-		[AndroidAccessibilityEvent.WINDOW_STATE_CHANGED, android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED],
-		/**
-		 * Represents the event showing a android.app.Notification.
-		 */
-		[AndroidAccessibilityEvent.NOTIFICATION_STATE_CHANGED, android.view.accessibility.AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED],
-		/**
-		 * Represents the event of a hover enter over a android.view.View.
-		 */
-		[AndroidAccessibilityEvent.VIEW_HOVER_ENTER, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_HOVER_ENTER],
-		/**
-		 * Represents the event of a hover exit over a android.view.View.
-		 */
-		[AndroidAccessibilityEvent.VIEW_HOVER_EXIT, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_HOVER_EXIT],
-		/**
-		 * Represents the event of starting a touch exploration gesture.
-		 */
-		[AndroidAccessibilityEvent.TOUCH_EXPLORATION_GESTURE_START, android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START],
-		/**
-		 * Represents the event of ending a touch exploration gesture.
-		 */
-		[AndroidAccessibilityEvent.TOUCH_EXPLORATION_GESTURE_END, android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END],
-		/**
-		 * Represents the event of changing the content of a window and more specifically the sub-tree rooted at the event's source.
-		 */
-		[AndroidAccessibilityEvent.WINDOW_CONTENT_CHANGED, android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED],
-		/**
-		 * Represents the event of scrolling a view.
-		 */
-		[AndroidAccessibilityEvent.VIEW_SCROLLED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_SCROLLED],
-		/**
-		 * Represents the event of changing the selection in an android.widget.EditText.
-		 */
-		[AndroidAccessibilityEvent.VIEW_TEXT_SELECTION_CHANGED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED],
-		/**
-		 * Represents the event of an application making an announcement.
-		 */
-		[AndroidAccessibilityEvent.ANNOUNCEMENT, android.view.accessibility.AccessibilityEvent.TYPE_ANNOUNCEMENT],
-		/**
-		 * Represents the event of gaining accessibility focus.
-		 */
-		[AndroidAccessibilityEvent.VIEW_ACCESSIBILITY_FOCUSED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED],
-		/**
-		 * Represents the event of clearing accessibility focus.
-		 */
-		[AndroidAccessibilityEvent.VIEW_ACCESSIBILITY_FOCUS_CLEARED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED],
-		/**
-		 * Represents the event of traversing the text of a view at a given movement granularity.
-		 */
-		[AndroidAccessibilityEvent.VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY],
-		/**
-		 * Represents the event of beginning gesture detection.
-		 */
-		[AndroidAccessibilityEvent.GESTURE_DETECTION_START, android.view.accessibility.AccessibilityEvent.TYPE_GESTURE_DETECTION_START],
-		/**
-		 * Represents the event of ending gesture detection.
-		 */
-		[AndroidAccessibilityEvent.GESTURE_DETECTION_END, android.view.accessibility.AccessibilityEvent.TYPE_GESTURE_DETECTION_END],
-		/**
-		 * Represents the event of the user starting to touch the screen.
-		 */
-		[AndroidAccessibilityEvent.TOUCH_INTERACTION_START, android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_INTERACTION_START],
-		/**
-		 * Represents the event of the user ending to touch the screen.
-		 */
-		[AndroidAccessibilityEvent.TOUCH_INTERACTION_END, android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_INTERACTION_END],
-		/**
-		 * Mask for AccessibilityEvent all types.
-		 */
-		[AndroidAccessibilityEvent.ALL_MASK, android.view.accessibility.AccessibilityEvent.TYPES_ALL_MASK],
-	]);
-
-	accessibilityEventTypeMap = new Map([...accessibilityEventMap].map(([k, v]) => [v, k]));
-}
-
-let accessibilityStateChangeListener: androidx.core.view.accessibility.AccessibilityManagerCompat.AccessibilityStateChangeListener;
-let touchExplorationStateChangeListener: androidx.core.view.accessibility.AccessibilityManagerCompat.TouchExplorationStateChangeListener;
-
-function updateAccessibilityServiceState() {
-	const accessibilityManager = getAndroidAccessibilityManager();
-	if (!accessibilityManager) {
-		return;
-	}
-
-	accessibilityServiceEnabled = !!accessibilityManager.isEnabled() && !!accessibilityManager.isTouchExplorationEnabled();
-}
-
-let accessibilityServiceEnabled: boolean;
-export function isAccessibilityServiceEnabled(): boolean {
-	if (typeof accessibilityServiceEnabled === 'boolean') {
-		return accessibilityServiceEnabled;
-	}
-
-	const accessibilityManager = getAndroidAccessibilityManager();
-	accessibilityStateChangeListener = new androidx.core.view.accessibility.AccessibilityManagerCompat.AccessibilityStateChangeListener({
-		onAccessibilityStateChanged(enabled) {
-			updateAccessibilityServiceState();
-
-			if (Trace.isEnabled()) {
-				Trace.write(`AccessibilityStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
-			}
-		},
-	});
-
-	touchExplorationStateChangeListener = new androidx.core.view.accessibility.AccessibilityManagerCompat.TouchExplorationStateChangeListener({
-		onTouchExplorationStateChanged(enabled) {
-			updateAccessibilityServiceState();
-
-			if (Trace.isEnabled()) {
-				Trace.write(`TouchExplorationStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
-			}
-		},
-	});
-
-	androidx.core.view.accessibility.AccessibilityManagerCompat.addAccessibilityStateChangeListener(accessibilityManager, accessibilityStateChangeListener);
-	androidx.core.view.accessibility.AccessibilityManagerCompat.addTouchExplorationStateChangeListener(accessibilityManager, touchExplorationStateChangeListener);
-
-	updateAccessibilityServiceState();
-
-	Application.on(Application.exitEvent, (args: ApplicationEventData) => {
-		const activity = args.android as android.app.Activity;
-		if (activity && !activity.isFinishing()) {
-			return;
-		}
-
-		const accessibilityManager = getAndroidAccessibilityManager();
-		if (accessibilityManager) {
-			if (accessibilityStateChangeListener) {
-				androidx.core.view.accessibility.AccessibilityManagerCompat.removeAccessibilityStateChangeListener(accessibilityManager, accessibilityStateChangeListener);
-			}
-
-			if (touchExplorationStateChangeListener) {
-				androidx.core.view.accessibility.AccessibilityManagerCompat.removeTouchExplorationStateChangeListener(accessibilityManager, touchExplorationStateChangeListener);
-			}
-		}
-
-		accessibilityStateChangeListener = null;
-		touchExplorationStateChangeListener = null;
-
-		Application.off(Application.resumeEvent, updateAccessibilityServiceState);
-	});
-
-	Application.on(Application.resumeEvent, updateAccessibilityServiceState);
-
-	return accessibilityServiceEnabled;
-}
-
-export function setupAccessibleView(view: View): void {
-	updateAccessibilityProperties(view);
-}
-
-let updateAccessibilityPropertiesMicroTask;
-let pendingViews = new Set<View>();
-export function updateAccessibilityProperties(view: View) {
-	if (!view.nativeViewProtected) {
-		return;
-	}
-
-	pendingViews.add(view);
-	if (updateAccessibilityPropertiesMicroTask) return;
-
-	updateAccessibilityPropertiesMicroTask = true;
-	Promise.resolve().then(() => {
-		updateAccessibilityPropertiesMicroTask = false;
-		let _pendingViews = Array.from(pendingViews);
-		pendingViews = new Set();
-		for (const view of _pendingViews) {
-			if (!view.nativeViewProtected) continue;
-			setAccessibilityDelegate(view);
-			applyContentDescription(view);
-		}
-		_pendingViews = [];
-	});
-}
-
-export function sendAccessibilityEvent(view: View, eventType: AndroidAccessibilityEvent, text?: string): void {
-	if (!isAccessibilityServiceEnabled()) {
-		return;
-	}
-
-	const cls = `sendAccessibilityEvent(${view}, ${eventType}, ${text})`;
-
-	const androidView = view.nativeViewProtected as android.view.View;
-	if (!androidView) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls}: no nativeView`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	if (!eventType) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls}: no eventName provided`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	if (!isAccessibilityServiceEnabled()) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - TalkBack not enabled`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	const accessibilityManager = getAndroidAccessibilityManager();
-	if (!accessibilityManager?.isEnabled()) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - accessibility service not enabled`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	if (!accessibilityEventMap.has(eventType)) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - unknown event`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	const eventInt = accessibilityEventMap.get(eventType);
-	if (!text) {
-		return androidView.sendAccessibilityEvent(eventInt);
-	}
-
-	const accessibilityEvent = android.view.accessibility.AccessibilityEvent.obtain(eventInt);
-	accessibilityEvent.setSource(androidView);
-
-	accessibilityEvent.getText().clear();
-
-	if (!text) {
-		applyContentDescription(view);
-
-		text = androidView.getContentDescription() || view['title'];
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - text not provided use androidView.getContentDescription() - ${text}`, Trace.categories.Accessibility);
-		}
-	}
-
-	if (Trace.isEnabled()) {
-		Trace.write(`${cls}: send event with text: '${JSON.stringify(text)}'`, Trace.categories.Accessibility);
-	}
-
-	if (text) {
-		accessibilityEvent.getText().add(text);
-	}
-
-	accessibilityManager.sendAccessibilityEvent(accessibilityEvent);
-}
-
-export function updateContentDescription(view: View, forceUpdate?: boolean): string | null {
-	if (!view.nativeViewProtected) {
-		return;
-	}
-
-	return applyContentDescription(view, forceUpdate);
-}
-
-function setAccessibilityDelegate(view: View): void {
-	if (!view.nativeViewProtected) {
-		return;
-	}
-
-	ensureNativeClasses();
-
-	const androidView = view.nativeViewProtected as android.view.View;
-	if (!androidView || !androidView.setAccessibilityDelegate) {
-		return;
-	}
-
-	androidViewToTNSView.set(androidView, new WeakRef(view));
-
-	let hasOldDelegate = false;
-	if (typeof androidView.getAccessibilityDelegate === 'function') {
-		hasOldDelegate = androidView.getAccessibilityDelegate() === TNSAccessibilityDelegate;
-	}
-
-	if (hasOldDelegate) {
-		return;
-	}
-
-	androidView.setAccessibilityDelegate(TNSAccessibilityDelegate);
-}
-
-function applyContentDescription(view: View, forceUpdate?: boolean) {
-	let androidView = view.nativeViewProtected as android.view.View;
-	if (!androidView || (androidView instanceof android.widget.TextView && !view._androidContentDescriptionUpdated)) {
-		return null;
-	}
-
-	if (androidView instanceof androidx.appcompat.widget.Toolbar) {
-		const numChildren = androidView.getChildCount();
-
-		for (let i = 0; i < numChildren; i += 1) {
-			const childAndroidView = androidView.getChildAt(i);
-			if (childAndroidView instanceof androidx.appcompat.widget.AppCompatTextView) {
-				androidView = childAndroidView;
-				break;
-			}
-		}
-	}
-
-	const cls = `applyContentDescription(${view})`;
-
-	const titleValue = view['title'] as string;
-	const textValue = view['text'] as string;
-
-	if (!forceUpdate && view._androidContentDescriptionUpdated === false && textValue === view['_lastText'] && titleValue === view['_lastTitle']) {
-		// prevent updating this too much
-		return androidView.getContentDescription();
-	}
-
-	const contentDescriptionBuilder = new Array<string>();
-
-	// Workaround: TalkBack won't read the checked state for fake Switch.
-	if (view.accessibilityRole === AccessibilityRole.Switch) {
-		const androidSwitch = new android.widget.Switch(Application.android.context);
-		if (view.accessibilityState === AccessibilityState.Checked) {
-			contentDescriptionBuilder.push(androidSwitch.getTextOn());
-		} else {
-			contentDescriptionBuilder.push(androidSwitch.getTextOff());
-		}
-	}
-
-	if (view.accessibilityLabel) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - have accessibilityLabel`, Trace.categories.Accessibility);
-		}
-
-		contentDescriptionBuilder.push(`${view.accessibilityLabel}`);
-	}
-
-	if (view.accessibilityValue) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - have accessibilityValue`, Trace.categories.Accessibility);
-		}
-
-		contentDescriptionBuilder.push(`${view.accessibilityValue}`);
-	} else if (textValue) {
-		if (textValue !== view.accessibilityLabel) {
-			if (Trace.isEnabled()) {
-				Trace.write(`${cls} - don't have accessibilityValue - use 'text' value`, Trace.categories.Accessibility);
-			}
-
-			contentDescriptionBuilder.push(`${textValue}`);
-		}
-	} else if (titleValue) {
-		if (titleValue !== view.accessibilityLabel) {
-			if (Trace.isEnabled()) {
-				Trace.write(`${cls} - don't have accessibilityValue - use 'title' value`, Trace.categories.Accessibility);
-			}
-
-			contentDescriptionBuilder.push(`${titleValue}`);
-		}
-	}
-
-	if (view.accessibilityHint) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - have accessibilityHint`, Trace.categories.Accessibility);
-		}
-
-		contentDescriptionBuilder.push(`${view.accessibilityHint}`);
-	}
-
-	const contentDescription = contentDescriptionBuilder.join('. ').trim().replace(/^\.$/, '');
-
-	if (contentDescription) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - set to "${contentDescription}"`, Trace.categories.Accessibility);
-		}
-
-		androidView.setContentDescription(contentDescription);
-	} else {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - remove value`, Trace.categories.Accessibility);
-		}
-
-		androidView.setContentDescription(null);
-	}
-
-	view['_lastTitle'] = titleValue;
-	view['_lastText'] = textValue;
-	view._androidContentDescriptionUpdated = false;
-
-	return contentDescription;
-}
diff --git a/packages/core/accessibility/index.d.ts b/packages/core/accessibility/index.d.ts
deleted file mode 100644
index cb7a9d825d..0000000000
--- a/packages/core/accessibility/index.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import type { Page } from '../ui/page';
-import type { View } from '../ui/core/view';
-import type { AndroidAccessibilityEvent } from './accessibility-types';
-
-export * from './accessibility-common';
-export * from './accessibility-types';
-export * from './font-scale';
-
-/**
- * Initialize accessibility for View. This should be called on loaded-event.
- */
-export function setupAccessibleView(view: View): void;
-
-/**
- * Update accessibility properties on nativeView
- */
-export function updateAccessibilityProperties(view: View): void;
-
-/**
- * Android: helper function for triggering accessibility events
- */
-export function sendAccessibilityEvent(View: View, eventName: AndroidAccessibilityEvent, text?: string): void;
-
-/**
- * Android: Update the content description for views
- */
-export function updateContentDescription(View: View, forceUpdate?: boolean): string | null;
-
-/**
- * Is Android TalkBack or iOS VoiceOver enabled?
- */
-export function isAccessibilityServiceEnabled(): boolean;
-
-/**
- * Find the last view focused on a page.
- */
-export function getLastFocusedViewOnPage(page: Page): View | null;
diff --git a/packages/core/accessibility/index.ios.ts b/packages/core/accessibility/index.ios.ts
deleted file mode 100644
index 8e8c8c3d6c..0000000000
--- a/packages/core/accessibility/index.ios.ts
+++ /dev/null
@@ -1,276 +0,0 @@
-import { Application } from '../application';
-import type { ViewBase } from '../ui/core/view-base';
-import type { View } from '../ui/core/view';
-import { notifyAccessibilityFocusState } from './accessibility-common';
-import { AccessibilityLiveRegion, AccessibilityRole, AccessibilityState, AccessibilityTrait } from './accessibility-types';
-
-export * from './accessibility-common';
-export * from './accessibility-types';
-export * from './font-scale';
-
-function enforceArray(val: string | string[]): string[] {
-	if (Array.isArray(val)) {
-		return val;
-	}
-
-	if (typeof val === 'string') {
-		return val.split(/[, ]/g).filter((v: string) => !!v);
-	}
-
-	return [];
-}
-
-/**
- * Convert array of values into a bitmask.
- *
- * @param values string values
- * @param map    map lower-case name to integer value.
- */
-function inputArrayToBitMask(values: string | string[], map: Map<string, number>): number {
-	return (
-		enforceArray(values)
-			.filter((value) => !!value)
-			.map((value) => `${value}`.toLocaleLowerCase())
-			.filter((value) => map.has(value))
-			.reduce((res, value) => res | map.get(value), 0) || 0
-	);
-}
-
-let AccessibilityTraitsMap: Map<string, number>;
-let RoleTypeMap: Map<AccessibilityRole, number>;
-
-let nativeFocusedNotificationObserver;
-let lastFocusedView: WeakRef<View>;
-function ensureNativeClasses() {
-	if (AccessibilityTraitsMap && nativeFocusedNotificationObserver) {
-		return;
-	}
-
-	AccessibilityTraitsMap = new Map<AccessibilityTrait, number>([
-		[AccessibilityTrait.AllowsDirectInteraction, UIAccessibilityTraitAllowsDirectInteraction],
-		[AccessibilityTrait.CausesPageTurn, UIAccessibilityTraitCausesPageTurn],
-		[AccessibilityTrait.NotEnabled, UIAccessibilityTraitNotEnabled],
-		[AccessibilityTrait.Selected, UIAccessibilityTraitSelected],
-		[AccessibilityTrait.UpdatesFrequently, UIAccessibilityTraitUpdatesFrequently],
-	]);
-
-	RoleTypeMap = new Map<AccessibilityRole, number>([
-		[AccessibilityRole.Adjustable, UIAccessibilityTraitAdjustable],
-		[AccessibilityRole.Button, UIAccessibilityTraitButton],
-		[AccessibilityRole.Checkbox, UIAccessibilityTraitButton],
-		[AccessibilityRole.Header, UIAccessibilityTraitHeader],
-		[AccessibilityRole.KeyboardKey, UIAccessibilityTraitKeyboardKey],
-		[AccessibilityRole.Image, UIAccessibilityTraitImage],
-		[AccessibilityRole.ImageButton, UIAccessibilityTraitImage | UIAccessibilityTraitButton],
-		[AccessibilityRole.Link, UIAccessibilityTraitLink],
-		[AccessibilityRole.None, UIAccessibilityTraitNone],
-		[AccessibilityRole.PlaysSound, UIAccessibilityTraitPlaysSound],
-		[AccessibilityRole.RadioButton, UIAccessibilityTraitButton],
-		[AccessibilityRole.Search, UIAccessibilityTraitSearchField],
-		[AccessibilityRole.StaticText, UIAccessibilityTraitStaticText],
-		[AccessibilityRole.StartsMediaSession, UIAccessibilityTraitStartsMediaSession],
-		[AccessibilityRole.Summary, UIAccessibilityTraitSummaryElement],
-		[AccessibilityRole.Switch, UIAccessibilityTraitButton],
-	]);
-
-	nativeFocusedNotificationObserver = Application.ios.addNotificationObserver(UIAccessibilityElementFocusedNotification, (args: NSNotification) => {
-		const uiView = args.userInfo?.objectForKey(UIAccessibilityFocusedElementKey) as UIView;
-		if (!uiView?.tag) {
-			return;
-		}
-
-		const rootView = Application.getRootView();
-
-		// We use the UIView's tag to find the NativeScript View by its domId.
-		let view = rootView.getViewByDomId<View>(uiView?.tag);
-		if (!view) {
-			for (const modalView of <Array<View>>rootView._getRootModalViews()) {
-				view = modalView.getViewByDomId(uiView?.tag);
-				if (view) {
-					break;
-				}
-			}
-		}
-
-		if (!view) {
-			return;
-		}
-
-		const lastView = lastFocusedView?.deref();
-		if (lastView && view !== lastView) {
-			const lastFocusedUIView = lastView.nativeViewProtected as UIView;
-			if (lastFocusedUIView) {
-				lastFocusedView = null;
-
-				notifyAccessibilityFocusState(lastView, false, true);
-			}
-		}
-
-		lastFocusedView = new WeakRef(view);
-
-		notifyAccessibilityFocusState(view, true, false);
-	});
-
-	Application.on(Application.exitEvent, () => {
-		if (nativeFocusedNotificationObserver) {
-			Application.ios.removeNotificationObserver(nativeFocusedNotificationObserver, UIAccessibilityElementFocusedNotification);
-		}
-
-		nativeFocusedNotificationObserver = null;
-		lastFocusedView = null;
-	});
-}
-
-export function setupAccessibleView(view: View): void {
-	const uiView = view.nativeViewProtected as UIView;
-	if (!uiView) {
-		return;
-	}
-
-	/**
-	 * We need to map back from the UIView to the NativeScript View.
-	 *
-	 * We do that by setting the uiView's tag to the View's domId.
-	 * This way we can do reverse lookup.
-	 */
-	uiView.tag = view._domId;
-}
-
-export function updateAccessibilityProperties(view: View): void {
-	const uiView = view.nativeViewProtected as UIView;
-	if (!uiView) {
-		return;
-	}
-
-	ensureNativeClasses();
-
-	const accessibilityRole = view.accessibilityRole;
-	const accessibilityState = view.accessibilityState;
-
-	if (!view.accessible || view.accessibilityHidden) {
-		uiView.accessibilityTraits = UIAccessibilityTraitNone;
-
-		return;
-	}
-
-	// NOTE: left here for various core inspection passes while running the toolbox app
-	// console.log('--- Accessible element: ', view.constructor.name);
-	// console.log('accessibilityLabel: ', view.accessibilityLabel);
-	// console.log('accessibilityRole: ', accessibilityRole);
-	// console.log('accessibilityState: ', accessibilityState);
-	// console.log('accessibilityValue: ', view.accessibilityValue);
-
-	let a11yTraits = UIAccessibilityTraitNone;
-	if (RoleTypeMap.has(accessibilityRole)) {
-		a11yTraits |= RoleTypeMap.get(accessibilityRole);
-	}
-
-	switch (accessibilityRole) {
-		case AccessibilityRole.Checkbox:
-		case AccessibilityRole.RadioButton:
-		case AccessibilityRole.Switch: {
-			if (accessibilityState === AccessibilityState.Checked) {
-				a11yTraits |= AccessibilityTraitsMap.get(AccessibilityTrait.Selected);
-			}
-			break;
-		}
-		default: {
-			if (accessibilityState === AccessibilityState.Selected) {
-				a11yTraits |= AccessibilityTraitsMap.get(AccessibilityTrait.Selected);
-			}
-			if (accessibilityState === AccessibilityState.Disabled) {
-				a11yTraits |= AccessibilityTraitsMap.get(AccessibilityTrait.NotEnabled);
-			}
-			break;
-		}
-	}
-
-	const UpdatesFrequentlyTrait = AccessibilityTraitsMap.get(AccessibilityTrait.UpdatesFrequently);
-
-	switch (view.accessibilityLiveRegion) {
-		case AccessibilityLiveRegion.Polite:
-		case AccessibilityLiveRegion.Assertive: {
-			a11yTraits |= UpdatesFrequentlyTrait;
-			break;
-		}
-		default: {
-			a11yTraits &= ~UpdatesFrequentlyTrait;
-			break;
-		}
-	}
-
-	// NOTE: left here for various core inspection passes while running the toolbox app
-	// if (view.accessibilityLiveRegion) {
-	// 	console.log('accessibilityLiveRegion:', view.accessibilityLiveRegion);
-	// }
-
-	if (view.accessibilityMediaSession) {
-		a11yTraits |= RoleTypeMap.get(AccessibilityRole.StartsMediaSession);
-	}
-
-	// NOTE: There were duplicated types in traits and roles previously which we conslidated
-	// not sure if this is still needed
-	// accessibilityTraits used to be stored on {N} view component but if the above
-	// is combining all traits fresh each time through, don't believe we need to keep track or previous traits
-	// if (view.accessibilityTraits) {
-	// 	a11yTraits |= inputArrayToBitMask(view.accessibilityTraits, AccessibilityTraitsMap);
-	// }
-
-	// NOTE: left here for various core inspection passes while running the toolbox app
-	// console.log('a11yTraits:', a11yTraits);
-	// console.log('    ');
-
-	uiView.accessibilityTraits = a11yTraits;
-}
-
-export const sendAccessibilityEvent = (): void => {};
-export const updateContentDescription = (): string | null => null;
-
-let accessibilityServiceEnabled: boolean;
-let nativeObserver;
-export function isAccessibilityServiceEnabled(): boolean {
-	if (typeof accessibilityServiceEnabled === 'boolean') {
-		return accessibilityServiceEnabled;
-	}
-
-	let isVoiceOverRunning: () => boolean;
-	if (typeof UIAccessibilityIsVoiceOverRunning === 'function') {
-		isVoiceOverRunning = UIAccessibilityIsVoiceOverRunning;
-	} else {
-		// iOS is too old to tell us if voice over is enabled
-		if (typeof UIAccessibilityIsVoiceOverRunning !== 'function') {
-			accessibilityServiceEnabled = false;
-			return accessibilityServiceEnabled;
-		}
-	}
-
-	accessibilityServiceEnabled = isVoiceOverRunning();
-
-	let voiceOverStatusChangedNotificationName: string | null = null;
-	if (typeof UIAccessibilityVoiceOverStatusDidChangeNotification !== 'undefined') {
-		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusDidChangeNotification;
-	} else if (typeof UIAccessibilityVoiceOverStatusChanged !== 'undefined') {
-		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusChanged;
-	}
-
-	if (voiceOverStatusChangedNotificationName) {
-		nativeObserver = Application.ios.addNotificationObserver(voiceOverStatusChangedNotificationName, () => {
-			accessibilityServiceEnabled = isVoiceOverRunning();
-		});
-
-		Application.on(Application.exitEvent, () => {
-			if (nativeObserver) {
-				Application.ios.removeNotificationObserver(nativeObserver, voiceOverStatusChangedNotificationName);
-			}
-
-			accessibilityServiceEnabled = undefined;
-			nativeObserver = null;
-		});
-	}
-
-	Application.on(Application.resumeEvent, () => {
-		accessibilityServiceEnabled = isVoiceOverRunning();
-	});
-
-	return accessibilityServiceEnabled;
-}
diff --git a/packages/core/accessibility/index.ts b/packages/core/accessibility/index.ts
new file mode 100644
index 0000000000..a6f49f8a7a
--- /dev/null
+++ b/packages/core/accessibility/index.ts
@@ -0,0 +1 @@
+export * from './accessibility-common';
diff --git a/packages/core/application-settings/index.android.ts b/packages/core/application-settings/index.android.ts
index 315c26ad57..bd27374f1c 100644
--- a/packages/core/application-settings/index.android.ts
+++ b/packages/core/application-settings/index.android.ts
@@ -1,10 +1,10 @@
 import * as common from './application-settings-common';
-import { Application } from '../application';
+import { getNativeApp } from '../application/helpers-common';
 
 let sharedPreferences: android.content.SharedPreferences;
 function ensureSharedPreferences() {
 	if (!sharedPreferences) {
-		sharedPreferences = Application.android.getNativeApplication().getApplicationContext().getSharedPreferences('prefs.db', 0);
+		sharedPreferences = (getNativeApp() as android.app.Application).getApplicationContext().getSharedPreferences('prefs.db', 0);
 	}
 }
 
diff --git a/packages/core/application/application-common.ts b/packages/core/application/application-common.ts
index 301c1adc46..6bc6dcd7a4 100644
--- a/packages/core/application/application-common.ts
+++ b/packages/core/application/application-common.ts
@@ -1,18 +1,19 @@
-import { initAccessibilityCssHelper } from '../accessibility/accessibility-css-helper';
-import { initAccessibilityFontScale } from '../accessibility/font-scale';
 import { CoreTypes } from '../core-types';
 import { CSSUtils } from '../css/system-classes';
 import { Device, Screen } from '../platform';
 import { profile } from '../profiling';
 import { Trace } from '../trace';
+import { clearResolverCache, prepareAppForModuleResolver, _setResolver } from '../module-name-resolver/helpers';
 import { Builder } from '../ui/builder';
 import * as bindableResources from '../ui/core/bindable/bindable-resources';
 import type { View } from '../ui/core/view';
 import type { Frame } from '../ui/frame';
 import type { NavigationEntry } from '../ui/frame/frame-interfaces';
 import type { StyleScope } from '../ui/styling/style-scope';
-import type { AndroidApplication as IAndroidApplication, iOSApplication as IiOSApplication } from './';
+import type { AndroidApplication as AndroidApplicationType, iOSApplication as iOSApplicationType } from '.';
 import type { ApplicationEventData, CssChangedEventData, DiscardedErrorEventData, FontScaleChangedEventData, InitRootViewEventData, LaunchEventData, LoadAppCSSEventData, NativeScriptError, OrientationChangedEventData, SystemAppearanceChangedEventData, UnhandledErrorEventData } from './application-interfaces';
+import { readyInitAccessibilityCssHelper, readyInitFontScale } from '../accessibility/accessibility-common';
+import { isAppInBackground, setAppInBackground } from './helpers-common';
 
 // prettier-ignore
 const ORIENTATION_CSS_CLASSES = [
@@ -371,8 +372,8 @@ export class ApplicationCommon {
 
 	initRootView(rootView: View) {
 		this.setRootViewCSSClasses(rootView);
-		initAccessibilityCssHelper();
-		initAccessibilityFontScale();
+		readyInitAccessibilityCssHelper();
+		readyInitFontScale();
 		this.notify(<InitRootViewEventData>{ eventName: this.initRootViewEvent, rootView });
 	}
 
@@ -575,14 +576,12 @@ export class ApplicationCommon {
 		rootView._onCssStateChange();
 	}
 
-	private _inBackground: boolean = false;
-
 	get inBackground() {
-		return this._inBackground;
+		return isAppInBackground();
 	}
 
 	setInBackground(value: boolean, additonalData?: any) {
-		this._inBackground = value;
+		setAppInBackground(value);
 
 		this.notify(<ApplicationEventData>{
 			eventName: value ? this.backgroundEvent : this.foregroundEvent,
@@ -614,11 +613,11 @@ export class ApplicationCommon {
 
 	public started = false;
 
-	get android(): IAndroidApplication {
+	get android(): AndroidApplicationType {
 		return undefined;
 	}
 
-	get ios(): IiOSApplication {
+	get ios(): iOSApplicationType {
 		return undefined;
 	}
 
@@ -630,3 +629,10 @@ export class ApplicationCommon {
 		return this.ios;
 	}
 }
+
+prepareAppForModuleResolver(() => {
+	ApplicationCommon.on('livesync', (args) => clearResolverCache());
+	ApplicationCommon.on('orientationChanged', (args) => {
+		_setResolver(undefined);
+	});
+});
diff --git a/packages/core/application/application-interfaces.ts b/packages/core/application/application-interfaces.ts
index 0ff3b1a4c9..d154cce7f5 100644
--- a/packages/core/application/application-interfaces.ts
+++ b/packages/core/application/application-interfaces.ts
@@ -1,4 +1,3 @@
-import type { ApplicationCommon } from './application-common';
 import type { EventData, Observable } from '../data/observable';
 import type { View } from '../ui/core/view';
 
@@ -42,7 +41,7 @@ export interface ApplicationEventData {
 	/**
 	 * The instance that has raised the event.
 	 */
-	object: ApplicationCommon | Observable;
+	object: any; // Application;
 }
 
 /**
diff --git a/packages/core/application/application.android.ts b/packages/core/application/application.android.ts
index 58e9cc0d6d..b9f3fd7ea4 100644
--- a/packages/core/application/application.android.ts
+++ b/packages/core/application/application.android.ts
@@ -1,11 +1,50 @@
 import { profile } from '../profiling';
-import { View } from '../ui/core/view';
+import type { View } from '../ui/core/view';
 import { isEmbedded } from '../ui/embedding';
+import { GestureTypes } from '../ui/gestures';
 import { AndroidActivityCallbacks, NavigationEntry } from '../ui/frame/frame-common';
 import { SDK_VERSION } from '../utils/constants';
-import type { AndroidApplication as IAndroidApplication } from './application';
+import { android as androidUtils } from '../utils';
 import { ApplicationCommon } from './application-common';
 import type { AndroidActivityBundleEventData, AndroidActivityEventData, ApplicationEventData } from './application-interfaces';
+import { Observable } from '../data/observable';
+import { Trace } from '../trace';
+import * as Utils from '../utils';
+import {
+	CommonA11YServiceEnabledObservable,
+	SharedA11YObservable,
+	notifyAccessibilityFocusState,
+	a11yServiceClasses,
+	a11yServiceDisabledClass,
+	a11yServiceEnabledClass,
+	fontScaleCategoryClasses,
+	fontScaleExtraLargeCategoryClass,
+	fontScaleExtraSmallCategoryClass,
+	fontScaleMediumCategoryClass,
+	getCurrentA11YServiceClass,
+	getCurrentFontScaleCategory,
+	getCurrentFontScaleClass,
+	getFontScaleCssClasses,
+	setCurrentA11YServiceClass,
+	setCurrentFontScaleCategory,
+	setCurrentFontScaleClass,
+	setFontScaleCssClasses,
+	setFontScale,
+	getFontScale,
+	setInitFontScale,
+	getFontScaleCategory,
+	setInitAccessibilityCssHelper,
+	FontScaleCategory,
+	getClosestValidFontScale,
+	VALID_FONT_SCALES,
+	AccessibilityRole,
+	AccessibilityState,
+	AndroidAccessibilityEvent,
+	isA11yEnabled,
+	setA11yEnabled,
+} from '../accessibility/accessibility-common';
+import { androidGetForegroundActivity, androidGetStartActivity, androidPendingReceiverRegistrations, androidRegisterBroadcastReceiver, androidRegisteredReceivers, androidSetForegroundActivity, androidSetStartActivity, androidUnregisterBroadcastReceiver, applyContentDescription } from './helpers';
+import { getRootView, setA11yUpdatePropertiesCallback, setApplicationPropertiesCallback, setNativeApp, setRootView, setToggleApplicationEventListenersCallback } from './helpers-common';
 
 declare namespace com {
 	namespace tns {
@@ -21,38 +60,6 @@ declare namespace com {
 	}
 }
 
-declare class BroadcastReceiver extends android.content.BroadcastReceiver {
-	constructor(onReceiveCallback: (context: android.content.Context, intent: android.content.Intent) => void);
-}
-
-let BroadcastReceiver_: typeof BroadcastReceiver;
-function initBroadcastReceiver() {
-	if (BroadcastReceiver_) {
-		return BroadcastReceiver_;
-	}
-
-	@NativeClass
-	class BroadcastReceiverImpl extends android.content.BroadcastReceiver {
-		private _onReceiveCallback: (context: android.content.Context, intent: android.content.Intent) => void;
-
-		constructor(onReceiveCallback: (context: android.content.Context, intent: android.content.Intent) => void) {
-			super();
-			this._onReceiveCallback = onReceiveCallback;
-
-			return global.__native(this);
-		}
-
-		public onReceive(context: android.content.Context, intent: android.content.Intent) {
-			if (this._onReceiveCallback) {
-				this._onReceiveCallback(context, intent);
-			}
-		}
-	}
-
-	BroadcastReceiver_ = BroadcastReceiverImpl;
-	return BroadcastReceiver_;
-}
-
 declare class NativeScriptLifecycleCallbacks extends android.app.Application.ActivityLifecycleCallbacks {}
 
 let NativeScriptLifecycleCallbacks_: typeof NativeScriptLifecycleCallbacks;
@@ -285,7 +292,7 @@ function initNativeScriptComponentCallbacks() {
 	return NativeScriptComponentCallbacks_;
 }
 
-export class AndroidApplication extends ApplicationCommon implements IAndroidApplication {
+export class AndroidApplication extends ApplicationCommon {
 	static readonly activityCreatedEvent = 'activityCreated';
 	static readonly activityDestroyedEvent = 'activityDestroyed';
 	static readonly activityStartedEvent = 'activityStarted';
@@ -328,6 +335,7 @@ export class AndroidApplication extends ApplicationCommon implements IAndroidApp
 		}
 
 		this._nativeApp = nativeApp;
+		setNativeApp(nativeApp);
 		this._context = nativeApp.getApplicationContext();
 		this._packageName = nativeApp.getPackageName();
 
@@ -341,11 +349,9 @@ export class AndroidApplication extends ApplicationCommon implements IAndroidApp
 		this._registerPendingReceivers();
 	}
 
-	private _registeredReceivers = {};
-	private _pendingReceiverRegistrations = new Array<(context: android.content.Context) => void>();
 	private _registerPendingReceivers() {
-		this._pendingReceiverRegistrations.forEach((func) => func(this.context));
-		this._pendingReceiverRegistrations.length = 0;
+		androidPendingReceiverRegistrations.forEach((func) => func(this.context));
+		androidPendingReceiverRegistrations.length = 0;
 	}
 
 	onConfigurationChanged(configuration: android.content.res.Configuration): void {
@@ -408,23 +414,20 @@ export class AndroidApplication extends ApplicationCommon implements IAndroidApp
 		}
 	}
 
-	private _startActivity: androidx.appcompat.app.AppCompatActivity;
-	private _foregroundActivity: androidx.appcompat.app.AppCompatActivity;
-
 	get startActivity() {
-		return this._startActivity;
+		return androidGetStartActivity();
 	}
 
 	get foregroundActivity() {
-		return this._foregroundActivity;
+		return androidGetForegroundActivity();
 	}
 
 	setStartActivity(value: androidx.appcompat.app.AppCompatActivity) {
-		this._startActivity = value;
+		androidSetStartActivity(value);
 	}
 
 	setForegroundActivity(value: androidx.appcompat.app.AppCompatActivity) {
-		this._foregroundActivity = value;
+		androidSetForegroundActivity(value);
 	}
 
 	get paused(): boolean {
@@ -448,34 +451,15 @@ export class AndroidApplication extends ApplicationCommon implements IAndroidApp
 	// RECEIVER_NOT_EXPORTED (4)
 	// RECEIVER_VISIBLE_TO_INSTANT_APPS (1)
 	public registerBroadcastReceiver(intentFilter: string, onReceiveCallback: (context: android.content.Context, intent: android.content.Intent) => void, flags = 2): void {
-		const registerFunc = (context: android.content.Context) => {
-			const receiver: android.content.BroadcastReceiver = new (initBroadcastReceiver())(onReceiveCallback);
-			if (SDK_VERSION >= 26) {
-				context.registerReceiver(receiver, new android.content.IntentFilter(intentFilter), flags);
-			} else {
-				context.registerReceiver(receiver, new android.content.IntentFilter(intentFilter));
-			}
-			this._registeredReceivers[intentFilter] = receiver;
-		};
-
-		if (this.context) {
-			registerFunc(this.context);
-		} else {
-			this._pendingReceiverRegistrations.push(registerFunc);
-		}
+		androidRegisterBroadcastReceiver(intentFilter, onReceiveCallback, flags);
 	}
 
 	public unregisterBroadcastReceiver(intentFilter: string): void {
-		const receiver = this._registeredReceivers[intentFilter];
-		if (receiver) {
-			this.context.unregisterReceiver(receiver);
-			this._registeredReceivers[intentFilter] = undefined;
-			delete this._registeredReceivers[intentFilter];
-		}
+		androidUnregisterBroadcastReceiver(intentFilter);
 	}
 
 	public getRegisteredBroadcastReceiver(intentFilter: string): android.content.BroadcastReceiver | undefined {
-		return this._registeredReceivers[intentFilter];
+		return androidRegisteredReceivers[intentFilter];
 	}
 
 	getRootView(): View {
@@ -485,7 +469,8 @@ export class AndroidApplication extends ApplicationCommon implements IAndroidApp
 		}
 		const callbacks: AndroidActivityCallbacks = activity['_callbacks'];
 
-		return callbacks ? callbacks.getRootView() : undefined;
+		setRootView(callbacks ? callbacks.getRootView() : undefined);
+		return getRootView();
 	}
 
 	resetRootView(entry?: NavigationEntry | string): void {
@@ -550,3 +535,862 @@ export class AndroidApplication extends ApplicationCommon implements IAndroidApp
 export * from './application-common';
 export const Application = new AndroidApplication();
 export const iOSApplication = undefined;
+
+function fontScaleChanged(origFontScale: number) {
+	const oldValue = getFontScale();
+	setFontScale(getClosestValidFontScale(origFontScale));
+	const currentFontScale = getFontScale();
+
+	if (oldValue !== currentFontScale) {
+		Application.notify({
+			eventName: Application.fontScaleChangedEvent,
+			object: Application,
+			newValue: currentFontScale,
+		} as ApplicationEventData);
+	}
+}
+
+export function getCurrentFontScale(): number {
+	setupConfigListener();
+
+	return getFontScale();
+}
+
+function useAndroidFontScale() {
+	fontScaleChanged(Number(Application.android.context.getResources().getConfiguration().fontScale));
+}
+
+let configChangedCallback: android.content.ComponentCallbacks2;
+function setupConfigListener() {
+	if (configChangedCallback) {
+		return;
+	}
+
+	Application.off(Application.launchEvent, setupConfigListener);
+	const context = Application.android?.context as android.content.Context;
+	if (!context) {
+		Application.on(Application.launchEvent, setupConfigListener);
+
+		return;
+	}
+
+	useAndroidFontScale();
+
+	configChangedCallback = new android.content.ComponentCallbacks2({
+		onLowMemory() {
+			// Dummy
+		},
+		onTrimMemory() {
+			// Dummy
+		},
+		onConfigurationChanged(newConfig: android.content.res.Configuration) {
+			fontScaleChanged(Number(newConfig.fontScale));
+		},
+	});
+
+	context.registerComponentCallbacks(configChangedCallback);
+	Application.on(Application.resumeEvent, useAndroidFontScale);
+}
+
+setInitFontScale(setupConfigListener);
+
+function applyRootCssClass(cssClasses: string[], newCssClass: string): void {
+	const rootView = Application.getRootView();
+	if (!rootView) {
+		return;
+	}
+
+	Application.applyCssClass(rootView, cssClasses, newCssClass);
+
+	const rootModalViews = <Array<View>>rootView._getRootModalViews();
+	rootModalViews.forEach((rootModalView) => Application.applyCssClass(rootModalView, cssClasses, newCssClass));
+}
+
+function applyFontScaleToRootViews(): void {
+	const rootView = Application.getRootView();
+	if (!rootView) {
+		return;
+	}
+
+	const fontScale = getCurrentFontScale();
+
+	rootView.style.fontScaleInternal = fontScale;
+
+	const rootModalViews = <Array<View>>rootView._getRootModalViews();
+	rootModalViews.forEach((rootModalView) => (rootModalView.style.fontScaleInternal = fontScale));
+}
+
+export function getAndroidAccessibilityManager(): android.view.accessibility.AccessibilityManager | null {
+	const context = Utils.ad.getApplicationContext() as android.content.Context;
+	if (!context) {
+		return null;
+	}
+
+	return context.getSystemService(android.content.Context.ACCESSIBILITY_SERVICE) as android.view.accessibility.AccessibilityManager;
+}
+
+const accessibilityStateEnabledPropName = 'accessibilityStateEnabled';
+const touchExplorationStateEnabledPropName = 'touchExplorationStateEnabled';
+
+class AndroidSharedA11YObservable extends SharedA11YObservable {
+	[accessibilityStateEnabledPropName]: boolean;
+	[touchExplorationStateEnabledPropName]: boolean;
+
+	// @ts-ignore todo: fix
+	get accessibilityServiceEnabled(): boolean {
+		return !!this[accessibilityStateEnabledPropName] && !!this[touchExplorationStateEnabledPropName];
+	}
+
+	set accessibilityServiceEnabled(v) {
+		return;
+	}
+}
+
+let accessibilityStateChangeListener: android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener;
+let touchExplorationStateChangeListener: android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener;
+let sharedA11YObservable: AndroidSharedA11YObservable;
+
+function updateAccessibilityState(): void {
+	const accessibilityManager = getAndroidAccessibilityManager();
+	if (!accessibilityManager) {
+		sharedA11YObservable.set(accessibilityStateEnabledPropName, false);
+		sharedA11YObservable.set(touchExplorationStateEnabledPropName, false);
+
+		return;
+	}
+
+	sharedA11YObservable.set(accessibilityStateEnabledPropName, !!accessibilityManager.isEnabled());
+	sharedA11YObservable.set(touchExplorationStateEnabledPropName, !!accessibilityManager.isTouchExplorationEnabled());
+}
+
+function ensureStateListener(): SharedA11YObservable {
+	if (sharedA11YObservable) {
+		return sharedA11YObservable;
+	}
+
+	const accessibilityManager = getAndroidAccessibilityManager();
+	sharedA11YObservable = new AndroidSharedA11YObservable();
+
+	if (!accessibilityManager) {
+		sharedA11YObservable.set(accessibilityStateEnabledPropName, false);
+		sharedA11YObservable.set(touchExplorationStateEnabledPropName, false);
+
+		return sharedA11YObservable;
+	}
+
+	accessibilityStateChangeListener = new android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener({
+		onAccessibilityStateChanged(enabled) {
+			updateAccessibilityState();
+
+			if (Trace.isEnabled()) {
+				Trace.write(`AccessibilityStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
+			}
+		},
+	});
+	accessibilityManager.addAccessibilityStateChangeListener(accessibilityStateChangeListener);
+
+	if (SDK_VERSION >= 19) {
+		touchExplorationStateChangeListener = new android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener({
+			onTouchExplorationStateChanged(enabled) {
+				updateAccessibilityState();
+
+				if (Trace.isEnabled()) {
+					Trace.write(`TouchExplorationStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
+				}
+			},
+		});
+		accessibilityManager.addTouchExplorationStateChangeListener(touchExplorationStateChangeListener);
+	}
+
+	updateAccessibilityState();
+
+	Application.on(Application.resumeEvent, updateAccessibilityState);
+	Application.on(Application.exitEvent, (args: ApplicationEventData) => {
+		const activity = args.android as android.app.Activity;
+		if (activity && !activity.isFinishing()) {
+			return;
+		}
+
+		const accessibilityManager = getAndroidAccessibilityManager();
+		if (accessibilityManager) {
+			if (accessibilityStateChangeListener) {
+				accessibilityManager.removeAccessibilityStateChangeListener(accessibilityStateChangeListener);
+			}
+
+			if (touchExplorationStateChangeListener) {
+				accessibilityManager.removeTouchExplorationStateChangeListener(touchExplorationStateChangeListener);
+			}
+		}
+
+		accessibilityStateChangeListener = null;
+		touchExplorationStateChangeListener = null;
+
+		if (sharedA11YObservable) {
+			sharedA11YObservable.removeEventListener(Observable.propertyChangeEvent);
+			sharedA11YObservable = null;
+		}
+
+		Application.off(Application.resumeEvent, updateAccessibilityState);
+	});
+
+	return sharedA11YObservable;
+}
+
+export class AccessibilityServiceEnabledObservable extends CommonA11YServiceEnabledObservable {
+	constructor() {
+		super(ensureStateListener());
+	}
+}
+
+let accessibilityServiceObservable: AccessibilityServiceEnabledObservable;
+export function ensureClasses() {
+	if (accessibilityServiceObservable) {
+		return;
+	}
+
+	setFontScaleCssClasses(new Map(VALID_FONT_SCALES.map((fs) => [fs, `a11y-fontscale-${Number(fs * 100).toFixed(0)}`])));
+
+	accessibilityServiceObservable = new AccessibilityServiceEnabledObservable();
+}
+
+export function updateCurrentHelperClasses(applyRootCssClass: (cssClasses: string[], newCssClass: string) => void): void {
+	const fontScale = getFontScale();
+	const fontScaleCategory = getFontScaleCategory();
+	const fontScaleCssClasses = getFontScaleCssClasses();
+	const oldFontScaleClass = getCurrentFontScaleClass();
+	if (fontScaleCssClasses.has(fontScale)) {
+		setCurrentFontScaleClass(fontScaleCssClasses.get(fontScale));
+	} else {
+		setCurrentFontScaleClass(fontScaleCssClasses.get(1));
+	}
+
+	if (oldFontScaleClass !== getCurrentFontScaleClass()) {
+		applyRootCssClass([...fontScaleCssClasses.values()], getCurrentFontScaleClass());
+	}
+
+	const oldActiveFontScaleCategory = getCurrentFontScaleCategory();
+	switch (fontScaleCategory) {
+		case FontScaleCategory.ExtraSmall: {
+			setCurrentFontScaleCategory(fontScaleExtraSmallCategoryClass);
+			break;
+		}
+		case FontScaleCategory.Medium: {
+			setCurrentFontScaleCategory(fontScaleMediumCategoryClass);
+			break;
+		}
+		case FontScaleCategory.ExtraLarge: {
+			setCurrentFontScaleCategory(fontScaleExtraLargeCategoryClass);
+			break;
+		}
+		default: {
+			setCurrentFontScaleCategory(fontScaleMediumCategoryClass);
+			break;
+		}
+	}
+
+	if (oldActiveFontScaleCategory !== getCurrentFontScaleCategory()) {
+		applyRootCssClass(fontScaleCategoryClasses, getCurrentFontScaleCategory());
+	}
+
+	const oldA11YStatusClass = getCurrentA11YServiceClass();
+	if (accessibilityServiceObservable.accessibilityServiceEnabled) {
+		setCurrentA11YServiceClass(a11yServiceEnabledClass);
+	} else {
+		setCurrentA11YServiceClass(a11yServiceDisabledClass);
+	}
+
+	if (oldA11YStatusClass !== getCurrentA11YServiceClass()) {
+		applyRootCssClass(a11yServiceClasses, getCurrentA11YServiceClass());
+	}
+}
+
+export function initAccessibilityCssHelper(): void {
+	ensureClasses();
+
+	Application.on(Application.fontScaleChangedEvent, () => {
+		updateCurrentHelperClasses(applyRootCssClass);
+		applyFontScaleToRootViews();
+	});
+
+	accessibilityServiceObservable.on(AccessibilityServiceEnabledObservable.propertyChangeEvent, () => updateCurrentHelperClasses(applyRootCssClass));
+}
+setInitAccessibilityCssHelper(initAccessibilityCssHelper);
+
+let clickableRolesMap = new Set<string>();
+
+let lastFocusedView: WeakRef<View>;
+function accessibilityEventHelper(view: View, eventType: number) {
+	const eventName = accessibilityEventTypeMap.get(eventType);
+	if (!isAccessibilityServiceEnabled()) {
+		if (Trace.isEnabled()) {
+			Trace.write(`accessibilityEventHelper: Service not active`, Trace.categories.Accessibility);
+		}
+
+		return;
+	}
+
+	if (!eventName) {
+		Trace.write(`accessibilityEventHelper: unknown eventType: ${eventType}`, Trace.categories.Accessibility, Trace.messageType.error);
+
+		return;
+	}
+
+	if (!view) {
+		if (Trace.isEnabled()) {
+			Trace.write(`accessibilityEventHelper: no owner: ${eventName}`, Trace.categories.Accessibility);
+		}
+
+		return;
+	}
+
+	const androidView = view.nativeViewProtected as android.view.View;
+	if (!androidView) {
+		if (Trace.isEnabled()) {
+			Trace.write(`accessibilityEventHelper: no nativeView`, Trace.categories.Accessibility);
+		}
+
+		return;
+	}
+
+	switch (eventType) {
+		case android.view.accessibility.AccessibilityEvent.TYPE_VIEW_CLICKED: {
+			/**
+			 * Android API >= 26 handles accessibility tap-events by converting them to TYPE_VIEW_CLICKED
+			 * These aren't triggered for custom tap events in NativeScript.
+			 */
+			if (SDK_VERSION >= 26) {
+				// Find all tap gestures and trigger them.
+				for (const tapGesture of view.getGestureObservers(GestureTypes.tap) ?? []) {
+					tapGesture.callback({
+						android: view.android,
+						eventName: 'tap',
+						ios: null,
+						object: view,
+						type: GestureTypes.tap,
+						view: view,
+					});
+				}
+			}
+
+			return;
+		}
+		case android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED: {
+			const lastView = lastFocusedView?.get();
+			if (lastView && view !== lastView) {
+				const lastAndroidView = lastView.nativeViewProtected as android.view.View;
+				if (lastAndroidView) {
+					lastAndroidView.clearFocus();
+					lastFocusedView = null;
+
+					notifyAccessibilityFocusState(lastView, false, true);
+				}
+			}
+
+			lastFocusedView = new WeakRef(view);
+
+			notifyAccessibilityFocusState(view, true, false);
+
+			return;
+		}
+		case android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED: {
+			const lastView = lastFocusedView?.get();
+			if (lastView && view === lastView) {
+				lastFocusedView = null;
+				androidView.clearFocus();
+			}
+
+			notifyAccessibilityFocusState(view, false, true);
+
+			return;
+		}
+	}
+}
+
+let TNSAccessibilityDelegate: android.view.View.androidviewViewAccessibilityDelegate;
+
+const androidViewToTNSView = new WeakMap<android.view.View, WeakRef<View>>();
+
+let accessibilityEventMap: Map<AndroidAccessibilityEvent, number>;
+let accessibilityEventTypeMap: Map<number, string>;
+
+function ensureNativeClasses() {
+	if (TNSAccessibilityDelegate) {
+		return;
+	}
+
+	// WORKAROUND: Typing refers to android.view.View.androidviewViewAccessibilityDelegate but it is called android.view.View.AccessibilityDelegate at runtime
+	const AccessibilityDelegate: typeof android.view.View.androidviewViewAccessibilityDelegate = android.view.View['AccessibilityDelegate'];
+
+	const RoleTypeMap = new Map<AccessibilityRole, string>([
+		[AccessibilityRole.Button, android.widget.Button.class.getName()],
+		[AccessibilityRole.Search, android.widget.EditText.class.getName()],
+		[AccessibilityRole.Image, android.widget.ImageView.class.getName()],
+		[AccessibilityRole.ImageButton, android.widget.ImageButton.class.getName()],
+		[AccessibilityRole.KeyboardKey, android.inputmethodservice.Keyboard.Key.class.getName()],
+		[AccessibilityRole.StaticText, android.widget.TextView.class.getName()],
+		[AccessibilityRole.Adjustable, android.widget.SeekBar.class.getName()],
+		[AccessibilityRole.Checkbox, android.widget.CheckBox.class.getName()],
+		[AccessibilityRole.RadioButton, android.widget.RadioButton.class.getName()],
+		[AccessibilityRole.SpinButton, android.widget.Spinner.class.getName()],
+		[AccessibilityRole.Switch, android.widget.Switch.class.getName()],
+		[AccessibilityRole.ProgressBar, android.widget.ProgressBar.class.getName()],
+	]);
+
+	clickableRolesMap = new Set<string>([AccessibilityRole.Button, AccessibilityRole.ImageButton]);
+
+	const ignoreRoleTypesForTrace = new Set([AccessibilityRole.Header, AccessibilityRole.Link, AccessibilityRole.None, AccessibilityRole.Summary]);
+
+	@NativeClass()
+	class TNSAccessibilityDelegateImpl extends AccessibilityDelegate {
+		constructor() {
+			super();
+
+			return global.__native(this);
+		}
+
+		private getTnsView(androidView: android.view.View) {
+			const view = androidViewToTNSView.get(androidView)?.get();
+			if (!view) {
+				androidViewToTNSView.delete(androidView);
+
+				return null;
+			}
+
+			return view;
+		}
+
+		public onInitializeAccessibilityNodeInfo(host: android.view.View, info: android.view.accessibility.AccessibilityNodeInfo) {
+			super.onInitializeAccessibilityNodeInfo(host, info);
+
+			const view = this.getTnsView(host);
+			if (!view) {
+				if (Trace.isEnabled()) {
+					Trace.write(`onInitializeAccessibilityNodeInfo ${host} ${info} no tns-view`, Trace.categories.Accessibility);
+				}
+
+				return;
+			}
+
+			// Set resource id that can be used with test frameworks without polluting the content description.
+			const id = host.getTag(androidUtils.resources.getId(`:id/nativescript_accessibility_id`));
+			if (id != null) {
+				info.setViewIdResourceName(id);
+			}
+
+			const accessibilityRole = view.accessibilityRole;
+			if (accessibilityRole) {
+				const androidClassName = RoleTypeMap.get(accessibilityRole);
+				if (androidClassName) {
+					const oldClassName = info.getClassName() || (SDK_VERSION >= 28 && host.getAccessibilityClassName()) || null;
+					info.setClassName(androidClassName);
+
+					if (Trace.isEnabled()) {
+						Trace.write(`${view}.accessibilityRole = "${accessibilityRole}" is mapped to "${androidClassName}" (was ${oldClassName}). ${info.getClassName()}`, Trace.categories.Accessibility);
+					}
+				} else if (!ignoreRoleTypesForTrace.has(accessibilityRole)) {
+					if (Trace.isEnabled()) {
+						Trace.write(`${view}.accessibilityRole = "${accessibilityRole}" is unknown`, Trace.categories.Accessibility);
+					}
+				}
+
+				if (clickableRolesMap.has(accessibilityRole)) {
+					if (Trace.isEnabled()) {
+						Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set clickable role=${accessibilityRole}`, Trace.categories.Accessibility);
+					}
+
+					info.setClickable(true);
+				}
+
+				if (SDK_VERSION >= 28) {
+					if (accessibilityRole === AccessibilityRole.Header) {
+						if (Trace.isEnabled()) {
+							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set heading role=${accessibilityRole}`, Trace.categories.Accessibility);
+						}
+
+						info.setHeading(true);
+					} else if (host.isAccessibilityHeading()) {
+						if (Trace.isEnabled()) {
+							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set heading from host`, Trace.categories.Accessibility);
+						}
+
+						info.setHeading(true);
+					} else {
+						if (Trace.isEnabled()) {
+							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set not heading`, Trace.categories.Accessibility);
+						}
+
+						info.setHeading(false);
+					}
+				}
+
+				switch (accessibilityRole) {
+					case AccessibilityRole.Switch:
+					case AccessibilityRole.RadioButton:
+					case AccessibilityRole.Checkbox: {
+						if (Trace.isEnabled()) {
+							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set checkable and check=${view.accessibilityState === AccessibilityState.Checked}`, Trace.categories.Accessibility);
+						}
+
+						info.setCheckable(true);
+						info.setChecked(view.accessibilityState === AccessibilityState.Checked);
+						break;
+					}
+					default: {
+						if (Trace.isEnabled()) {
+							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set enabled=${view.accessibilityState !== AccessibilityState.Disabled} and selected=${view.accessibilityState === AccessibilityState.Selected}`, Trace.categories.Accessibility);
+						}
+
+						info.setEnabled(view.accessibilityState !== AccessibilityState.Disabled);
+						info.setSelected(view.accessibilityState === AccessibilityState.Selected);
+						break;
+					}
+				}
+			}
+
+			if (view.accessible) {
+				info.setFocusable(true);
+			}
+		}
+
+		public sendAccessibilityEvent(host: android.view.ViewGroup, eventType: number) {
+			super.sendAccessibilityEvent(host, eventType);
+			const view = this.getTnsView(host);
+			if (!view) {
+				console.log(`skip - ${host} - ${accessibilityEventTypeMap.get(eventType)}`);
+
+				return;
+			}
+
+			try {
+				accessibilityEventHelper(view, eventType);
+			} catch (err) {
+				console.error(err);
+			}
+		}
+	}
+
+	TNSAccessibilityDelegate = new TNSAccessibilityDelegateImpl();
+
+	accessibilityEventMap = new Map<AndroidAccessibilityEvent, number>([
+		/**
+		 * Invalid selection/focus position.
+		 */
+		[AndroidAccessibilityEvent.INVALID_POSITION, android.view.accessibility.AccessibilityEvent.INVALID_POSITION],
+		/**
+		 * Maximum length of the text fields.
+		 */
+		[AndroidAccessibilityEvent.MAX_TEXT_LENGTH, android.view.accessibility.AccessibilityEvent.MAX_TEXT_LENGTH],
+		/**
+		 * Represents the event of clicking on a android.view.View like android.widget.Button, android.widget.CompoundButton, etc.
+		 */
+		[AndroidAccessibilityEvent.VIEW_CLICKED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_CLICKED],
+		/**
+		 * Represents the event of long clicking on a android.view.View like android.widget.Button, android.widget.CompoundButton, etc.
+		 */
+		[AndroidAccessibilityEvent.VIEW_LONG_CLICKED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_LONG_CLICKED],
+		/**
+		 * Represents the event of selecting an item usually in the context of an android.widget.AdapterView.
+		 */
+		[AndroidAccessibilityEvent.VIEW_SELECTED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_SELECTED],
+		/**
+		 * Represents the event of setting input focus of a android.view.View.
+		 */
+		[AndroidAccessibilityEvent.VIEW_FOCUSED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED],
+		/**
+		 * Represents the event of changing the text of an android.widget.EditText.
+		 */
+		[AndroidAccessibilityEvent.VIEW_TEXT_CHANGED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED],
+		/**
+		 * Represents the event of opening a android.widget.PopupWindow, android.view.Menu, android.app.Dialog, etc.
+		 */
+		[AndroidAccessibilityEvent.WINDOW_STATE_CHANGED, android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED],
+		/**
+		 * Represents the event showing a android.app.Notification.
+		 */
+		[AndroidAccessibilityEvent.NOTIFICATION_STATE_CHANGED, android.view.accessibility.AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED],
+		/**
+		 * Represents the event of a hover enter over a android.view.View.
+		 */
+		[AndroidAccessibilityEvent.VIEW_HOVER_ENTER, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_HOVER_ENTER],
+		/**
+		 * Represents the event of a hover exit over a android.view.View.
+		 */
+		[AndroidAccessibilityEvent.VIEW_HOVER_EXIT, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_HOVER_EXIT],
+		/**
+		 * Represents the event of starting a touch exploration gesture.
+		 */
+		[AndroidAccessibilityEvent.TOUCH_EXPLORATION_GESTURE_START, android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START],
+		/**
+		 * Represents the event of ending a touch exploration gesture.
+		 */
+		[AndroidAccessibilityEvent.TOUCH_EXPLORATION_GESTURE_END, android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END],
+		/**
+		 * Represents the event of changing the content of a window and more specifically the sub-tree rooted at the event's source.
+		 */
+		[AndroidAccessibilityEvent.WINDOW_CONTENT_CHANGED, android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED],
+		/**
+		 * Represents the event of scrolling a view.
+		 */
+		[AndroidAccessibilityEvent.VIEW_SCROLLED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_SCROLLED],
+		/**
+		 * Represents the event of changing the selection in an android.widget.EditText.
+		 */
+		[AndroidAccessibilityEvent.VIEW_TEXT_SELECTION_CHANGED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED],
+		/**
+		 * Represents the event of an application making an announcement.
+		 */
+		[AndroidAccessibilityEvent.ANNOUNCEMENT, android.view.accessibility.AccessibilityEvent.TYPE_ANNOUNCEMENT],
+		/**
+		 * Represents the event of gaining accessibility focus.
+		 */
+		[AndroidAccessibilityEvent.VIEW_ACCESSIBILITY_FOCUSED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED],
+		/**
+		 * Represents the event of clearing accessibility focus.
+		 */
+		[AndroidAccessibilityEvent.VIEW_ACCESSIBILITY_FOCUS_CLEARED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED],
+		/**
+		 * Represents the event of traversing the text of a view at a given movement granularity.
+		 */
+		[AndroidAccessibilityEvent.VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY],
+		/**
+		 * Represents the event of beginning gesture detection.
+		 */
+		[AndroidAccessibilityEvent.GESTURE_DETECTION_START, android.view.accessibility.AccessibilityEvent.TYPE_GESTURE_DETECTION_START],
+		/**
+		 * Represents the event of ending gesture detection.
+		 */
+		[AndroidAccessibilityEvent.GESTURE_DETECTION_END, android.view.accessibility.AccessibilityEvent.TYPE_GESTURE_DETECTION_END],
+		/**
+		 * Represents the event of the user starting to touch the screen.
+		 */
+		[AndroidAccessibilityEvent.TOUCH_INTERACTION_START, android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_INTERACTION_START],
+		/**
+		 * Represents the event of the user ending to touch the screen.
+		 */
+		[AndroidAccessibilityEvent.TOUCH_INTERACTION_END, android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_INTERACTION_END],
+		/**
+		 * Mask for AccessibilityEvent all types.
+		 */
+		[AndroidAccessibilityEvent.ALL_MASK, android.view.accessibility.AccessibilityEvent.TYPES_ALL_MASK],
+	]);
+
+	accessibilityEventTypeMap = new Map([...accessibilityEventMap].map(([k, v]) => [v, k]));
+}
+
+function updateAccessibilityServiceState() {
+	const accessibilityManager = getAndroidAccessibilityManager();
+	if (!accessibilityManager) {
+		return;
+	}
+
+	setA11yEnabled(!!accessibilityManager.isEnabled() && !!accessibilityManager.isTouchExplorationEnabled());
+}
+
+export function isAccessibilityServiceEnabled(): boolean {
+	const accessibilityServiceEnabled = isA11yEnabled();
+	if (typeof accessibilityServiceEnabled === 'boolean') {
+		return accessibilityServiceEnabled;
+	}
+
+	const accessibilityManager = getAndroidAccessibilityManager();
+	accessibilityStateChangeListener = new androidx.core.view.accessibility.AccessibilityManagerCompat.AccessibilityStateChangeListener({
+		onAccessibilityStateChanged(enabled) {
+			updateAccessibilityServiceState();
+
+			if (Trace.isEnabled()) {
+				Trace.write(`AccessibilityStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
+			}
+		},
+	});
+
+	touchExplorationStateChangeListener = new androidx.core.view.accessibility.AccessibilityManagerCompat.TouchExplorationStateChangeListener({
+		onTouchExplorationStateChanged(enabled) {
+			updateAccessibilityServiceState();
+
+			if (Trace.isEnabled()) {
+				Trace.write(`TouchExplorationStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
+			}
+		},
+	});
+
+	androidx.core.view.accessibility.AccessibilityManagerCompat.addAccessibilityStateChangeListener(accessibilityManager, accessibilityStateChangeListener);
+	androidx.core.view.accessibility.AccessibilityManagerCompat.addTouchExplorationStateChangeListener(accessibilityManager, touchExplorationStateChangeListener);
+
+	updateAccessibilityServiceState();
+
+	Application.on(Application.exitEvent, (args: ApplicationEventData) => {
+		const activity = args.android as android.app.Activity;
+		if (activity && !activity.isFinishing()) {
+			return;
+		}
+
+		const accessibilityManager = getAndroidAccessibilityManager();
+		if (accessibilityManager) {
+			if (accessibilityStateChangeListener) {
+				androidx.core.view.accessibility.AccessibilityManagerCompat.removeAccessibilityStateChangeListener(accessibilityManager, accessibilityStateChangeListener);
+			}
+
+			if (touchExplorationStateChangeListener) {
+				androidx.core.view.accessibility.AccessibilityManagerCompat.removeTouchExplorationStateChangeListener(accessibilityManager, touchExplorationStateChangeListener);
+			}
+		}
+
+		accessibilityStateChangeListener = null;
+		touchExplorationStateChangeListener = null;
+
+		Application.off(Application.resumeEvent, updateAccessibilityServiceState);
+	});
+
+	Application.on(Application.resumeEvent, updateAccessibilityServiceState);
+
+	return accessibilityServiceEnabled;
+}
+
+let updateAccessibilityPropertiesMicroTask;
+let pendingViews = new Set<View>();
+export function updateAccessibilityProperties(view: View) {
+	if (!view.nativeViewProtected) {
+		return;
+	}
+
+	pendingViews.add(view);
+	if (updateAccessibilityPropertiesMicroTask) return;
+
+	updateAccessibilityPropertiesMicroTask = true;
+	Promise.resolve().then(() => {
+		updateAccessibilityPropertiesMicroTask = false;
+		let _pendingViews = Array.from(pendingViews);
+		pendingViews = new Set();
+		for (const view of _pendingViews) {
+			if (!view.nativeViewProtected) continue;
+			setAccessibilityDelegate(view);
+			applyContentDescription(view);
+		}
+		_pendingViews = [];
+	});
+}
+setA11yUpdatePropertiesCallback(updateAccessibilityProperties);
+
+export function sendAccessibilityEvent(view: View, eventType: AndroidAccessibilityEvent, text?: string): void {
+	if (!isAccessibilityServiceEnabled()) {
+		return;
+	}
+
+	const cls = `sendAccessibilityEvent(${view}, ${eventType}, ${text})`;
+
+	const androidView = view.nativeViewProtected as android.view.View;
+	if (!androidView) {
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls}: no nativeView`, Trace.categories.Accessibility);
+		}
+
+		return;
+	}
+
+	if (!eventType) {
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls}: no eventName provided`, Trace.categories.Accessibility);
+		}
+
+		return;
+	}
+
+	if (!isAccessibilityServiceEnabled()) {
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls} - TalkBack not enabled`, Trace.categories.Accessibility);
+		}
+
+		return;
+	}
+
+	const accessibilityManager = getAndroidAccessibilityManager();
+	if (!accessibilityManager?.isEnabled()) {
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls} - accessibility service not enabled`, Trace.categories.Accessibility);
+		}
+
+		return;
+	}
+
+	if (!accessibilityEventMap.has(eventType)) {
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls} - unknown event`, Trace.categories.Accessibility);
+		}
+
+		return;
+	}
+
+	const eventInt = accessibilityEventMap.get(eventType);
+	if (!text) {
+		return androidView.sendAccessibilityEvent(eventInt);
+	}
+
+	const accessibilityEvent = android.view.accessibility.AccessibilityEvent.obtain(eventInt);
+	accessibilityEvent.setSource(androidView);
+
+	accessibilityEvent.getText().clear();
+
+	if (!text) {
+		applyContentDescription(view);
+
+		text = androidView.getContentDescription() || view['title'];
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls} - text not provided use androidView.getContentDescription() - ${text}`, Trace.categories.Accessibility);
+		}
+	}
+
+	if (Trace.isEnabled()) {
+		Trace.write(`${cls}: send event with text: '${JSON.stringify(text)}'`, Trace.categories.Accessibility);
+	}
+
+	if (text) {
+		accessibilityEvent.getText().add(text);
+	}
+
+	accessibilityManager.sendAccessibilityEvent(accessibilityEvent);
+}
+
+function setAccessibilityDelegate(view: View): void {
+	if (!view.nativeViewProtected) {
+		return;
+	}
+
+	ensureNativeClasses();
+
+	const androidView = view.nativeViewProtected as android.view.View;
+	if (!androidView || !androidView.setAccessibilityDelegate) {
+		return;
+	}
+
+	androidViewToTNSView.set(androidView, new WeakRef(view));
+
+	let hasOldDelegate = false;
+	if (typeof androidView.getAccessibilityDelegate === 'function') {
+		hasOldDelegate = androidView.getAccessibilityDelegate() === TNSAccessibilityDelegate;
+	}
+
+	if (hasOldDelegate) {
+		return;
+	}
+
+	androidView.setAccessibilityDelegate(TNSAccessibilityDelegate);
+}
+
+const applicationEvents: string[] = [Application.orientationChangedEvent, Application.systemAppearanceChangedEvent];
+function toggleApplicationEventListeners(toAdd: boolean, callback: (args: ApplicationEventData) => void) {
+	for (const eventName of applicationEvents) {
+		if (toAdd) {
+			Application.on(eventName, callback);
+		} else {
+			Application.off(eventName, callback);
+		}
+	}
+}
+setToggleApplicationEventListenersCallback(toggleApplicationEventListeners);
+
+setApplicationPropertiesCallback(() => {
+	return {
+		orientation: Application.orientation(),
+		systemAppearance: Application.systemAppearance(),
+	};
+});
diff --git a/packages/core/application/application.d.ts b/packages/core/application/application.d.ts
index c61ba0098e..fa67e0c9f5 100644
--- a/packages/core/application/application.d.ts
+++ b/packages/core/application/application.d.ts
@@ -1,4 +1,5 @@
 import { ApplicationCommon } from './application-common';
+import { FontScaleCategory } from '../accessibility/font-scale-common';
 
 export * from './application-common';
 export * from './application-interfaces';
@@ -192,3 +193,27 @@ export class iOSApplication extends ApplicationCommon {
 	 */
 	removeNotificationObserver(observer: any, notificationName: string);
 }
+
+export const VALID_FONT_SCALES: number[];
+export function getCurrentFontScale(): number;
+export function getAndroidAccessibilityManager(): android.view.accessibility.AccessibilityManager | null;
+
+/**
+ * Update accessibility properties on nativeView
+ */
+export function updateAccessibilityProperties(view: View): void;
+
+/**
+ * Android: helper function for triggering accessibility events
+ */
+export function sendAccessibilityEvent(View: View, eventName: AndroidAccessibilityEvent, text?: string): void;
+
+/**
+ * Is Android TalkBack or iOS VoiceOver enabled?
+ */
+export function isAccessibilityServiceEnabled(): boolean;
+
+/**
+ * Find the last view focused on a page.
+ */
+export function getLastFocusedViewOnPage(page: Page): View | null;
diff --git a/packages/core/application/application.ios.ts b/packages/core/application/application.ios.ts
index c476d8d169..bab61c08a3 100644
--- a/packages/core/application/application.ios.ts
+++ b/packages/core/application/application.ios.ts
@@ -1,12 +1,52 @@
 import { profile } from '../profiling';
-import { View } from '../ui/core/view';
+import type { View } from '../ui/core/view';
 import { isEmbedded } from '../ui/embedding';
 import { IOSHelper } from '../ui/core/view/view-helper';
 import { NavigationEntry } from '../ui/frame/frame-interfaces';
+import { getWindow } from '../utils/ios-helper';
 import * as Utils from '../utils';
-import type { iOSApplication as IiOSApplication } from './application';
 import { ApplicationCommon } from './application-common';
 import { ApplicationEventData } from './application-interfaces';
+import { Observable } from '../data/observable';
+import { Trace } from '../trace';
+import {
+	AccessibilityServiceEnabledPropName,
+	CommonA11YServiceEnabledObservable,
+	SharedA11YObservable,
+	a11yServiceClasses,
+	a11yServiceDisabledClass,
+	a11yServiceEnabledClass,
+	fontScaleCategoryClasses,
+	fontScaleExtraLargeCategoryClass,
+	fontScaleExtraSmallCategoryClass,
+	fontScaleMediumCategoryClass,
+	getCurrentA11YServiceClass,
+	getCurrentFontScaleCategory,
+	getCurrentFontScaleClass,
+	getFontScaleCssClasses,
+	setCurrentA11YServiceClass,
+	setCurrentFontScaleCategory,
+	setCurrentFontScaleClass,
+	setFontScaleCssClasses,
+	FontScaleCategory,
+	getClosestValidFontScale,
+	VALID_FONT_SCALES,
+	setFontScale,
+	getFontScale,
+	setInitFontScale,
+	getFontScaleCategory,
+	setInitAccessibilityCssHelper,
+	notifyAccessibilityFocusState,
+	AccessibilityLiveRegion,
+	AccessibilityRole,
+	AccessibilityState,
+	AccessibilityTrait,
+	isA11yEnabled,
+	setA11yEnabled,
+	enforceArray,
+} from '../accessibility/accessibility-common';
+import { iosAddNotificationObserver, iosRemoveNotificationObserver } from './helpers';
+import { getiOSWindow, setA11yUpdatePropertiesCallback, setApplicationPropertiesCallback, setiOSWindow, setRootView, setToggleApplicationEventListenersCallback } from './helpers-common';
 
 @NativeClass
 class CADisplayLinkTarget extends NSObject {
@@ -40,26 +80,6 @@ class CADisplayLinkTarget extends NSObject {
 	};
 }
 
-@NativeClass
-class NotificationObserver extends NSObject {
-	private _onReceiveCallback: (notification: NSNotification) => void;
-
-	public static initWithCallback(onReceiveCallback: (notification: NSNotification) => void): NotificationObserver {
-		const observer = <NotificationObserver>super.new();
-		observer._onReceiveCallback = onReceiveCallback;
-
-		return observer;
-	}
-
-	public onReceive(notification: NSNotification): void {
-		this._onReceiveCallback(notification);
-	}
-
-	public static ObjCExposedMethods = {
-		onReceive: { returns: interop.types.void, params: [NSNotification] },
-	};
-}
-
 @NativeClass
 class Responder extends UIResponder implements UIApplicationDelegate {
 	get window(): UIWindow {
@@ -73,11 +93,9 @@ class Responder extends UIResponder implements UIApplicationDelegate {
 	static ObjCProtocols = [UIApplicationDelegate];
 }
 
-export class iOSApplication extends ApplicationCommon implements IiOSApplication {
+export class iOSApplication extends ApplicationCommon {
 	private _delegate: UIApplicationDelegate;
 	private _delegateHandlers = new Map<string, Array<Function>>();
-	private _window: UIWindow;
-	private _notificationObservers: NotificationObserver[] = [];
 	private _rootView: View;
 
 	displayedOnce = false;
@@ -129,8 +147,9 @@ export class iOSApplication extends ApplicationCommon implements IiOSApplication
 			return;
 		}
 		this._rootView = rootView;
+		setRootView(rootView);
 		// Attach to the existing iOS app
-		const window = Utils.ios.getWindow();
+		const window = getWindow() as UIWindow;
 
 		if (!window) {
 			return;
@@ -243,12 +262,12 @@ export class iOSApplication extends ApplicationCommon implements IiOSApplication
 		// TODO: consideration
 		// may not want to cache this value given the potential of multiple scenes
 		// particularly with SwiftUI app lifecycle based apps
-		if (!this._window) {
+		if (!getiOSWindow()) {
 			// Note: NativeScriptViewFactory.getKeyWindow will always be used in SwiftUI app lifecycle based apps
-			this._window = Utils.ios.getWindow();
+			setiOSWindow(getWindow() as UIWindow);
 		}
 
-		return this._window;
+		return getiOSWindow();
 	}
 
 	get delegate(): UIApplicationDelegate & { prototype: UIApplicationDelegate } {
@@ -304,19 +323,11 @@ export class iOSApplication extends ApplicationCommon implements IiOSApplication
 	}
 
 	addNotificationObserver(notificationName: string, onReceiveCallback: (notification: NSNotification) => void) {
-		const observer = NotificationObserver.initWithCallback(onReceiveCallback);
-		NSNotificationCenter.defaultCenter.addObserverSelectorNameObject(observer, 'onReceive', notificationName, null);
-		this._notificationObservers.push(observer);
-
-		return observer;
+		return iosAddNotificationObserver(notificationName, onReceiveCallback);
 	}
 
-	removeNotificationObserver(observer: any, notificationName: string) {
-		const index = this._notificationObservers.indexOf(observer);
-		if (index >= 0) {
-			this._notificationObservers.splice(index, 1);
-			NSNotificationCenter.defaultCenter.removeObserverNameObject(observer, notificationName, null);
-		}
+	removeNotificationObserver(observer: any /* NotificationObserver */, notificationName: string) {
+		iosRemoveNotificationObserver(observer, notificationName);
 	}
 
 	protected getSystemAppearance(): 'light' | 'dark' {
@@ -367,12 +378,12 @@ export class iOSApplication extends ApplicationCommon implements IiOSApplication
 			ios: notification?.userInfo?.objectForKey('UIApplicationLaunchOptionsLocalNotificationKey') ?? null,
 		});
 
-		if (this._window) {
+		if (getiOSWindow()) {
 			if (root !== null && !isEmbedded()) {
 				this.setWindowContent(root);
 			}
 		} else {
-			this._window = this.window; // UIApplication.sharedApplication.keyWindow;
+			setiOSWindow(this.window);
 		}
 	}
 
@@ -400,6 +411,7 @@ export class iOSApplication extends ApplicationCommon implements IiOSApplication
 		const controller = this.getViewController(rootView);
 
 		this._rootView = rootView;
+		setRootView(rootView);
 
 		// setup view as styleScopeHost
 		rootView._setupAsRootView({});
@@ -430,11 +442,11 @@ export class iOSApplication extends ApplicationCommon implements IiOSApplication
 	private didFinishLaunchingWithOptions(notification: NSNotification) {
 		this.setMaxRefreshRate();
 		// ensures window is assigned to proper window scene
-		this._window = this.window;
+		setiOSWindow(this.window);
 
-		if (!this._window) {
+		if (!getiOSWindow()) {
 			// if still no window, create one
-			this._window = UIWindow.alloc().initWithFrame(UIScreen.mainScreen.bounds);
+			setiOSWindow(UIWindow.alloc().initWithFrame(UIScreen.mainScreen.bounds));
 		}
 
 		if (!__VISIONOS__) {
@@ -514,3 +526,520 @@ global.__onLiveSyncCore = function (context?: ModuleContext) {
 export * from './application-common';
 export const Application = iosApp;
 export const AndroidApplication = undefined;
+
+function fontScaleChanged(origFontScale: number) {
+	const oldValue = getFontScale();
+	setFontScale(getClosestValidFontScale(origFontScale));
+	const currentFontScale = getFontScale();
+
+	if (oldValue !== currentFontScale) {
+		Application.notify({
+			eventName: Application.fontScaleChangedEvent,
+			object: Application,
+			newValue: currentFontScale,
+		});
+	}
+}
+
+export function getCurrentFontScale(): number {
+	setupConfigListener();
+
+	return getFontScale();
+}
+
+const sizeMap = new Map<string, number>([
+	[UIContentSizeCategoryExtraSmall, 0.5],
+	[UIContentSizeCategorySmall, 0.7],
+	[UIContentSizeCategoryMedium, 0.85],
+	[UIContentSizeCategoryLarge, 1],
+	[UIContentSizeCategoryExtraLarge, 1.15],
+	[UIContentSizeCategoryExtraExtraLarge, 1.3],
+	[UIContentSizeCategoryExtraExtraExtraLarge, 1.5],
+	[UIContentSizeCategoryAccessibilityMedium, 2],
+	[UIContentSizeCategoryAccessibilityLarge, 2.5],
+	[UIContentSizeCategoryAccessibilityExtraLarge, 3],
+	[UIContentSizeCategoryAccessibilityExtraExtraLarge, 3.5],
+	[UIContentSizeCategoryAccessibilityExtraExtraExtraLarge, 4],
+]);
+
+function contentSizeUpdated(fontSize: string) {
+	if (sizeMap.has(fontSize)) {
+		fontScaleChanged(sizeMap.get(fontSize));
+
+		return;
+	}
+
+	fontScaleChanged(1);
+}
+
+function useIOSFontScale() {
+	if (Application.ios.nativeApp) {
+		contentSizeUpdated(Application.ios.nativeApp.preferredContentSizeCategory);
+	} else {
+		fontScaleChanged(1);
+	}
+}
+
+let fontSizeObserver;
+function setupConfigListener(attempt = 0) {
+	if (fontSizeObserver) {
+		return;
+	}
+
+	if (!Application.ios.nativeApp) {
+		if (attempt > 100) {
+			fontScaleChanged(1);
+
+			return;
+		}
+
+		// Couldn't get launchEvent to trigger.
+		setTimeout(() => setupConfigListener(attempt + 1), 1);
+
+		return;
+	}
+
+	fontSizeObserver = Application.ios.addNotificationObserver(UIContentSizeCategoryDidChangeNotification, (args) => {
+		const fontSize = args.userInfo.valueForKey(UIContentSizeCategoryNewValueKey);
+		contentSizeUpdated(fontSize);
+	});
+
+	Application.on(Application.exitEvent, () => {
+		if (fontSizeObserver) {
+			Application.ios.removeNotificationObserver(fontSizeObserver, UIContentSizeCategoryDidChangeNotification);
+			fontSizeObserver = null;
+		}
+
+		Application.off(Application.resumeEvent, useIOSFontScale);
+	});
+
+	Application.on(Application.resumeEvent, useIOSFontScale);
+
+	useIOSFontScale();
+}
+setInitFontScale(setupConfigListener);
+
+/**
+ * Convert array of values into a bitmask.
+ *
+ * @param values string values
+ * @param map    map lower-case name to integer value.
+ */
+function inputArrayToBitMask(values: string | string[], map: Map<string, number>): number {
+	return (
+		enforceArray(values)
+			.filter((value) => !!value)
+			.map((value) => `${value}`.toLocaleLowerCase())
+			.filter((value) => map.has(value))
+			.reduce((res, value) => res | map.get(value), 0) || 0
+	);
+}
+
+let AccessibilityTraitsMap: Map<string, number>;
+let RoleTypeMap: Map<AccessibilityRole, number>;
+
+let nativeFocusedNotificationObserver;
+let lastFocusedView: WeakRef<View>;
+function ensureNativeClasses() {
+	if (AccessibilityTraitsMap && nativeFocusedNotificationObserver) {
+		return;
+	}
+
+	AccessibilityTraitsMap = new Map<AccessibilityTrait, number>([
+		[AccessibilityTrait.AllowsDirectInteraction, UIAccessibilityTraitAllowsDirectInteraction],
+		[AccessibilityTrait.CausesPageTurn, UIAccessibilityTraitCausesPageTurn],
+		[AccessibilityTrait.NotEnabled, UIAccessibilityTraitNotEnabled],
+		[AccessibilityTrait.Selected, UIAccessibilityTraitSelected],
+		[AccessibilityTrait.UpdatesFrequently, UIAccessibilityTraitUpdatesFrequently],
+	]);
+
+	RoleTypeMap = new Map<AccessibilityRole, number>([
+		[AccessibilityRole.Adjustable, UIAccessibilityTraitAdjustable],
+		[AccessibilityRole.Button, UIAccessibilityTraitButton],
+		[AccessibilityRole.Checkbox, UIAccessibilityTraitButton],
+		[AccessibilityRole.Header, UIAccessibilityTraitHeader],
+		[AccessibilityRole.KeyboardKey, UIAccessibilityTraitKeyboardKey],
+		[AccessibilityRole.Image, UIAccessibilityTraitImage],
+		[AccessibilityRole.ImageButton, UIAccessibilityTraitImage | UIAccessibilityTraitButton],
+		[AccessibilityRole.Link, UIAccessibilityTraitLink],
+		[AccessibilityRole.None, UIAccessibilityTraitNone],
+		[AccessibilityRole.PlaysSound, UIAccessibilityTraitPlaysSound],
+		[AccessibilityRole.RadioButton, UIAccessibilityTraitButton],
+		[AccessibilityRole.Search, UIAccessibilityTraitSearchField],
+		[AccessibilityRole.StaticText, UIAccessibilityTraitStaticText],
+		[AccessibilityRole.StartsMediaSession, UIAccessibilityTraitStartsMediaSession],
+		[AccessibilityRole.Summary, UIAccessibilityTraitSummaryElement],
+		[AccessibilityRole.Switch, UIAccessibilityTraitButton],
+	]);
+
+	nativeFocusedNotificationObserver = Application.ios.addNotificationObserver(UIAccessibilityElementFocusedNotification, (args: NSNotification) => {
+		const uiView = args.userInfo?.objectForKey(UIAccessibilityFocusedElementKey) as UIView;
+		if (!uiView?.tag) {
+			return;
+		}
+
+		const rootView = Application.getRootView();
+
+		// We use the UIView's tag to find the NativeScript View by its domId.
+		let view = rootView.getViewByDomId<View>(uiView?.tag);
+		if (!view) {
+			for (const modalView of <Array<View>>rootView._getRootModalViews()) {
+				view = modalView.getViewByDomId(uiView?.tag);
+				if (view) {
+					break;
+				}
+			}
+		}
+
+		if (!view) {
+			return;
+		}
+
+		const lastView = lastFocusedView?.deref();
+		if (lastView && view !== lastView) {
+			const lastFocusedUIView = lastView.nativeViewProtected as UIView;
+			if (lastFocusedUIView) {
+				lastFocusedView = null;
+
+				notifyAccessibilityFocusState(lastView, false, true);
+			}
+		}
+
+		lastFocusedView = new WeakRef(view);
+
+		notifyAccessibilityFocusState(view, true, false);
+	});
+
+	Application.on(Application.exitEvent, () => {
+		if (nativeFocusedNotificationObserver) {
+			Application.ios.removeNotificationObserver(nativeFocusedNotificationObserver, UIAccessibilityElementFocusedNotification);
+		}
+
+		nativeFocusedNotificationObserver = null;
+		lastFocusedView = null;
+	});
+}
+
+export function updateAccessibilityProperties(view: View): void {
+	const uiView = view.nativeViewProtected as UIView;
+	if (!uiView) {
+		return;
+	}
+
+	ensureNativeClasses();
+
+	const accessibilityRole = view.accessibilityRole;
+	const accessibilityState = view.accessibilityState;
+
+	if (!view.accessible || view.accessibilityHidden) {
+		uiView.accessibilityTraits = UIAccessibilityTraitNone;
+
+		return;
+	}
+
+	// NOTE: left here for various core inspection passes while running the toolbox app
+	// console.log('--- Accessible element: ', view.constructor.name);
+	// console.log('accessibilityLabel: ', view.accessibilityLabel);
+	// console.log('accessibilityRole: ', accessibilityRole);
+	// console.log('accessibilityState: ', accessibilityState);
+	// console.log('accessibilityValue: ', view.accessibilityValue);
+
+	let a11yTraits = UIAccessibilityTraitNone;
+	if (RoleTypeMap.has(accessibilityRole)) {
+		a11yTraits |= RoleTypeMap.get(accessibilityRole);
+	}
+
+	switch (accessibilityRole) {
+		case AccessibilityRole.Checkbox:
+		case AccessibilityRole.RadioButton:
+		case AccessibilityRole.Switch: {
+			if (accessibilityState === AccessibilityState.Checked) {
+				a11yTraits |= AccessibilityTraitsMap.get(AccessibilityTrait.Selected);
+			}
+			break;
+		}
+		default: {
+			if (accessibilityState === AccessibilityState.Selected) {
+				a11yTraits |= AccessibilityTraitsMap.get(AccessibilityTrait.Selected);
+			}
+			if (accessibilityState === AccessibilityState.Disabled) {
+				a11yTraits |= AccessibilityTraitsMap.get(AccessibilityTrait.NotEnabled);
+			}
+			break;
+		}
+	}
+
+	const UpdatesFrequentlyTrait = AccessibilityTraitsMap.get(AccessibilityTrait.UpdatesFrequently);
+
+	switch (view.accessibilityLiveRegion) {
+		case AccessibilityLiveRegion.Polite:
+		case AccessibilityLiveRegion.Assertive: {
+			a11yTraits |= UpdatesFrequentlyTrait;
+			break;
+		}
+		default: {
+			a11yTraits &= ~UpdatesFrequentlyTrait;
+			break;
+		}
+	}
+
+	// NOTE: left here for various core inspection passes while running the toolbox app
+	// if (view.accessibilityLiveRegion) {
+	// 	console.log('accessibilityLiveRegion:', view.accessibilityLiveRegion);
+	// }
+
+	if (view.accessibilityMediaSession) {
+		a11yTraits |= RoleTypeMap.get(AccessibilityRole.StartsMediaSession);
+	}
+
+	// NOTE: There were duplicated types in traits and roles previously which we conslidated
+	// not sure if this is still needed
+	// accessibilityTraits used to be stored on {N} view component but if the above
+	// is combining all traits fresh each time through, don't believe we need to keep track or previous traits
+	// if (view.accessibilityTraits) {
+	// 	a11yTraits |= inputArrayToBitMask(view.accessibilityTraits, AccessibilityTraitsMap);
+	// }
+
+	// NOTE: left here for various core inspection passes while running the toolbox app
+	// console.log('a11yTraits:', a11yTraits);
+	// console.log('    ');
+
+	uiView.accessibilityTraits = a11yTraits;
+}
+setA11yUpdatePropertiesCallback(updateAccessibilityProperties);
+
+export const sendAccessibilityEvent = (): void => {};
+
+export function isAccessibilityServiceEnabled(): boolean {
+	const accessibilityServiceEnabled = isA11yEnabled();
+	if (typeof accessibilityServiceEnabled === 'boolean') {
+		return accessibilityServiceEnabled;
+	}
+
+	let isVoiceOverRunning: () => boolean;
+	if (typeof UIAccessibilityIsVoiceOverRunning === 'function') {
+		isVoiceOverRunning = UIAccessibilityIsVoiceOverRunning;
+	} else {
+		// iOS is too old to tell us if voice over is enabled
+		if (typeof UIAccessibilityIsVoiceOverRunning !== 'function') {
+			setA11yEnabled(false);
+			return isA11yEnabled();
+		}
+	}
+
+	setA11yEnabled(isVoiceOverRunning());
+
+	let voiceOverStatusChangedNotificationName: string | null = null;
+	if (typeof UIAccessibilityVoiceOverStatusDidChangeNotification !== 'undefined') {
+		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusDidChangeNotification;
+	} else if (typeof UIAccessibilityVoiceOverStatusChanged !== 'undefined') {
+		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusChanged;
+	}
+
+	if (voiceOverStatusChangedNotificationName) {
+		nativeObserver = Application.ios.addNotificationObserver(voiceOverStatusChangedNotificationName, () => {
+			setA11yEnabled(isVoiceOverRunning());
+		});
+
+		Application.on(Application.exitEvent, () => {
+			if (nativeObserver) {
+				Application.ios.removeNotificationObserver(nativeObserver, voiceOverStatusChangedNotificationName);
+			}
+
+			setA11yEnabled(undefined);
+			nativeObserver = null;
+		});
+	}
+
+	Application.on(Application.resumeEvent, () => {
+		setA11yEnabled(isVoiceOverRunning());
+	});
+
+	return isA11yEnabled();
+}
+
+export function getAndroidAccessibilityManager(): null {
+	return null;
+}
+
+let sharedA11YObservable: SharedA11YObservable;
+let nativeObserver;
+
+function getSharedA11YObservable(): SharedA11YObservable {
+	if (sharedA11YObservable) {
+		return sharedA11YObservable;
+	}
+
+	sharedA11YObservable = new SharedA11YObservable();
+
+	let isVoiceOverRunning: () => boolean;
+	if (typeof UIAccessibilityIsVoiceOverRunning === 'function') {
+		isVoiceOverRunning = UIAccessibilityIsVoiceOverRunning;
+	} else {
+		if (typeof UIAccessibilityIsVoiceOverRunning !== 'function') {
+			Trace.write(`UIAccessibilityIsVoiceOverRunning() - is not a function`, Trace.categories.Accessibility, Trace.messageType.error);
+
+			isVoiceOverRunning = () => false;
+		}
+	}
+
+	sharedA11YObservable.set(AccessibilityServiceEnabledPropName, isVoiceOverRunning());
+
+	let voiceOverStatusChangedNotificationName: string | null = null;
+	if (typeof UIAccessibilityVoiceOverStatusDidChangeNotification !== 'undefined') {
+		// iOS 11+
+		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusDidChangeNotification;
+	} else if (typeof UIAccessibilityVoiceOverStatusChanged !== 'undefined') {
+		// iOS <11
+		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusChanged;
+	}
+
+	if (voiceOverStatusChangedNotificationName) {
+		nativeObserver = Application.ios.addNotificationObserver(voiceOverStatusChangedNotificationName, () => {
+			sharedA11YObservable?.set(AccessibilityServiceEnabledPropName, isVoiceOverRunning());
+		});
+
+		Application.on(Application.exitEvent, () => {
+			if (nativeObserver) {
+				Application.ios.removeNotificationObserver(nativeObserver, voiceOverStatusChangedNotificationName);
+			}
+
+			nativeObserver = null;
+
+			if (sharedA11YObservable) {
+				sharedA11YObservable.removeEventListener(Observable.propertyChangeEvent);
+
+				sharedA11YObservable = null;
+			}
+		});
+	}
+
+	Application.on(Application.resumeEvent, () => sharedA11YObservable.set(AccessibilityServiceEnabledPropName, isVoiceOverRunning()));
+
+	return sharedA11YObservable;
+}
+
+export class AccessibilityServiceEnabledObservable extends CommonA11YServiceEnabledObservable {
+	constructor() {
+		super(getSharedA11YObservable());
+	}
+}
+
+let accessibilityServiceObservable: AccessibilityServiceEnabledObservable;
+export function ensureClasses() {
+	if (accessibilityServiceObservable) {
+		return;
+	}
+
+	setFontScaleCssClasses(new Map(VALID_FONT_SCALES.map((fs) => [fs, `a11y-fontscale-${Number(fs * 100).toFixed(0)}`])));
+
+	accessibilityServiceObservable = new AccessibilityServiceEnabledObservable();
+}
+
+export function updateCurrentHelperClasses(applyRootCssClass: (cssClasses: string[], newCssClass: string) => void): void {
+	const fontScale = getFontScale();
+	const fontScaleCategory = getFontScaleCategory();
+	const fontScaleCssClasses = getFontScaleCssClasses();
+	const oldFontScaleClass = getCurrentFontScaleClass();
+	if (fontScaleCssClasses.has(fontScale)) {
+		setCurrentFontScaleClass(fontScaleCssClasses.get(fontScale));
+	} else {
+		setCurrentFontScaleClass(fontScaleCssClasses.get(1));
+	}
+
+	if (oldFontScaleClass !== getCurrentFontScaleClass()) {
+		applyRootCssClass([...fontScaleCssClasses.values()], getCurrentFontScaleClass());
+	}
+
+	const oldActiveFontScaleCategory = getCurrentFontScaleCategory();
+	switch (fontScaleCategory) {
+		case FontScaleCategory.ExtraSmall: {
+			setCurrentFontScaleCategory(fontScaleExtraSmallCategoryClass);
+			break;
+		}
+		case FontScaleCategory.Medium: {
+			setCurrentFontScaleCategory(fontScaleMediumCategoryClass);
+			break;
+		}
+		case FontScaleCategory.ExtraLarge: {
+			setCurrentFontScaleCategory(fontScaleExtraLargeCategoryClass);
+			break;
+		}
+		default: {
+			setCurrentFontScaleCategory(fontScaleMediumCategoryClass);
+			break;
+		}
+	}
+
+	if (oldActiveFontScaleCategory !== getCurrentFontScaleCategory()) {
+		applyRootCssClass(fontScaleCategoryClasses, getCurrentFontScaleCategory());
+	}
+
+	const oldA11YStatusClass = getCurrentA11YServiceClass();
+	if (accessibilityServiceObservable.accessibilityServiceEnabled) {
+		setCurrentA11YServiceClass(a11yServiceEnabledClass);
+	} else {
+		setCurrentA11YServiceClass(a11yServiceDisabledClass);
+	}
+
+	if (oldA11YStatusClass !== getCurrentA11YServiceClass()) {
+		applyRootCssClass(a11yServiceClasses, getCurrentA11YServiceClass());
+	}
+}
+
+function applyRootCssClass(cssClasses: string[], newCssClass: string): void {
+	const rootView = Application.getRootView();
+	if (!rootView) {
+		return;
+	}
+
+	Application.applyCssClass(rootView, cssClasses, newCssClass);
+
+	const rootModalViews = <Array<View>>rootView._getRootModalViews();
+	rootModalViews.forEach((rootModalView) => Application.applyCssClass(rootModalView, cssClasses, newCssClass));
+}
+
+function applyFontScaleToRootViews(): void {
+	const rootView = Application.getRootView();
+	if (!rootView) {
+		return;
+	}
+
+	const fontScale = getCurrentFontScale();
+
+	rootView.style.fontScaleInternal = fontScale;
+
+	const rootModalViews = <Array<View>>rootView._getRootModalViews();
+	rootModalViews.forEach((rootModalView) => (rootModalView.style.fontScaleInternal = fontScale));
+}
+
+export function initAccessibilityCssHelper(): void {
+	ensureClasses();
+
+	Application.on(Application.fontScaleChangedEvent, () => {
+		updateCurrentHelperClasses(applyRootCssClass);
+		applyFontScaleToRootViews();
+	});
+
+	accessibilityServiceObservable.on(AccessibilityServiceEnabledObservable.propertyChangeEvent, () => updateCurrentHelperClasses(applyRootCssClass));
+}
+setInitAccessibilityCssHelper(initAccessibilityCssHelper);
+
+const applicationEvents: string[] = [Application.orientationChangedEvent, Application.systemAppearanceChangedEvent];
+function toggleApplicationEventListeners(toAdd: boolean, callback: (args: ApplicationEventData) => void) {
+	for (const eventName of applicationEvents) {
+		if (toAdd) {
+			Application.on(eventName, callback);
+		} else {
+			Application.off(eventName, callback);
+		}
+	}
+}
+setToggleApplicationEventListenersCallback(toggleApplicationEventListeners);
+
+setApplicationPropertiesCallback(() => {
+	return {
+		orientation: Application.orientation(),
+		systemAppearance: Application.systemAppearance(),
+	};
+});
diff --git a/packages/core/application/helpers-common.ts b/packages/core/application/helpers-common.ts
new file mode 100644
index 0000000000..eeb6a35f88
--- /dev/null
+++ b/packages/core/application/helpers-common.ts
@@ -0,0 +1,86 @@
+/**
+ * Keep this helper file slim to avoid circular dependencies.
+ * Used to define helper functions and variables that are shared between Android and iOS
+ * without introducing platform-specific code directly.
+ * It should not import platform-specific modules directly.
+ */
+let nativeApp: UIApplication | android.app.Application;
+
+/**
+ * Get the current application instance.
+ * @returns current application instance, UIApplication on iOS or android.app.Application on Android.
+ */
+export function getNativeApp() {
+	return nativeApp;
+}
+
+/**
+ * This is called internally to set the native application instance.
+ * You typically do not need to call this directly.
+ * However, it's exposed for special case purposes, such as custom application initialization.
+ * @param app The native application instance to set.
+ * This should be called once during application startup to set the native app instance.
+ */
+export function setNativeApp(app: UIApplication | android.app.Application) {
+	nativeApp = app;
+}
+
+let rootView: any;
+
+export function getRootView() {
+	return rootView;
+}
+
+export function setRootView(view: any) {
+	rootView = view;
+}
+
+let _appInBackground: boolean = false;
+export function isAppInBackground() {
+	return _appInBackground;
+}
+export function setAppInBackground(value: boolean) {
+	_appInBackground = value;
+}
+
+let _iosWindow: UIWindow;
+export function getiOSWindow(): UIWindow {
+	return _iosWindow;
+}
+export function setiOSWindow(value: UIWindow) {
+	_iosWindow = value;
+}
+
+// Aids avoiding circular dependencies by allowing the application event listeners to be toggled
+let _toggleApplicationEventListenersHandler: (toAdd: boolean, callback: (args: any) => void) => void;
+export function toggleApplicationEventListeners(toAdd: boolean, callback: (args: any) => void) {
+	if (_toggleApplicationEventListenersHandler) {
+		_toggleApplicationEventListenersHandler(toAdd, callback);
+	}
+}
+export function setToggleApplicationEventListenersCallback(callback: (toAdd: boolean, callback: (args: any) => void) => void) {
+	_toggleApplicationEventListenersHandler = callback;
+}
+
+// Aids avoiding circular dependencies by allowing the application properties to be retrieved
+type ApplicationPropertyValues = { orientation: 'portrait' | 'landscape' | 'unknown'; systemAppearance: 'dark' | 'light' | null };
+let _applicationPropertiesCallback: () => ApplicationPropertyValues;
+export function getApplicationProperties(): ApplicationPropertyValues {
+	if (_applicationPropertiesCallback) {
+		return _applicationPropertiesCallback();
+	}
+	return { orientation: 'unknown', systemAppearance: null };
+}
+export function setApplicationPropertiesCallback(callback: () => ApplicationPropertyValues) {
+	_applicationPropertiesCallback = callback;
+}
+
+let _a11yUpdatePropertiesCallback: (view: any /* View */) => void;
+export function setA11yUpdatePropertiesCallback(callback: (view: any /* View */) => void) {
+	_a11yUpdatePropertiesCallback = callback;
+}
+export function updateA11yPropertiesCallback(view: any /* View */) {
+	if (_a11yUpdatePropertiesCallback) {
+		_a11yUpdatePropertiesCallback(view);
+	}
+}
diff --git a/packages/core/application/helpers.android.ts b/packages/core/application/helpers.android.ts
new file mode 100644
index 0000000000..9fedb8d97f
--- /dev/null
+++ b/packages/core/application/helpers.android.ts
@@ -0,0 +1,204 @@
+import { SDK_VERSION } from '../utils/constants';
+import { getNativeApp, updateA11yPropertiesCallback } from './helpers-common';
+import { AccessibilityRole, AccessibilityState } from '../accessibility/accessibility-common';
+import { Trace } from '../trace';
+
+let _startActivity: androidx.appcompat.app.AppCompatActivity;
+let _foregroundActivity: androidx.appcompat.app.AppCompatActivity;
+
+export function androidGetCurrentActivity(): androidx.appcompat.app.AppCompatActivity {
+	return _foregroundActivity || _startActivity;
+}
+export function androidGetForegroundActivity(): androidx.appcompat.app.AppCompatActivity {
+	return _foregroundActivity;
+}
+export function androidSetForegroundActivity(activity: androidx.appcompat.app.AppCompatActivity): void {
+	_foregroundActivity = activity;
+}
+export function androidGetStartActivity(): androidx.appcompat.app.AppCompatActivity {
+	return _startActivity;
+}
+export function androidSetStartActivity(activity: androidx.appcompat.app.AppCompatActivity): void {
+	_startActivity = activity;
+}
+
+function getApplicationContext(): android.content.Context {
+	return (getNativeApp() as android.app.Application).getApplicationContext();
+}
+
+export const androidRegisteredReceivers: { [key: string]: android.content.BroadcastReceiver } = {};
+export const androidPendingReceiverRegistrations = new Array<(context: android.content.Context) => void>();
+
+declare class BroadcastReceiver extends android.content.BroadcastReceiver {
+	constructor(onReceiveCallback: (context: android.content.Context, intent: android.content.Intent) => void);
+}
+
+let BroadcastReceiver_: typeof BroadcastReceiver;
+function initBroadcastReceiver() {
+	if (BroadcastReceiver_) {
+		return BroadcastReceiver_;
+	}
+
+	@NativeClass
+	class BroadcastReceiverImpl extends android.content.BroadcastReceiver {
+		private _onReceiveCallback: (context: android.content.Context, intent: android.content.Intent) => void;
+
+		constructor(onReceiveCallback: (context: android.content.Context, intent: android.content.Intent) => void) {
+			super();
+			this._onReceiveCallback = onReceiveCallback;
+
+			return global.__native(this);
+		}
+
+		public onReceive(context: android.content.Context, intent: android.content.Intent) {
+			if (this._onReceiveCallback) {
+				this._onReceiveCallback(context, intent);
+			}
+		}
+	}
+
+	BroadcastReceiver_ = BroadcastReceiverImpl;
+	return BroadcastReceiver_;
+}
+
+export function androidRegisterBroadcastReceiver(intentFilter: string, onReceiveCallback: (context: android.content.Context, intent: android.content.Intent) => void, flags = 2): void {
+	const registerFunc = (context: android.content.Context) => {
+		const receiver: android.content.BroadcastReceiver = new (initBroadcastReceiver())(onReceiveCallback);
+		if (SDK_VERSION >= 26) {
+			context.registerReceiver(receiver, new android.content.IntentFilter(intentFilter), flags);
+		} else {
+			context.registerReceiver(receiver, new android.content.IntentFilter(intentFilter));
+		}
+		androidRegisteredReceivers[intentFilter] = receiver;
+	};
+
+	if (getApplicationContext()) {
+		registerFunc(getApplicationContext());
+	} else {
+		androidPendingReceiverRegistrations.push(registerFunc);
+	}
+}
+
+export function androidUnregisterBroadcastReceiver(intentFilter: string): void {
+	const receiver = androidRegisteredReceivers[intentFilter];
+	if (receiver) {
+		getApplicationContext().unregisterReceiver(receiver);
+		androidRegisteredReceivers[intentFilter] = undefined;
+		delete androidRegisteredReceivers[intentFilter];
+	}
+}
+
+export function updateContentDescription(view: any /* View */, forceUpdate?: boolean): string | null {
+	if (!view.nativeViewProtected) {
+		return;
+	}
+
+	return applyContentDescription(view, forceUpdate);
+}
+
+export function applyContentDescription(view: any /* View */, forceUpdate?: boolean) {
+	let androidView = view.nativeViewProtected as android.view.View;
+	if (!androidView || (androidView instanceof android.widget.TextView && !view._androidContentDescriptionUpdated)) {
+		return null;
+	}
+
+	if (androidView instanceof androidx.appcompat.widget.Toolbar) {
+		const numChildren = androidView.getChildCount();
+
+		for (let i = 0; i < numChildren; i += 1) {
+			const childAndroidView = androidView.getChildAt(i);
+			if (childAndroidView instanceof androidx.appcompat.widget.AppCompatTextView) {
+				androidView = childAndroidView;
+				break;
+			}
+		}
+	}
+
+	const cls = `applyContentDescription(${view})`;
+
+	const titleValue = view['title'] as string;
+	const textValue = view['text'] as string;
+
+	if (!forceUpdate && view._androidContentDescriptionUpdated === false && textValue === view['_lastText'] && titleValue === view['_lastTitle']) {
+		// prevent updating this too much
+		return androidView.getContentDescription();
+	}
+
+	const contentDescriptionBuilder = new Array<string>();
+
+	// Workaround: TalkBack won't read the checked state for fake Switch.
+	if (view.accessibilityRole === AccessibilityRole.Switch) {
+		const androidSwitch = new android.widget.Switch(getApplicationContext());
+		if (view.accessibilityState === AccessibilityState.Checked) {
+			contentDescriptionBuilder.push(androidSwitch.getTextOn());
+		} else {
+			contentDescriptionBuilder.push(androidSwitch.getTextOff());
+		}
+	}
+
+	if (view.accessibilityLabel) {
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls} - have accessibilityLabel`, Trace.categories.Accessibility);
+		}
+
+		contentDescriptionBuilder.push(`${view.accessibilityLabel}`);
+	}
+
+	if (view.accessibilityValue) {
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls} - have accessibilityValue`, Trace.categories.Accessibility);
+		}
+
+		contentDescriptionBuilder.push(`${view.accessibilityValue}`);
+	} else if (textValue) {
+		if (textValue !== view.accessibilityLabel) {
+			if (Trace.isEnabled()) {
+				Trace.write(`${cls} - don't have accessibilityValue - use 'text' value`, Trace.categories.Accessibility);
+			}
+
+			contentDescriptionBuilder.push(`${textValue}`);
+		}
+	} else if (titleValue) {
+		if (titleValue !== view.accessibilityLabel) {
+			if (Trace.isEnabled()) {
+				Trace.write(`${cls} - don't have accessibilityValue - use 'title' value`, Trace.categories.Accessibility);
+			}
+
+			contentDescriptionBuilder.push(`${titleValue}`);
+		}
+	}
+
+	if (view.accessibilityHint) {
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls} - have accessibilityHint`, Trace.categories.Accessibility);
+		}
+
+		contentDescriptionBuilder.push(`${view.accessibilityHint}`);
+	}
+
+	const contentDescription = contentDescriptionBuilder.join('. ').trim().replace(/^\.$/, '');
+
+	if (contentDescription) {
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls} - set to "${contentDescription}"`, Trace.categories.Accessibility);
+		}
+
+		androidView.setContentDescription(contentDescription);
+	} else {
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls} - remove value`, Trace.categories.Accessibility);
+		}
+
+		androidView.setContentDescription(null);
+	}
+
+	view['_lastTitle'] = titleValue;
+	view['_lastText'] = textValue;
+	view._androidContentDescriptionUpdated = false;
+
+	return contentDescription;
+}
+
+export function setupAccessibleView(view: any /* any */): void {
+	updateA11yPropertiesCallback(view);
+}
diff --git a/packages/core/application/helpers.d.ts b/packages/core/application/helpers.d.ts
new file mode 100644
index 0000000000..1d938c1993
--- /dev/null
+++ b/packages/core/application/helpers.d.ts
@@ -0,0 +1,25 @@
+/**
+ * Initialize accessibility for View. This should be called on loaded-event.
+ */
+export function setupAccessibleView(view: View): void;
+/**
+ * Android: Update the content description for views
+ */
+export const updateContentDescription: (view: any /* View */, forceUpdate?: boolean) => string | null;
+export function applyContentDescription(view: any /* View */, forceUpdate?: boolean);
+/* Android app-wide helpers */
+export const androidRegisteredReceivers: { [key: string]: android.content.BroadcastReceiver };
+export const androidPendingReceiverRegistrations: Array<(context: android.content.Context) => void>;
+export function androidRegisterBroadcastReceiver(intentFilter: string, onReceiveCallback: (context: android.content.Context, intent: android.content.Intent) => void, flags = 2): void;
+export function androidUnregisterBroadcastReceiver(intentFilter: string): void;
+export function androidGetCurrentActivity(): androidx.appcompat.app.AppCompatActivity;
+export function androidGetForegroundActivity(): androidx.appcompat.app.AppCompatActivity;
+export function androidSetForegroundActivity(activity: androidx.appcompat.app.AppCompatActivity): void;
+export function androidGetStartActivity(): androidx.appcompat.app.AppCompatActivity;
+export function androidSetStartActivity(activity: androidx.appcompat.app.AppCompatActivity): void;
+
+/* iOS app-wide helpers */
+export const iosNotificationObservers: NotificationObserver[];
+class NotificationObserver extends NSObject {}
+export function iosAddNotificationObserver(notificationName: string, onReceiveCallback: (notification: NSNotification) => void): NotificationObserver;
+export function iosRemoveNotificationObserver(observer: NotificationObserver, notificationName: string): void;
diff --git a/packages/core/application/helpers.ios.ts b/packages/core/application/helpers.ios.ts
new file mode 100644
index 0000000000..a435527b4b
--- /dev/null
+++ b/packages/core/application/helpers.ios.ts
@@ -0,0 +1,68 @@
+// stubs to avoid bundler warnings
+export const updateContentDescription = (view: any /* View */, forceUpdate?: boolean): string | null => null;
+export function applyContentDescription(view: any /* View */, forceUpdate?: boolean) {
+	return null;
+}
+export const androidRegisteredReceivers = undefined;
+export const androidPendingReceiverRegistrations = undefined;
+export function androidRegisterBroadcastReceiver(intentFilter: string, onReceiveCallback: (context: android.content.Context, intent: android.content.Intent) => void, flags = 2): void {}
+export function androidUnregisterBroadcastReceiver(intentFilter: string): void {}
+export function androidGetCurrentActivity() {}
+export function androidGetForegroundActivity() {}
+export function androidSetForegroundActivity(activity: androidx.appcompat.app.AppCompatActivity): void {}
+export function androidGetStartActivity() {}
+export function androidSetStartActivity(activity: androidx.appcompat.app.AppCompatActivity): void {}
+
+@NativeClass
+class NotificationObserver extends NSObject {
+	private _onReceiveCallback: (notification: NSNotification) => void;
+
+	public static initWithCallback(onReceiveCallback: (notification: NSNotification) => void): NotificationObserver {
+		const observer = <NotificationObserver>super.new();
+		observer._onReceiveCallback = onReceiveCallback;
+
+		return observer;
+	}
+
+	public onReceive(notification: NSNotification): void {
+		this._onReceiveCallback(notification);
+	}
+
+	public static ObjCExposedMethods = {
+		onReceive: { returns: interop.types.void, params: [NSNotification] },
+	};
+}
+
+export const iosNotificationObservers: NotificationObserver[] = [];
+export function iosAddNotificationObserver(notificationName: string, onReceiveCallback: (notification: NSNotification) => void) {
+	const observer = NotificationObserver.initWithCallback(onReceiveCallback);
+	NSNotificationCenter.defaultCenter.addObserverSelectorNameObject(observer, 'onReceive', notificationName, null);
+	iosNotificationObservers.push(observer);
+
+	return observer;
+}
+
+export function iosRemoveNotificationObserver(observer: NotificationObserver, notificationName: string) {
+	// TODO: test if this finds the right observer instance match everytime
+	// after circular dependencies are resolved
+	const index = iosNotificationObservers.indexOf(observer);
+	if (index >= 0) {
+		iosNotificationObservers.splice(index, 1);
+		NSNotificationCenter.defaultCenter.removeObserverNameObject(observer, notificationName, null);
+	}
+}
+
+export function setupAccessibleView(view: any /* any */): void {
+	const uiView = view.nativeViewProtected as UIView;
+	if (!uiView) {
+		return;
+	}
+
+	/**
+	 * We need to map back from the UIView to the NativeScript View.
+	 *
+	 * We do that by setting the uiView's tag to the View's domId.
+	 * This way we can do reverse lookup.
+	 */
+	uiView.tag = view._domId;
+}
diff --git a/packages/core/cli-hooks/before-checkForChanges.js b/packages/core/cli-hooks/before-checkForChanges.mjs
similarity index 85%
rename from packages/core/cli-hooks/before-checkForChanges.js
rename to packages/core/cli-hooks/before-checkForChanges.mjs
index 79f5be4913..207a679b69 100644
--- a/packages/core/cli-hooks/before-checkForChanges.js
+++ b/packages/core/cli-hooks/before-checkForChanges.mjs
@@ -1,15 +1,15 @@
-const semver = require("semver");
+import semver from 'semver';
 
 const webpackPackageName = "@nativescript/webpack";
 
-module.exports = function ($staticConfig, hookArgs) {
+export default function ($staticConfig, hookArgs) {
     const cliVersion = semver.parse($staticConfig.version);
-    const platfrom = hookArgs.prepareData.platform;
+    const platform = hookArgs.prepareData.platform;
     const projectData = hookArgs.projectData;
 
     // Required CLI version for building IOS: 6.2.0
-    if (platfrom.toLowerCase() === "ios" &&
-        !satisfiesRequriredVersion(cliVersion, 6, 2)) {
+    if (platform.toLowerCase() === "ios" &&
+        !satisfiesRequiredVersion(cliVersion, 6, 2)) {
         throw new Error(`Building @nativescript/core for iOS requires NativeScript CLI with version at least 6.2.0. Please upgrade your NativeScript CLI version (npm i -g nativescript).`);
     }
 
@@ -26,7 +26,7 @@ module.exports = function ($staticConfig, hookArgs) {
 /**
  * Checks if semver object satisifies a major/minor requirement. Pre-release versions are OK too!
  */
-function satisfiesRequriredVersion(actualVersion, requiredMajor, requiredMinor) {
+function satisfiesRequiredVersion(actualVersion, requiredMajor, requiredMinor) {
     // Return true for null version to handle tags (ex. "next", "rc")
     if (!actualVersion) {
         return true;
diff --git a/packages/core/cli-hooks/postinstall.js b/packages/core/cli-hooks/postinstall.js
deleted file mode 100644
index 01b05b46af..0000000000
--- a/packages/core/cli-hooks/postinstall.js
+++ /dev/null
@@ -1,2 +0,0 @@
-const path = require('path');
-require('@nativescript/hook')(path.join(__dirname, "..")).postinstall();
\ No newline at end of file
diff --git a/packages/core/cli-hooks/postinstall.mjs b/packages/core/cli-hooks/postinstall.mjs
new file mode 100644
index 0000000000..a3bd4c6c73
--- /dev/null
+++ b/packages/core/cli-hooks/postinstall.mjs
@@ -0,0 +1,7 @@
+import path from 'path';
+import hook from '@nativescript/hook';
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+hook(path.join(__dirname, "..")).postinstall();
\ No newline at end of file
diff --git a/packages/core/cli-hooks/preuninstall.js b/packages/core/cli-hooks/preuninstall.js
deleted file mode 100644
index 90f31ba7df..0000000000
--- a/packages/core/cli-hooks/preuninstall.js
+++ /dev/null
@@ -1,2 +0,0 @@
-const path = require('path');
-require('@nativescript/hook')(path.join(__dirname, "..")).preuninstall();
\ No newline at end of file
diff --git a/packages/core/cli-hooks/preuninstall.mjs b/packages/core/cli-hooks/preuninstall.mjs
new file mode 100644
index 0000000000..8fa234303f
--- /dev/null
+++ b/packages/core/cli-hooks/preuninstall.mjs
@@ -0,0 +1,7 @@
+import path from 'path';
+import hook from '@nativescript/hook';
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+hook(path.join(__dirname, "..")).preuninstall();
\ No newline at end of file
diff --git a/packages/core/color/color-common.ts b/packages/core/color/color-common.ts
index 886d449336..8df4650b86 100644
--- a/packages/core/color/color-common.ts
+++ b/packages/core/color/color-common.ts
@@ -1,10 +1,9 @@
-import * as definition from '.';
+import type { IColor } from './color-types';
 import * as types from '../utils/types';
 import * as knownColors from './known-colors';
-import { Color } from '.';
 import { HEX_REGEX, argbFromColorMix, argbFromHslOrHsla, argbFromHsvOrHsva, argbFromRgbOrRgba, hslToRgb, hsvToRgb, isCssColorMixExpression, isHslOrHsla, isHsvOrHsva, isRgbOrRgba, rgbToHsl, rgbToHsv, argbFromString } from './color-utils';
 
-export class ColorBase implements definition.Color {
+export class ColorBase implements IColor {
 	private _argb: number;
 	private _name: string;
 
@@ -112,11 +111,11 @@ export class ColorBase implements definition.Color {
 		return argbFromString(hex);
 	}
 
-	public equals(value: definition.Color): boolean {
+	public equals(value: IColor): boolean {
 		return value && this.argb === value.argb;
 	}
 
-	public static equals(value1: definition.Color, value2: definition.Color): boolean {
+	public static equals(value1: IColor, value2: IColor): boolean {
 		// both values are falsy
 		if (!value1 && !value2) {
 			return true;
@@ -131,7 +130,7 @@ export class ColorBase implements definition.Color {
 	}
 
 	public static isValid(value: any): boolean {
-		if (value instanceof Color) {
+		if (value instanceof ColorBase) {
 			return true;
 		}
 
@@ -147,10 +146,10 @@ export class ColorBase implements definition.Color {
 		return HEX_REGEX.test(value) || isRgbOrRgba(lowered) || isHslOrHsla(lowered);
 	}
 	public static fromHSL(a, h, s, l) {
-		return new Color(a, h, s, l, 'hsl');
+		return new ColorBase(a, h, s, l, 'hsl');
 	}
 	public static fromHSV(a, h, s, l) {
-		return new Color(a, h, s, l, 'hsv');
+		return new ColorBase(a, h, s, l, 'hsv');
 	}
 
 	public toString(): string {
@@ -160,7 +159,7 @@ export class ColorBase implements definition.Color {
 	/**
 	 * @param {UIColor} value
 	 */
-	public static fromIosColor(value: any): Color {
+	public static fromIosColor(value: any): ColorBase {
 		return undefined;
 	}
 
@@ -222,7 +221,7 @@ export class ColorBase implements definition.Color {
 	 * @param alpha (between 0 and 255)
 	 */
 	public setAlpha(a: number) {
-		return new Color(a, this.r, this.g, this.b);
+		return new ColorBase(a, this.r, this.g, this.b);
 	}
 
 	/**
@@ -234,7 +233,7 @@ export class ColorBase implements definition.Color {
 	}
 
 	/**
-	 * return the [CSS hsv](https://www.w3schools.com/Css/css_colors_hsl.asp) representation of the color
+	 * return the [CSS hsl](https://www.w3schools.com/Css/css_colors_hsl.asp) representation of the color
 	 *
 	 */
 	public toHslString() {
@@ -284,7 +283,7 @@ export class ColorBase implements definition.Color {
 	public desaturate(amount: number) {
 		amount = amount === 0 ? 0 : amount || 10;
 		const hsl = rgbToHsl(this.r, this.g, this.b);
-		return Color.fromHSL(this.a, hsl.h, Math.min(100, Math.max(0, hsl.s - amount)), hsl.l);
+		return ColorBase.fromHSL(this.a, hsl.h, Math.min(100, Math.max(0, hsl.s - amount)), hsl.l);
 	}
 
 	/**
@@ -295,7 +294,7 @@ export class ColorBase implements definition.Color {
 	public saturate(amount: number) {
 		amount = amount === 0 ? 0 : amount || 10;
 		const hsl = rgbToHsl(this.r, this.g, this.b);
-		return Color.fromHSL(this.a, hsl.h, Math.min(100, Math.max(0, hsl.s + amount)), hsl.l);
+		return ColorBase.fromHSL(this.a, hsl.h, Math.min(100, Math.max(0, hsl.s + amount)), hsl.l);
 	}
 
 	/**
@@ -314,7 +313,7 @@ export class ColorBase implements definition.Color {
 	public lighten(amount: number) {
 		amount = amount === 0 ? 0 : amount || 10;
 		const hsl = rgbToHsl(this.r, this.g, this.b);
-		return Color.fromHSL(this.a, hsl.h, hsl.s, Math.min(100, Math.max(0, hsl.l + amount)));
+		return ColorBase.fromHSL(this.a, hsl.h, hsl.s, Math.min(100, Math.max(0, hsl.l + amount)));
 	}
 
 	/**
@@ -327,7 +326,7 @@ export class ColorBase implements definition.Color {
 		const r = Math.max(0, Math.min(255, this.r - Math.round(255 * -(amount / 100))));
 		const g = Math.max(0, Math.min(255, this.g - Math.round(255 * -(amount / 100))));
 		const b = Math.max(0, Math.min(255, this.b - Math.round(255 * -(amount / 100))));
-		return new Color(this.a, r, g, b);
+		return new ColorBase(this.a, r, g, b);
 	}
 
 	/**
@@ -338,7 +337,7 @@ export class ColorBase implements definition.Color {
 	public darken(amount: number) {
 		amount = amount === 0 ? 0 : amount || 10;
 		const hsl = rgbToHsl(this.r, this.g, this.b);
-		return Color.fromHSL(this.a, hsl.h, hsl.s, Math.min(100, Math.max(0, hsl.l - amount)));
+		return ColorBase.fromHSL(this.a, hsl.h, hsl.s, Math.min(100, Math.max(0, hsl.l - amount)));
 	}
 
 	/**
@@ -350,7 +349,7 @@ export class ColorBase implements definition.Color {
 		const hsl = this.toHsl();
 		const hue = (hsl.h + amount) % 360;
 		hsl.h = hue < 0 ? 360 + hue : hue;
-		return Color.fromHSL(this.a, hsl.h, hsl.s, hsl.l);
+		return ColorBase.fromHSL(this.a, hsl.h, hsl.s, hsl.l);
 	}
 
 	/**
@@ -360,10 +359,10 @@ export class ColorBase implements definition.Color {
 	public complement() {
 		const hsl = this.toHsl();
 		hsl.h = (hsl.h + 180) % 360;
-		return Color.fromHSL(this.a, hsl.h, hsl.s, hsl.l);
+		return ColorBase.fromHSL(this.a, hsl.h, hsl.s, hsl.l);
 	}
 
-	static mix(color1: Color, color2: Color, amount = 50) {
+	static mix(color1: ColorBase, color2: ColorBase, amount = 50) {
 		const p = amount / 100;
 
 		const rgba = {
@@ -373,6 +372,6 @@ export class ColorBase implements definition.Color {
 			a: (color2.a - color1.a) * p + color1.a,
 		};
 
-		return new Color(rgba.a, rgba.r, rgba.g, rgba.b);
+		return new ColorBase(rgba.a, rgba.r, rgba.g, rgba.b);
 	}
 }
diff --git a/packages/core/color/color-types.ts b/packages/core/color/color-types.ts
new file mode 100644
index 0000000000..85bbf8496e
--- /dev/null
+++ b/packages/core/color/color-types.ts
@@ -0,0 +1,44 @@
+// Shared Color interface/type for use in color-common.ts and platform files
+
+export interface IColor {
+	readonly a: number;
+	readonly r: number;
+	readonly g: number;
+	readonly b: number;
+	readonly hex: string;
+	readonly argb: number;
+	readonly name: string;
+	readonly android: number;
+	readonly ios: any;
+
+	equals(value: IColor): boolean;
+	isDark(): boolean;
+	isLight(): boolean;
+	getBrightness(): number;
+	getLuminance(): number;
+	setAlpha(a: number): IColor;
+	toHsl(): { h: number; s: number; l: number; a: number };
+	toHslString(): string;
+	toHsv(): { h: number; s: number; v: number; a: number };
+	toHsvString(): string;
+	toRgbString(): string;
+	desaturate(amount: number): IColor;
+	saturate(amount: number): IColor;
+	greyscale(): IColor;
+	lighten(amount: number): IColor;
+	brighten(amount: number): IColor;
+	darken(amount: number): IColor;
+	spin(amount: number): IColor;
+	complement(): IColor;
+}
+
+// Optionally, export the Color class type for static methods if needed
+export type ColorClass = {
+	new (...args: any[]): IColor;
+	isValid(value: any): boolean;
+	fromIosColor(value: any): IColor;
+	fromHSL(a: number, h: number, s: number, l: number): IColor;
+	fromHSV(a: number, h: number, s: number, l: number): IColor;
+	mix(color1: IColor, color2: IColor, amount?: number): IColor;
+	equals(value1: IColor, value2: IColor): boolean;
+};
diff --git a/packages/core/color/index.ios.ts b/packages/core/color/index.ios.ts
index 063496cafa..e4d4bdd59a 100644
--- a/packages/core/color/index.ios.ts
+++ b/packages/core/color/index.ios.ts
@@ -1,6 +1,7 @@
 import { ColorBase } from './color-common';
+import type { IColor } from './color-types';
 
-export class Color extends ColorBase {
+export class Color extends ColorBase implements IColor {
 	private _ios: UIColor;
 
 	get ios(): UIColor {
diff --git a/packages/core/connectivity/index.android.ts b/packages/core/connectivity/index.android.ts
index 2419987e02..da625e4671 100644
--- a/packages/core/connectivity/index.android.ts
+++ b/packages/core/connectivity/index.android.ts
@@ -1,4 +1,5 @@
-import { Application } from '../application';
+import { getNativeApp } from '../application/helpers-common';
+import { androidRegisterBroadcastReceiver, androidUnregisterBroadcastReceiver } from '../application/helpers';
 import { SDK_VERSION } from '../utils/constants';
 
 export enum connectionType {
@@ -18,7 +19,7 @@ const vpn = 'vpn';
 
 // Get Connection Type
 function getConnectivityManager(): android.net.ConnectivityManager {
-	return Application.android.getNativeApplication().getApplicationContext().getSystemService(android.content.Context.CONNECTIVITY_SERVICE);
+	return (getNativeApp() as android.app.Application).getApplicationContext().getSystemService(android.content.Context.CONNECTIVITY_SERVICE);
 }
 
 function getActiveNetworkInfo(): android.net.NetworkInfo {
@@ -109,7 +110,7 @@ function startMonitoringLegacy(connectionTypeChangedCallback) {
 		connectionTypeChangedCallback(newConnectionType);
 	};
 	const zoneCallback = zonedCallback(onReceiveCallback);
-	Application.android.registerBroadcastReceiver(android.net.ConnectivityManager.CONNECTIVITY_ACTION, zoneCallback);
+	androidRegisterBroadcastReceiver(android.net.ConnectivityManager.CONNECTIVITY_ACTION, zoneCallback);
 }
 
 let callback;
@@ -170,6 +171,6 @@ export function stopMonitoring(): void {
 			callback = null;
 		}
 	} else {
-		Application.android.unregisterBroadcastReceiver(android.net.ConnectivityManager.CONNECTIVITY_ACTION);
+		androidUnregisterBroadcastReceiver(android.net.ConnectivityManager.CONNECTIVITY_ACTION);
 	}
 }
diff --git a/packages/core/core-types/animation-types.ts b/packages/core/core-types/animation-types.ts
new file mode 100644
index 0000000000..411124f5b9
--- /dev/null
+++ b/packages/core/core-types/animation-types.ts
@@ -0,0 +1,17 @@
+/**
+ * Defines a custom animation timing curve by using the cubic-bezier function.
+ * Possible values are numeric values from 0 to 1
+ */
+export class CubicBezierAnimationCurve {
+	public x1: number;
+	public y1: number;
+	public x2: number;
+	public y2: number;
+
+	constructor(x1: number, y1: number, x2: number, y2: number) {
+		this.x1 = x1;
+		this.y1 = y1;
+		this.x2 = x2;
+		this.y2 = y2;
+	}
+}
diff --git a/packages/core/core-types/index.ts b/packages/core/core-types/index.ts
index 30c31c9ccd..b4dbf39a5c 100644
--- a/packages/core/core-types/index.ts
+++ b/packages/core/core-types/index.ts
@@ -3,8 +3,8 @@
  */
 
 // imported for definition purposes only
-import { makeValidator, makeParser } from '../ui/core/properties';
-import { CubicBezierAnimationCurve } from '../ui/animation/animation-interfaces';
+import { makeValidator, makeParser } from './validators';
+import { CubicBezierAnimationCurve } from './animation-types';
 
 export namespace CoreTypes {
 	export type CSSWideKeywords = 'initial' | 'inherit' | 'unset' | 'revert';
@@ -146,7 +146,7 @@ export namespace CoreTypes {
 		export const sup = 'sup';
 		export const sub = 'sub';
 		export const baseline = 'baseline';
-		export const isValid = makeValidator<VerticalAlignmentTextType>(top, middle, bottom, stretch, texttop, textbottom, sup, sub, baseline);
+		export const isValid = makeValidator<CoreTypes.VerticalAlignmentTextType>(top, middle, bottom, stretch, texttop, textbottom, sup, sub, baseline);
 		export const parse = (value: string) => (value.toLowerCase() === 'center' ? middle : parseStrict(value));
 		const parseStrict = makeParser<CoreTypes.VerticalAlignmentTextType>(isValid);
 	}
diff --git a/packages/core/core-types/validators.ts b/packages/core/core-types/validators.ts
new file mode 100644
index 0000000000..816cd3f5ec
--- /dev/null
+++ b/packages/core/core-types/validators.ts
@@ -0,0 +1,19 @@
+// Utility functions for validation and parsing, shared between core-types and properties
+
+export function makeValidator<T>(...values: T[]): (value: any) => value is T {
+	return function (value: any): value is T {
+		return values.indexOf(value) !== -1;
+	};
+}
+
+export function makeParser<T>(isValid: (value: any) => boolean, allowNumbers = false): (value: any) => T {
+	return function (value: any): T {
+		if (allowNumbers && typeof value === 'number') {
+			return value as T;
+		}
+		if (isValid(value)) {
+			return value as T;
+		}
+		throw new Error(`Invalid value: ${value}`);
+	};
+}
diff --git a/packages/core/css-mediaquery/index.ts b/packages/core/css-mediaquery/index.ts
index 6313b3f1d6..c55ddb65a2 100644
--- a/packages/core/css-mediaquery/index.ts
+++ b/packages/core/css-mediaquery/index.ts
@@ -7,7 +7,7 @@ See the accompanying LICENSE file for terms.
 // https://github.com/ericf/css-mediaquery
 
 import { Trace } from '../trace';
-import { Length } from '../ui/styling/style-properties';
+import { Length } from '../ui/styling/length-shared';
 
 // -----------------------------------------------------------------------------
 
diff --git a/packages/core/debugger/devtools-elements-interfaces.ts b/packages/core/debugger/devtools-elements-interfaces.ts
index 7319971bc8..4fc8916303 100644
--- a/packages/core/debugger/devtools-elements-interfaces.ts
+++ b/packages/core/debugger/devtools-elements-interfaces.ts
@@ -1,5 +1,5 @@
 //Types
-import { DOMNode } from './dom-node';
+import { DOMNode } from './dom-types';
 
 export interface InspectorCommands {
 	// DevTools -> Application communication. Methods that devtools calls when needed.
diff --git a/packages/core/debugger/devtools-elements.common.ts b/packages/core/debugger/devtools-elements.common.ts
index 6859ab4c10..6c5d8fb7d6 100644
--- a/packages/core/debugger/devtools-elements.common.ts
+++ b/packages/core/debugger/devtools-elements.common.ts
@@ -1,19 +1,24 @@
-// Types
-import { ViewBase } from '../ui/core/view-base';
-
-//Requires
-import { getNodeById } from './dom-node';
+import { androidGetCurrentActivity } from '../application/helpers';
+import { getRootView } from '../application/helpers-common';
+import type { ViewBase } from '../ui/core/view-base';
+import { unsetValue } from '../ui/core/properties/property-shared';
+import { getNodeById } from './dom-types';
 import { mainThreadify } from '../utils';
 
-// Use lazy requires for core modules
-const getAppRootView = () => require('../application').getRootView();
-
-let unsetValue;
-function unsetViewValue(view, name) {
-	if (!unsetValue) {
-		unsetValue = require('../ui/core/properties').unsetValue;
+function getAppRootView() {
+	if (__ANDROID__) {
+		const activity = androidGetCurrentActivity();
+		if (!activity) {
+			return undefined;
+		}
+		const callbacks = activity['_callbacks'];
+		return callbacks ? callbacks.getRootView() : undefined;
+	} else {
+		return getRootView();
 	}
+}
 
+function unsetViewValue(view, name) {
 	view[name] = unsetValue;
 }
 
diff --git a/packages/core/debugger/devtools-elements.ts b/packages/core/debugger/devtools-elements.ts
index eff78dcba3..7a19ab2f9c 100644
--- a/packages/core/debugger/devtools-elements.ts
+++ b/packages/core/debugger/devtools-elements.ts
@@ -3,7 +3,8 @@ import { InspectorEvents, InspectorCommands } from './devtools-elements-interfac
 
 // Requires
 import { getDocument, getComputedStylesForNode, removeNode, setAttributeAsText } from './devtools-elements.common';
-import { registerInspectorEvents, DOMNode } from './dom-node';
+import { registerInspectorEvents } from './dom-types';
+import { DOMNode } from './dom-types';
 
 export * from './devtools-elements-interfaces';
 
diff --git a/packages/core/debugger/dom-node.d.ts b/packages/core/debugger/dom-node.d.ts
deleted file mode 100644
index dbbe4e0708..0000000000
--- a/packages/core/debugger/dom-node.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { ViewBase } from '../ui/core/view-base';
-import { CSSComputedStyleProperty } from './css-agent';
-export declare function getNodeById(id: number): DOMNode;
-declare class WeakRef<T> {
-	constructor(obj: T);
-	get(): T;
-	clear(): void;
-}
-export declare class DOMNode {
-	nodeId: any;
-	nodeType: any;
-	nodeName: any;
-	localName: any;
-	nodeValue: string;
-	attributes: string[];
-	viewRef: WeakRef<ViewBase>;
-	constructor(view: ViewBase);
-	loadAttributes(): void;
-	readonly children: DOMNode[];
-	onChildAdded(childView: ViewBase): void;
-	onChildRemoved(view: ViewBase): void;
-	attributeModified(name: string, value: any): void;
-	attributeRemoved(name: string): void;
-	getComputedProperties(): CSSComputedStyleProperty[];
-	dispose(): void;
-	toJSON(): string;
-}
diff --git a/packages/core/debugger/dom-node.ts b/packages/core/debugger/dom-types.ts
similarity index 99%
rename from packages/core/debugger/dom-node.ts
rename to packages/core/debugger/dom-types.ts
index f7f229ffb1..fd01aa4a35 100644
--- a/packages/core/debugger/dom-node.ts
+++ b/packages/core/debugger/dom-types.ts
@@ -1,28 +1,29 @@
-import { CSSComputedStyleProperty } from './css-agent';
 import { InspectorEvents } from './devtools-elements-interfaces';
-
-// Needed for typings only
+import { CSSComputedStyleProperty } from './css-agent';
 import { ViewBase } from '../ui/core/view-base';
 
-const registeredDomNodes = {};
 const ELEMENT_NODE_TYPE = 1;
 const ROOT_NODE_TYPE = 9;
 const propertyBlacklist = ['effectivePaddingLeft', 'effectivePaddingBottom', 'effectivePaddingRight', 'effectivePaddingTop', 'effectiveBorderTopWidth', 'effectiveBorderRightWidth', 'effectiveBorderBottomWidth', 'effectiveBorderLeftWidth', 'effectiveMinWidth', 'effectiveMinHeight', 'effectiveWidth', 'effectiveHeight', 'effectiveMarginLeft', 'effectiveMarginTop', 'effectiveMarginRight', 'effectiveMarginBottom', 'nodeName', 'nodeType', 'decodeWidth', 'decodeHeight', 'ng-reflect-items', 'domNode', 'touchListenerIsSet', 'bindingContext', 'nativeView'];
 
 function lazy<T>(action: () => T): () => T {
 	let _value: T;
-
 	return () => _value || (_value = action());
 }
 const percentLengthToStringLazy = lazy<(length) => string>(() => require('../ui/styling/style-properties').PercentLength.convertToString);
 const getSetPropertiesLazy = lazy<(view: ViewBase) => [string, any][]>(() => require('../ui/core/properties').getSetProperties);
 const getComputedCssValuesLazy = lazy<(view: ViewBase) => [string, any][]>(() => require('../ui/core/properties').getComputedCssValues);
+const registeredDomNodes = {};
+
+export function getNodeById(id: number): DOMNode {
+	return registeredDomNodes[id];
+}
 
+let inspectorFrontendInstance: any;
 export function registerInspectorEvents(inspector: InspectorEvents) {
 	inspectorFrontendInstance = inspector;
 }
 
-let inspectorFrontendInstance: any;
 function notifyInspector(callback: (inspector: InspectorEvents) => void) {
 	if (inspectorFrontendInstance) {
 		callback(inspectorFrontendInstance);
@@ -63,10 +64,6 @@ function unregisterNode(domNode: DOMNode) {
 	delete registeredDomNodes[domNode.nodeId];
 }
 
-export function getNodeById(id: number): DOMNode {
-	return registeredDomNodes[id];
-}
-
 export class DOMNode {
 	nodeId;
 	nodeType;
diff --git a/packages/core/fetch/index.js b/packages/core/fetch/index.js
deleted file mode 100644
index 47e9a624d3..0000000000
--- a/packages/core/fetch/index.js
+++ /dev/null
@@ -1,539 +0,0 @@
-(function () {
-    "use strict";
-
-    var support = {
-        searchParams: "URLSearchParams" in global,
-        iterable: "Symbol" in global && "iterator" in Symbol,
-        blob:
-            "FileReader" in global &&
-            "Blob" in global &&
-            (function () {
-                try {
-                    new Blob();
-                    return true;
-                } catch (e) {
-                    return false;
-                }
-            })(),
-        formData: "FormData" in global,
-        arrayBuffer: "ArrayBuffer" in global
-    };
-
-    function isDataView(obj) {
-        return obj && DataView.prototype.isPrototypeOf(obj);
-    }
-
-    if (support.arrayBuffer) {
-        var viewClasses = [
-            "[object Int8Array]",
-            "[object Uint8Array]",
-            "[object Uint8ClampedArray]",
-            "[object Int16Array]",
-            "[object Uint16Array]",
-            "[object Int32Array]",
-            "[object Uint32Array]",
-            "[object Float32Array]",
-            "[object Float64Array]"
-        ];
-
-        var isArrayBufferView =
-            ArrayBuffer.isView ||
-            function (obj) {
-                return (
-                    obj && viewClasses.indexOf(Object.prototype.toString.call(obj)) > -1
-                );
-            };
-    }
-
-    function normalizeName(name) {
-        if (typeof name !== "string") {
-            name = String(name);
-        }
-        if (/[^a-z0-9\-#$%&'*+.^_`|~]/i.test(name)) {
-            throw new TypeError("Invalid character in header field name");
-        }
-        return name.toLowerCase();
-    }
-
-    function normalizeValue(value) {
-        if (typeof value !== "string") {
-            value = String(value);
-        }
-        return value;
-    }
-
-    // Build a destructive iterator for the value list
-    function iteratorFor(items) {
-        var iterator = {
-            next: function () {
-                var value = items.shift();
-                return { done: value === undefined, value: value };
-            }
-        };
-
-        if (support.iterable) {
-            iterator[Symbol.iterator] = function () {
-                return iterator;
-            };
-        }
-
-        return iterator;
-    }
-
-    function Headers(headers) {
-        this.map = {};
-
-        if (headers instanceof Headers) {
-            headers.forEach(function (value, name) {
-                this.append(name, value);
-            }, this);
-        } else if (Array.isArray(headers)) {
-            headers.forEach(function (header) {
-                this.append(header[0], header[1]);
-            }, this);
-        } else if (headers) {
-            Object.getOwnPropertyNames(headers).forEach(function (name) {
-                this.append(name, headers[name]);
-            }, this);
-        }
-    }
-
-    Headers.prototype.append = function (name, value) {
-        name = normalizeName(name);
-        value = normalizeValue(value);
-        var oldValue = this.map[name];
-        this.map[name] = oldValue ? oldValue + ", " + value : value;
-    };
-
-    Headers.prototype["delete"] = function (name) {
-        delete this.map[normalizeName(name)];
-    };
-
-    Headers.prototype.get = function (name) {
-        name = normalizeName(name);
-        return this.has(name) ? this.map[name] : null;
-    };
-
-    Headers.prototype.has = function (name) {
-        return this.map.hasOwnProperty(normalizeName(name));
-    };
-
-    Headers.prototype.set = function (name, value) {
-        this.map[normalizeName(name)] = normalizeValue(value);
-    };
-
-    Headers.prototype.forEach = function (callback, thisArg) {
-        for (var name in this.map) {
-            if (this.map.hasOwnProperty(name)) {
-                callback.call(thisArg, this.map[name], name, this);
-            }
-        }
-    };
-
-    Headers.prototype.keys = function () {
-        var items = [];
-        this.forEach(function (value, name) {
-            items.push(name);
-        });
-        return iteratorFor(items);
-    };
-
-    Headers.prototype.values = function () {
-        var items = [];
-        this.forEach(function (value) {
-            items.push(value);
-        });
-        return iteratorFor(items);
-    };
-
-    Headers.prototype.entries = function () {
-        var items = [];
-        this.forEach(function (value, name) {
-            items.push([name, value]);
-        });
-        return iteratorFor(items);
-    };
-
-    if (support.iterable) {
-        Headers.prototype[Symbol.iterator] = Headers.prototype.entries;
-    }
-
-    function consumed(body) {
-        if (body.bodyUsed) {
-            return Promise.reject(new TypeError("Already read"));
-        }
-        body.bodyUsed = true;
-    }
-
-    function fileReaderReady(reader) {
-        return new Promise(function (resolve, reject) {
-            reader.onload = function () {
-                resolve(reader.result);
-            };
-            reader.onerror = function () {
-                reject(reader.error);
-            };
-        });
-    }
-
-    function readBlobAsArrayBuffer(blob) {
-        var reader = new FileReader();
-        var promise = fileReaderReady(reader);
-        reader.readAsArrayBuffer(blob);
-        return promise;
-    }
-
-    function readBlobAsText(blob) {
-        var reader = new FileReader();
-        var promise = fileReaderReady(reader);
-        reader.readAsText(blob);
-        return promise;
-    }
-
-    function readArrayBufferAsText(buf) {
-        var view = new Uint8Array(buf);
-        var chars = new Array(view.length);
-
-        for (var i = 0; i < view.length; i++) {
-            chars[i] = String.fromCharCode(view[i]);
-        }
-        return chars.join("");
-    }
-
-    function bufferClone(buf) {
-        if (buf.slice) {
-            return buf.slice(0);
-        } else {
-            var view = new Uint8Array(buf.byteLength);
-            view.set(new Uint8Array(buf));
-            return view.buffer;
-        }
-    }
-
-    function Body() {
-        this.bodyUsed = false;
-
-        this._initBody = function (body) {
-            this._bodyInit = body;
-            if (!body) {
-                this._bodyText = "";
-            } else if (typeof body === "string") {
-                this._bodyText = body;
-            } else if (support.blob && Blob.prototype.isPrototypeOf(body)) {
-                this._bodyBlob = body;
-            } else if (support.formData && FormData.prototype.isPrototypeOf(body)) {
-                this._bodyFormData = body;
-            } else if (
-                support.searchParams &&
-                URLSearchParams.prototype.isPrototypeOf(body)
-            ) {
-                this._bodyText = body.toString();
-            } else if (support.arrayBuffer && support.blob && isDataView(body)) {
-                this._bodyArrayBuffer = bufferClone(body.buffer);
-                // IE 10-11 can't handle a DataView body.
-                this._bodyInit = new Blob([this._bodyArrayBuffer]);
-            } else if (
-                support.arrayBuffer &&
-                (ArrayBuffer.prototype.isPrototypeOf(body) || isArrayBufferView(body))
-            ) {
-                this._bodyArrayBuffer = bufferClone(body);
-            } else {
-                this._bodyText = body = Object.prototype.toString.call(body);
-            }
-
-            if (!this.headers.get("content-type")) {
-                if (typeof body === "string") {
-                    this.headers.set("content-type", "text/plain;charset=UTF-8");
-                } else if (this._bodyBlob && this._bodyBlob.type) {
-                    this.headers.set("content-type", this._bodyBlob.type);
-                } else if (
-                    support.searchParams &&
-                    URLSearchParams.prototype.isPrototypeOf(body)
-                ) {
-                    this.headers.set(
-                        "content-type",
-                        "application/x-www-form-urlencoded;charset=UTF-8"
-                    );
-                }
-            }
-        };
-
-        if (support.blob) {
-            this.blob = function () {
-                var rejected = consumed(this);
-                if (rejected) {
-                    return rejected;
-                }
-
-                if (this._bodyBlob) {
-                    return Promise.resolve(this._bodyBlob);
-                } else if (this._bodyArrayBuffer) {
-                    return Promise.resolve(new Blob([this._bodyArrayBuffer]));
-                } else if (this._bodyFormData) {
-                    throw new Error("could not read FormData body as blob");
-                } else {
-                    return Promise.resolve(new Blob([this._bodyText]));
-                }
-            };
-
-            this.arrayBuffer = function () {
-                if (this._bodyArrayBuffer) {
-                    return consumed(this) || Promise.resolve(this._bodyArrayBuffer);
-                } else {
-                    return this.blob().then(readBlobAsArrayBuffer);
-                }
-            };
-        }
-
-        this.text = function () {
-            var rejected = consumed(this);
-            if (rejected) {
-                return rejected;
-            }
-
-            if (this._bodyBlob) {
-                return readBlobAsText(this._bodyBlob);
-            } else if (this._bodyArrayBuffer) {
-                return Promise.resolve(readArrayBufferAsText(this._bodyArrayBuffer));
-            } else if (this._bodyFormData) {
-                throw new Error("could not read FormData body as text");
-            } else {
-                return Promise.resolve(this._bodyText);
-            }
-        };
-
-        if (support.formData) {
-            this.formData = function () {
-                return this.text().then(decode);
-            };
-        }
-
-        this.json = function () {
-            return this.text().then(JSON.parse);
-        };
-
-        return this;
-    }
-
-    // HTTP methods whose capitalization should be normalized
-    var methods = ["DELETE", "GET", "HEAD", "OPTIONS", "POST", "PUT"];
-
-    function normalizeMethod(method) {
-        var upcased = method.toUpperCase();
-        return methods.indexOf(upcased) > -1 ? upcased : method;
-    }
-
-    function Request(input, options) {
-        options = options || {};
-        var body = options.body;
-
-        if (input instanceof Request) {
-            if (input.bodyUsed) {
-                throw new TypeError("Already read");
-            }
-            this.url = input.url;
-            this.credentials = input.credentials;
-            if (!options.headers) {
-                this.headers = new Headers(input.headers);
-            }
-            this.method = input.method;
-            this.mode = input.mode;
-            this.signal = input.signal;
-            if (!body && input._bodyInit != null) {
-                body = input._bodyInit;
-                input.bodyUsed = true;
-            }
-        } else {
-            this.url = String(input);
-        }
-
-        this.credentials = options.credentials || this.credentials || "same-origin";
-        if (options.headers || !this.headers) {
-            this.headers = new Headers(options.headers);
-        }
-        this.method = normalizeMethod(options.method || this.method || "GET");
-        this.mode = options.mode || this.mode || null;
-        this.signal = options.signal || this.signal;
-        this.referrer = null;
-
-        if ((this.method === "GET" || this.method === "HEAD") && body) {
-            throw new TypeError("Body not allowed for GET or HEAD requests");
-        }
-        this._initBody(body);
-    }
-
-    Request.prototype.clone = function () {
-        return new Request(this, { body: this._bodyInit });
-    };
-
-    function decode(body) {
-        var form = new FormData();
-        body
-            .trim()
-            .split("&")
-            .forEach(function (bytes) {
-                if (bytes) {
-                    var split = bytes.split("=");
-                    var name = split.shift().replace(/\+/g, " ");
-                    var value = split.join("=").replace(/\+/g, " ");
-                    form.append(decodeURIComponent(name), decodeURIComponent(value));
-                }
-            });
-        return form;
-    }
-
-    function parseHeaders(rawHeaders) {
-        var headers = new Headers();
-        // Replace instances of \r\n and \n followed by at least one space or horizontal tab with a space
-        // https://tools.ietf.org/html/rfc7230#section-3.2
-        var preProcessedHeaders = rawHeaders.replace(/\r?\n[\t ]+/g, " ");
-        preProcessedHeaders.split(/\r?\n/).forEach(function (line) {
-            var parts = line.split(":");
-            var key = parts.shift().trim();
-            if (key) {
-                var value = parts.join(":").trim();
-                headers.append(key, value);
-            }
-        });
-        return headers;
-    }
-
-    Body.call(Request.prototype);
-
-    function Response(bodyInit, options) {
-        if (!options) {
-            options = {};
-        }
-
-        this.type = "default";
-        this.status = options.status === undefined ? 200 : options.status;
-        this.ok = this.status >= 200 && this.status < 300;
-        this.statusText = "statusText" in options ? options.statusText : "OK";
-        this.headers = new Headers(options.headers);
-        this.url = options.url || "";
-        this._initBody(bodyInit);
-    }
-
-    Body.call(Response.prototype);
-
-    Response.prototype.clone = function () {
-        return new Response(this._bodyInit, {
-            status: this.status,
-            statusText: this.statusText,
-            headers: new Headers(this.headers),
-            url: this.url
-        });
-    };
-
-    Response.error = function () {
-        var response = new Response(null, { status: 0, statusText: "" });
-        response.type = "error";
-        return response;
-    };
-
-    var redirectStatuses = [301, 302, 303, 307, 308];
-
-    Response.redirect = function (url, status) {
-        if (redirectStatuses.indexOf(status) === -1) {
-            throw new RangeError("Invalid status code");
-        }
-
-        return new Response(null, { status: status, headers: { location: url } });
-    };
-
-    exports.DOMException = global.DOMException;
-    try {
-        new exports.DOMException();
-    } catch (err) {
-        exports.DOMException = function (message, name) {
-            this.message = message;
-            this.name = name;
-            var error = Error(message);
-            this.stack = error.stack;
-        };
-        exports.DOMException.prototype = Object.create(Error.prototype);
-        exports.DOMException.prototype.constructor = exports.DOMException;
-    }
-
-    function fetch(input, init) {
-        return new Promise(function (resolve, reject) {
-            var request = new Request(input, init);
-
-            if (request.signal && request.signal.aborted) {
-                return reject(new exports.DOMException("Aborted", "AbortError"));
-            }
-
-            var xhr = new XMLHttpRequest();
-
-            function abortXhr() {
-                xhr.abort();
-            }
-
-            xhr.onload = function () {
-                var options = {
-                    status: xhr.status,
-                    statusText: xhr.statusText,
-                    headers: parseHeaders(xhr.getAllResponseHeaders() || "")
-                };
-                options.url =
-                    "responseURL" in xhr
-                        ? xhr.responseURL
-                        : options.headers.get("X-Request-URL");
-                var body = "response" in xhr ? xhr.response : xhr.responseText;
-                resolve(new Response(body, options));
-            };
-
-            xhr.onerror = function () {
-                reject(new TypeError("Network request failed"));
-            };
-
-            xhr.ontimeout = function () {
-                reject(new TypeError("Network request failed"));
-            };
-
-            xhr.onabort = function () {
-                reject(new exports.DOMException("Aborted", "AbortError"));
-            };
-
-            xhr.open(request.method, request.url, true);
-
-            if (request.credentials === "include") {
-                xhr.withCredentials = true;
-            } else if (request.credentials === "omit") {
-                xhr.withCredentials = false;
-            }
-
-            if ("responseType" in xhr && support.blob) {
-                xhr.responseType = "blob";
-            }
-
-            request.headers.forEach(function (value, name) {
-                xhr.setRequestHeader(name, value);
-            });
-
-            if (request.signal) {
-                request.signal.addEventListener("abort", abortXhr);
-
-                xhr.onreadystatechange = function () {
-                    // DONE (success or failure)
-                    if (xhr.readyState === 4) {
-                        request.signal.removeEventListener("abort", abortXhr);
-                    }
-                };
-            }
-
-            xhr.send(
-                typeof request._bodyInit === "undefined" ? null : request._bodyInit
-            );
-        });
-    }
-
-    fetch.polyfill = true;
-
-    exports.Headers = Headers;
-    exports.Request = Request;
-    exports.Response = Response;
-    exports.fetch = fetch;
-
-    Object.defineProperty(exports, "__esModule", { value: true });
-})();
diff --git a/packages/core/fetch/index.ts b/packages/core/fetch/index.ts
new file mode 100644
index 0000000000..25a7907b56
--- /dev/null
+++ b/packages/core/fetch/index.ts
@@ -0,0 +1,620 @@
+const g: any = (typeof globalThis !== 'undefined' && globalThis) || (typeof self !== 'undefined' && self) || (typeof global !== 'undefined' && global) || {};
+
+// Feature support detection
+interface Support {
+	searchParams: boolean;
+	iterable: boolean;
+	blob: boolean;
+	formData: boolean;
+	arrayBuffer: boolean;
+}
+const support: Support = {
+	searchParams: 'URLSearchParams' in g,
+	iterable: 'Symbol' in g && 'iterator' in Symbol,
+	blob:
+		'FileReader' in g &&
+		'Blob' in g &&
+		(() => {
+			try {
+				new Blob();
+				return true;
+			} catch (e) {
+				return false;
+			}
+		})(),
+	formData: 'FormData' in g,
+	arrayBuffer: 'ArrayBuffer' in g,
+};
+
+function isDataView(obj: any): obj is DataView {
+	return obj && DataView.prototype.isPrototypeOf(obj);
+}
+
+let isArrayBufferView: (obj: any) => boolean;
+if (support.arrayBuffer) {
+	const viewClasses = ['[object Int8Array]', '[object Uint8Array]', '[object Uint8ClampedArray]', '[object Int16Array]', '[object Uint16Array]', '[object Int32Array]', '[object Uint32Array]', '[object Float32Array]', '[object Float64Array]'];
+
+	isArrayBufferView =
+		ArrayBuffer.isView ||
+		((obj: any) => {
+			return obj && viewClasses.indexOf(Object.prototype.toString.call(obj)) > -1;
+		});
+}
+
+function normalizeName(name: any): string {
+	if (typeof name !== 'string') {
+		name = String(name);
+	}
+	if (/[^a-z0-9\-#$%&'*+.^_`|~!]/i.test(name) || name === '') {
+		throw new TypeError('Invalid character in header field name: "' + name + '"');
+	}
+	return name.toLowerCase();
+}
+
+function normalizeValue(value: any): string {
+	if (typeof value !== 'string') {
+		value = String(value);
+	}
+	return value;
+}
+
+// Build a destructive iterator for the value list
+function iteratorFor(items: any[]): IterableIterator<any> {
+	const iterator: any = {
+		next: () => {
+			const value = items.shift();
+			return { done: value === undefined, value };
+		},
+	};
+
+	if (support.iterable) {
+		(iterator as any)[Symbol.iterator] = () => iterator;
+	}
+
+	return iterator;
+}
+
+export type HeaderInit = Headers | string[][] | Record<string, string>;
+
+export class Headers {
+	private map: Record<string, string> = {};
+
+	constructor(headers?: HeaderInit) {
+		if (headers instanceof Headers) {
+			headers.forEach((value, name) => {
+				this.append(name, value);
+			});
+		} else if (Array.isArray(headers)) {
+			headers.forEach((header) => {
+				if (header.length !== 2) {
+					throw new TypeError('Headers constructor: expected name/value pair to be length 2, found ' + header.length);
+				}
+				this.append(header[0], header[1]);
+			});
+		} else if (headers) {
+			Object.getOwnPropertyNames(headers).forEach((name) => {
+				this.append(name, (headers as Record<string, string>)[name]);
+			});
+		}
+	}
+
+	append(name: string, value: string): void {
+		name = normalizeName(name);
+		value = normalizeValue(value);
+		const oldValue = this.map[name];
+		this.map[name] = oldValue ? oldValue + ', ' + value : value;
+	}
+
+	delete(name: string): void {
+		delete this.map[normalizeName(name)];
+	}
+
+	get(name: string): string | null {
+		name = normalizeName(name);
+		return this.has(name) ? this.map[name] : null;
+	}
+
+	has(name: string): boolean {
+		return Object.prototype.hasOwnProperty.call(this.map, normalizeName(name));
+	}
+
+	set(name: string, value: string): void {
+		this.map[normalizeName(name)] = normalizeValue(value);
+	}
+
+	forEach(callback: (value: string, name: string, headers: Headers) => void, thisArg?: any): void {
+		for (const name in this.map) {
+			if (Object.prototype.hasOwnProperty.call(this.map, name)) {
+				callback.call(thisArg, this.map[name], name, this);
+			}
+		}
+	}
+
+	keys(): IterableIterator<string> {
+		const items: string[] = [];
+		this.forEach((_, name) => items.push(name));
+		return iteratorFor(items);
+	}
+
+	values(): IterableIterator<string> {
+		const items: string[] = [];
+		this.forEach((value) => items.push(value));
+		return iteratorFor(items);
+	}
+
+	entries(): IterableIterator<[string, string]> {
+		const items: [string, string][] = [];
+		this.forEach((value, name) => items.push([name, value]));
+		return iteratorFor(items);
+	}
+
+	[Symbol.iterator](): IterableIterator<[string, string]> {
+		return this.entries();
+	}
+}
+
+// Body mixin
+export class Body {
+	bodyUsed = false;
+	_bodyInit: any;
+	protected _bodyText?: string;
+	protected _bodyBlob?: Blob;
+	protected _bodyFormData?: FormData;
+	protected _bodyArrayBuffer?: ArrayBuffer;
+	protected _noBody?: boolean;
+	protected headers!: Headers;
+
+	protected _initBody(body: any): void {
+		// Ensure bodyUsed property exists
+		this.bodyUsed = this.bodyUsed;
+		this._bodyInit = body;
+
+		if (!body) {
+			this._noBody = true;
+			this._bodyText = '';
+		} else if (typeof body === 'string') {
+			this._bodyText = body;
+		} else if (support.blob && Blob.prototype.isPrototypeOf(body)) {
+			this._bodyBlob = body as Blob;
+		} else if (support.formData && FormData.prototype.isPrototypeOf(body)) {
+			this._bodyFormData = body as FormData;
+		} else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
+			this._bodyText = body.toString();
+		} else if (support.arrayBuffer && support.blob && isDataView(body)) {
+			// @ts-ignore
+			this._bodyArrayBuffer = bufferClone((body as DataView).buffer);
+			this._bodyInit = new Blob([this._bodyArrayBuffer]);
+		} else if (support.arrayBuffer && (ArrayBuffer.prototype.isPrototypeOf(body) || isArrayBufferView(body))) {
+			this._bodyArrayBuffer = bufferClone(body as ArrayBuffer);
+		} else {
+			this._bodyText = body = Object.prototype.toString.call(body);
+		}
+
+		// Set Content-Type header if not set
+		if (!this.headers.get('content-type')) {
+			if (typeof body === 'string') {
+				this.headers.set('content-type', 'text/plain;charset=UTF-8');
+			} else if (this._bodyBlob && this._bodyBlob.type) {
+				this.headers.set('content-type', this._bodyBlob.type);
+			} else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
+				this.headers.set('content-type', 'application/x-www-form-urlencoded;charset=UTF-8');
+			}
+		}
+	}
+
+	blob?(): Promise<Blob> {
+		const rejected = consumed(this);
+		if (rejected) {
+			return rejected as Promise<any>;
+		}
+
+		if (this._bodyBlob) {
+			return Promise.resolve(this._bodyBlob);
+		} else if (this._bodyArrayBuffer) {
+			return Promise.resolve(new Blob([this._bodyArrayBuffer]));
+		} else if (this._bodyFormData) {
+			throw new Error('could not read FormData body as blob');
+		} else {
+			return Promise.resolve(new Blob([this._bodyText!]));
+		}
+	}
+
+	arrayBuffer(): Promise<ArrayBuffer> {
+		if (this._bodyArrayBuffer) {
+			const consumedResult = consumed(this);
+			if (consumedResult) {
+				return consumedResult as Promise<any>;
+			} else if (ArrayBuffer.isView(this._bodyArrayBuffer)) {
+				return Promise.resolve((this._bodyArrayBuffer as any).buffer.slice((this._bodyArrayBuffer as any).byteOffset, (this._bodyArrayBuffer as any).byteOffset + (this._bodyArrayBuffer as any).byteLength));
+			} else {
+				return Promise.resolve(this._bodyArrayBuffer);
+			}
+		} else if (support.blob) {
+			// @ts-ignore
+			return this.blob!().then(readBlobAsArrayBuffer);
+		} else {
+			throw new Error('could not read as ArrayBuffer');
+		}
+	}
+
+	text(): Promise<string> {
+		const rejected = consumed(this);
+		if (rejected) {
+			return rejected as Promise<any>;
+		}
+
+		if (this._bodyBlob) {
+			return readBlobAsText(this._bodyBlob);
+		} else if (this._bodyArrayBuffer) {
+			return Promise.resolve(readArrayBufferAsText(this._bodyArrayBuffer));
+		} else if (this._bodyFormData) {
+			throw new Error('could not read FormData body as text');
+		} else {
+			return Promise.resolve(this._bodyText!);
+		}
+	}
+
+	formData?(): Promise<FormData> {
+		return this.text().then(decode);
+	}
+
+	json(): Promise<any> {
+		return this.text().then(JSON.parse);
+	}
+}
+
+// Helper functions for Body
+function consumed(body: any): Promise<any> | undefined {
+	if (body._noBody) return;
+	if (body.bodyUsed) {
+		return Promise.reject(new TypeError('Already read'));
+	}
+	body.bodyUsed = true;
+}
+
+function fileReaderReady(reader: FileReader): Promise<any> {
+	return new Promise((resolve, reject) => {
+		reader.onload = () => resolve(reader.result);
+		reader.onerror = () => reject(reader.error);
+	});
+}
+
+function readBlobAsArrayBuffer(blob: Blob): Promise<ArrayBuffer | string | null> {
+	const reader = new FileReader();
+	const promise = fileReaderReady(reader);
+	reader.readAsArrayBuffer(blob);
+	return promise;
+}
+
+function readBlobAsText(blob: Blob): Promise<string | null> {
+	const reader = new FileReader();
+	const promise = fileReaderReady(reader);
+	const match = /charset=([A-Za-z0-9_-]+)/.exec(blob.type);
+	const encoding = match ? match[1] : 'utf-8';
+	reader.readAsText(blob, encoding);
+	return promise;
+}
+
+function readArrayBufferAsText(buf: ArrayBuffer): string {
+	const view = new Uint8Array(buf);
+	const chars = new Array(view.length);
+
+	for (let i = 0; i < view.length; i++) {
+		chars[i] = String.fromCharCode(view[i]);
+	}
+	return chars.join('');
+}
+
+function bufferClone(buf: ArrayBuffer): ArrayBuffer {
+	if (buf.slice) {
+		return buf.slice(0);
+	} else {
+		const view = new Uint8Array(buf.byteLength);
+		view.set(new Uint8Array(buf));
+		return view.buffer;
+	}
+}
+
+// HTTP methods whose capitalization should be normalized
+const methods = ['CONNECT', 'DELETE', 'GET', 'HEAD', 'OPTIONS', 'PATCH', 'POST', 'PUT', 'TRACE'];
+
+function normalizeMethod(method: string): string {
+	const upcased = method.toUpperCase();
+	return methods.indexOf(upcased) > -1 ? upcased : method;
+}
+
+// Request class
+export type RequestInfo = string | Request;
+export interface RequestInit {
+	method?: string;
+	headers?: HeaderInit;
+	body?: any;
+	mode?: string | null;
+	credentials?: RequestCredentials;
+	cache?: 'default' | 'no-store' | 'reload' | 'no-cache' | 'force-cache' | 'only-if-cached';
+	signal?: AbortSignal;
+}
+
+export class Request extends Body {
+	url: string;
+	credentials: RequestCredentials;
+	headers: Headers;
+	method: string;
+	mode: string | null;
+	signal?: AbortSignal;
+	referrer: string | null;
+
+	constructor(input: RequestInfo, options: RequestInit = {}) {
+		super();
+		let body = options.body;
+
+		if (input instanceof Request) {
+			if (input.bodyUsed) {
+				throw new TypeError('Already read');
+			}
+			this.url = input.url;
+			this.credentials = input.credentials;
+			if (!options.headers) {
+				this.headers = new Headers(input.headers);
+			}
+			this.method = input.method;
+			this.mode = input.mode;
+			this.signal = input.signal;
+			if (!body && input._bodyInit != null) {
+				body = input._bodyInit;
+				input.bodyUsed = true;
+			}
+		} else {
+			this.url = String(input);
+		}
+
+		this.credentials = options.credentials || this.credentials || 'same-origin';
+		if (options.headers || !this.headers) {
+			this.headers = new Headers(options.headers);
+		}
+		this.method = normalizeMethod(options.method || this.method || 'GET');
+		this.mode = options.mode || this.mode || null;
+		this.signal = options.signal || this.signal || ('AbortController' in g ? new AbortController().signal : undefined);
+		this.referrer = null;
+
+		if ((this.method === 'GET' || this.method === 'HEAD') && body) {
+			throw new TypeError('Body not allowed for GET or HEAD requests');
+		}
+		this._initBody(body);
+
+		if (this.method === 'GET' || this.method === 'HEAD') {
+			if (options.cache === 'no-store' || options.cache === 'no-cache') {
+				const reParamSearch = /([?&])_=[^&]*/;
+				if (reParamSearch.test(this.url)) {
+					this.url = this.url.replace(reParamSearch, '$1_=' + new Date().getTime());
+				} else {
+					const reQueryString = /\?/;
+					this.url += (reQueryString.test(this.url) ? '&' : '?') + '_=' + new Date().getTime();
+				}
+			}
+		}
+	}
+
+	clone(): Request {
+		return new Request(this, { body: this._bodyInit });
+	}
+}
+
+// Decode URL-encoded form data
+function decode(body: string): FormData {
+	const form = new FormData();
+	body
+		.trim()
+		.split('&')
+		.forEach((bytes) => {
+			if (bytes) {
+				const split = bytes.split('=');
+				const name = split.shift()!.replace(/\+/g, ' ');
+				const value = split.join('=').replace(/\+/g, ' ');
+				form.append(decodeURIComponent(name), decodeURIComponent(value));
+			}
+		});
+	return form;
+}
+
+// Parse raw headers string into Headers
+function parseHeaders(rawHeaders: string): Headers {
+	const headers = new Headers();
+	const preProcessed = rawHeaders.replace(/\r?\n[\t ]+/g, ' ');
+	preProcessed
+		.split('\r')
+		.map((header) => (header.indexOf('\n') === 0 ? header.substr(1) : header))
+		.forEach((line) => {
+			const parts = line.split(':');
+			const key = parts.shift()!.trim();
+			if (key) {
+				const value = parts.join(':').trim();
+				try {
+					headers.append(key, value);
+				} catch (err) {
+					console.warn('Response ' + (err as Error).message);
+				}
+			}
+		});
+	return headers;
+}
+
+// Response class
+export interface ResponseInit {
+	status?: number;
+	statusText?: string;
+	headers?: HeaderInit;
+	url?: string;
+}
+
+const redirectStatuses = [301, 302, 303, 307, 308];
+
+export class Response extends Body {
+	type: string;
+	status: number;
+	ok: boolean;
+	statusText: string;
+	headers: Headers;
+	url: string;
+
+	constructor(bodyInit: any, options: ResponseInit = {}) {
+		super();
+		this.type = 'default';
+		this.status = options.status === undefined ? 200 : options.status!;
+		if (this.status < 200 || this.status > 599) {
+			throw new RangeError(`Failed to construct 'Response': The status provided (${this.status}) is outside the range [200, 599].`);
+		}
+		this.ok = this.status >= 200 && this.status < 300;
+		this.statusText = options.statusText === undefined ? '' : String(options.statusText);
+		this.headers = new Headers(options.headers);
+		this.url = options.url || '';
+		this._initBody(bodyInit);
+	}
+
+	clone(): Response {
+		return new Response(this._bodyInit, {
+			status: this.status,
+			statusText: this.statusText,
+			headers: new Headers(this.headers),
+			url: this.url,
+		});
+	}
+
+	static error(): Response {
+		const response = new Response(null, { status: 200, statusText: '' });
+		response.ok = false;
+		response.status = 0;
+		response.type = 'error';
+		return response;
+	}
+
+	static redirect(url: string, status: number): Response {
+		if (!redirectStatuses.includes(status)) {
+			throw new RangeError('Invalid status code');
+		}
+		return new Response(null, { status, headers: { location: url } });
+	}
+}
+
+// DOMException polyfill
+export let DOMException: any = g.DOMException;
+try {
+	new (g.DOMException as any)();
+} catch (err) {
+	DOMException = class {
+		message: string;
+		name: string;
+		stack?: string;
+		constructor(message: string, name: string) {
+			this.message = message;
+			this.name = name;
+			const error = new Error(message);
+			this.stack = error.stack;
+		}
+	};
+}
+
+// fetch function
+export function fetch(input: RequestInfo, init?: RequestInit): Promise<Response> {
+	return new Promise((resolve, reject) => {
+		const request = new Request(input, init as any);
+
+		if (request.signal && (request.signal as any).aborted) {
+			return reject(new DOMException('Aborted', 'AbortError'));
+		}
+
+		const xhr = new XMLHttpRequest();
+
+		function abortXhr() {
+			xhr.abort();
+		}
+
+		xhr.onload = function () {
+			const options: any = {
+				statusText: xhr.statusText,
+				headers: parseHeaders(xhr.getAllResponseHeaders() || ''),
+			};
+			// Local file handling
+			if (request.url.startsWith('file://') && (xhr.status < 200 || xhr.status > 599)) {
+				options.status = 200;
+			} else {
+				options.status = xhr.status;
+			}
+			options.url = 'responseURL' in xhr ? xhr.responseURL : options.headers.get('X-Request-URL');
+			// @ts-ignore
+			const body = 'response' in xhr ? xhr.response : xhr.responseText;
+			setTimeout(() => resolve(new Response(body, options)), 0);
+		};
+
+		xhr.onerror = function () {
+			setTimeout(() => reject(new TypeError('Network request failed')), 0);
+		};
+
+		xhr.ontimeout = function () {
+			setTimeout(() => reject(new TypeError('Network request timed out')), 0);
+		};
+
+		xhr.onabort = function () {
+			setTimeout(() => reject(new DOMException('Aborted', 'AbortError')), 0);
+		};
+
+		function fixUrl(url: string): string {
+			try {
+				return url === '' && g.location.href ? g.location.href : url;
+			} catch (e) {
+				return url;
+			}
+		}
+
+		xhr.open(request.method, fixUrl(request.url), true);
+
+		if (request.credentials === 'include') {
+			xhr.withCredentials = true;
+		} else if (request.credentials === 'omit') {
+			xhr.withCredentials = false;
+		}
+
+		if ('responseType' in xhr) {
+			if (support.blob) {
+				(xhr as any).responseType = 'blob';
+			} else if (support.arrayBuffer) {
+				(xhr as any).responseType = 'arraybuffer';
+			}
+		}
+
+		if (init && typeof init.headers === 'object' && !(init.headers instanceof Headers) && !(g.Headers && init.headers instanceof g.Headers)) {
+			const names: string[] = [];
+			Object.getOwnPropertyNames(init.headers).forEach((name) => {
+				names.push(normalizeName(name));
+				xhr.setRequestHeader(name, normalizeValue((init.headers as any)[name]));
+			});
+			request.headers.forEach((value, name) => {
+				if (!names.includes(name)) {
+					xhr.setRequestHeader(name, value);
+				}
+			});
+		} else {
+			request.headers.forEach((value, name) => xhr.setRequestHeader(name, value));
+		}
+
+		if (request.signal) {
+			request.signal.addEventListener('abort', abortXhr);
+			xhr.onreadystatechange = function () {
+				if (xhr.readyState === 4) {
+					(request.signal as any).removeEventListener('abort', abortXhr);
+				}
+			};
+		}
+
+		xhr.send(typeof request._bodyInit === 'undefined' ? null : request._bodyInit);
+	});
+}
+
+// Attach polyfill to globals
+(fetch as any).polyfill = true;
+if (!g.fetch) {
+	g.fetch = fetch;
+	g.Headers = Headers;
+	g.Request = Request;
+	g.Response = Response;
+}
diff --git a/packages/core/file-system/file-system-access.android.ts b/packages/core/file-system/file-system-access.android.ts
index bc2cb82f55..70514e38b3 100644
--- a/packages/core/file-system/file-system-access.android.ts
+++ b/packages/core/file-system/file-system-access.android.ts
@@ -1,21 +1,11 @@
 import * as textModule from '../text';
-import { Application } from '../application';
-import { getFileExtension } from '../utils';
+import { getFileExtension, android as androidUtils } from '../utils';
 import { SDK_VERSION } from '../utils/constants';
 
 import type { IFileSystemAccess } from './file-system-access';
 
-let applicationContext: android.content.Context;
-function getApplicationContext() {
-	if (!applicationContext) {
-		applicationContext = Application.android.getNativeApplication().getApplicationContext();
-	}
-
-	return applicationContext;
-}
-
 function getOrSetHelper(path: string): org.nativescript.widgets.FileHelper {
-	return org.nativescript.widgets.FileHelper.fromString(getApplicationContext(), path);
+	return org.nativescript.widgets.FileHelper.fromString(androidUtils.getApplicationContext(), path);
 }
 
 function isContentUri(path: string): boolean {
@@ -222,30 +212,30 @@ export class FileSystemAccess implements IFileSystemAccess {
 	}
 
 	public getDocumentsFolderPath(): string {
-		const dir = getApplicationContext().getFilesDir();
+		const dir = androidUtils.getApplicationContext().getFilesDir();
 
 		return dir.getAbsolutePath();
 	}
 	public getExternalDocumentsFolderPath(): string {
-		const dirs = getApplicationContext().getExternalFilesDirs(null);
+		const dirs = androidUtils.getApplicationContext().getExternalFilesDirs(null);
 		let dir;
 		if (dirs && dirs.length > 1) {
 			dir = dirs[dirs.length - 1];
 		}
 		if (!dir) {
-			dir = getApplicationContext().getExternalFilesDir(null);
+			dir = androidUtils.getApplicationContext().getExternalFilesDir(null);
 		}
 		return dir.getAbsolutePath();
 	}
 
 	public getLogicalRootPath(): string {
-		const dir = getApplicationContext().getFilesDir();
+		const dir = androidUtils.getApplicationContext().getFilesDir();
 
 		return dir.getCanonicalPath();
 	}
 
 	public getTempFolderPath(): string {
-		const dir = getApplicationContext().getCacheDir();
+		const dir = androidUtils.getApplicationContext().getCacheDir();
 
 		return dir.getAbsolutePath();
 	}
@@ -258,7 +248,7 @@ export class FileSystemAccess implements IFileSystemAccess {
 
 	public copySync(src: string, dest: string, onError?: (error: any) => any) {
 		try {
-			return org.nativescript.widgets.Async.File.copySync(src, dest, getApplicationContext());
+			return org.nativescript.widgets.Async.File.copySync(src, dest, androidUtils.getApplicationContext());
 		} catch (error) {
 			if (onError) {
 				onError(error);
@@ -282,7 +272,7 @@ export class FileSystemAccess implements IFileSystemAccess {
 							reject(err);
 						},
 					}),
-					getApplicationContext(),
+					androidUtils.getApplicationContext(),
 				);
 			} catch (ex) {
 				reject(ex);
@@ -926,7 +916,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 	}
 	fileExists(path: string): boolean {
 		if (isContentUri(path)) {
-			return org.nativescript.widgets.FileHelper.exists(applicationContext, path);
+			return org.nativescript.widgets.FileHelper.exists(androidUtils.getApplicationContext(), path);
 		}
 		return super.fileExists(path);
 	}
@@ -939,7 +929,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 	deleteFile(path: string, onError?: (error: any) => any) {
 		if (isContentUri(path)) {
 			try {
-				getOrSetHelper(path).delete(applicationContext);
+				getOrSetHelper(path).delete(androidUtils.getApplicationContext());
 			} catch (e) {
 				onError?.(e);
 			}
@@ -968,7 +958,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 					},
 				});
 			}
-			getOrSetHelper(path).renameSync(applicationContext, newPath, callback);
+			getOrSetHelper(path).renameSync(androidUtils.getApplicationContext(), newPath, callback);
 		} else {
 			super.rename(path, newPath, onError);
 		}
@@ -977,7 +967,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 	public renameAsync(path: string, newPath: string): Promise<any> {
 		return new Promise<void>((resolve, reject) => {
 			getOrSetHelper(path).renameSync(
-				applicationContext,
+				androidUtils.getApplicationContext(),
 				newPath,
 				new org.nativescript.widgets.FileHelper.Callback({
 					onSuccess(result) {
@@ -1010,7 +1000,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise<void>((resolve, reject) => {
 				getOrSetHelper(path).appendBuffer(
-					applicationContext,
+					androidUtils.getApplicationContext(),
 					FileSystemAccess.getBuffer(content),
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
@@ -1037,7 +1027,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 					},
 				});
 			}
-			getOrSetHelper(path).appendSync(applicationContext, FileSystemAccess.getBuffer(content), callback);
+			getOrSetHelper(path).appendSync(androidUtils.getApplicationContext(), FileSystemAccess.getBuffer(content), callback);
 		} else {
 			super.appendSync(path, content, onError);
 		}
@@ -1049,7 +1039,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise<void>((resolve, reject) => {
 				getOrSetHelper(path).append(
-					applicationContext,
+					androidUtils.getApplicationContext(),
 					content,
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
@@ -1076,7 +1066,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 					},
 				});
 			}
-			getOrSetHelper(path).appendSync(applicationContext, content, callback);
+			getOrSetHelper(path).appendSync(androidUtils.getApplicationContext(), content, callback);
 		} else {
 			super.appendSync(path, content, onError);
 		}
@@ -1088,7 +1078,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise<void>((resolve, reject) => {
 				getOrSetHelper(path).appendText(
-					applicationContext,
+					androidUtils.getApplicationContext(),
 					content,
 					encoding ?? null,
 					new org.nativescript.widgets.FileHelper.Callback({
@@ -1116,7 +1106,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 					},
 				});
 			}
-			getOrSetHelper(path).appendTextSync(applicationContext, content, encoding ?? null, callback);
+			getOrSetHelper(path).appendTextSync(androidUtils.getApplicationContext(), content, encoding ?? null, callback);
 		} else {
 			super.appendTextSync(path, content, onError);
 		}
@@ -1128,7 +1118,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise((resolve, reject) => {
 				getOrSetHelper(path).readText(
-					applicationContext,
+					androidUtils.getApplicationContext(),
 					encoding ?? null,
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
@@ -1154,7 +1144,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 					},
 				});
 			}
-			return getOrSetHelper(path).readTextSync(applicationContext, encoding ?? null, callback);
+			return getOrSetHelper(path).readTextSync(androidUtils.getApplicationContext(), encoding ?? null, callback);
 		} else {
 			return super.readTextSync(path, onError, encoding);
 		}
@@ -1166,7 +1156,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise((resolve, reject) => {
 				getOrSetHelper(path).readBuffer(
-					applicationContext,
+					androidUtils.getApplicationContext(),
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
 							resolve(result);
@@ -1192,7 +1182,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 					},
 				});
 			}
-			const ret = getOrSetHelper(path).readBufferSync(applicationContext, callback);
+			const ret = getOrSetHelper(path).readBufferSync(androidUtils.getApplicationContext(), callback);
 			if (ret) {
 				return null;
 			}
@@ -1207,7 +1197,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise((resolve, reject) => {
 				getOrSetHelper(path).read(
-					applicationContext,
+					androidUtils.getApplicationContext(),
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
 							resolve(result);
@@ -1233,7 +1223,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 					},
 				});
 			}
-			return getOrSetHelper(path).readSync(applicationContext, callback);
+			return getOrSetHelper(path).readSync(androidUtils.getApplicationContext(), callback);
 		}
 		return super.readSync(path, onError);
 	}
@@ -1244,7 +1234,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise<void>((resolve, reject) => {
 				getOrSetHelper(path).writeText(
-					applicationContext,
+					androidUtils.getApplicationContext(),
 					content,
 					encoding ?? null,
 					new org.nativescript.widgets.FileHelper.Callback({
@@ -1272,7 +1262,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 					},
 				});
 			}
-			getOrSetHelper(path).writeTextSync(applicationContext, content, encoding ?? null, callback);
+			getOrSetHelper(path).writeTextSync(androidUtils.getApplicationContext(), content, encoding ?? null, callback);
 		} else {
 			super.writeTextSync(path, content, onError);
 		}
@@ -1284,7 +1274,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise<void>((resolve, reject) => {
 				getOrSetHelper(path).writeBuffer(
-					applicationContext,
+					androidUtils.getApplicationContext(),
 					FileSystemAccess.getBuffer(content),
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
@@ -1311,7 +1301,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 					},
 				});
 			}
-			getOrSetHelper(path).writeSync(applicationContext, FileSystemAccess.getBuffer(content), callback);
+			getOrSetHelper(path).writeSync(androidUtils.getApplicationContext(), FileSystemAccess.getBuffer(content), callback);
 		} else {
 			super.writeSync(path, content, onError);
 		}
@@ -1323,7 +1313,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise<void>((resolve, reject) => {
 				getOrSetHelper(path).write(
-					applicationContext,
+					androidUtils.getApplicationContext(),
 					content,
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
@@ -1350,7 +1340,7 @@ export class FileSystemAccess29 extends FileSystemAccess {
 					},
 				});
 			}
-			getOrSetHelper(path).writeSync(applicationContext, content, callback);
+			getOrSetHelper(path).writeSync(androidUtils.getApplicationContext(), content, callback);
 		} else {
 			super.writeSync(path, content, onError);
 		}
diff --git a/packages/core/file-system/file-system-access.ios.ts b/packages/core/file-system/file-system-access.ios.ts
index 05925eb8b3..295cf3ba46 100644
--- a/packages/core/file-system/file-system-access.ios.ts
+++ b/packages/core/file-system/file-system-access.ios.ts
@@ -1,5 +1,5 @@
 import { encoding as textEncoding } from '../text';
-import { iOSNativeHelper } from '../utils';
+import { ios as iosUtils } from '../utils';
 
 // TODO: Implement all the APIs receiving callback using async blocks
 // TODO: Check whether we need try/catch blocks for the iOS implementation
@@ -257,7 +257,7 @@ export class FileSystemAccess {
 	}
 
 	public getCurrentAppPath(): string {
-		return iOSNativeHelper.getCurrentAppPath();
+		return iosUtils.getCurrentAppPath();
 	}
 
 	public copy = this.copySync.bind(this);
@@ -700,7 +700,7 @@ export class FileSystemAccess {
 	}
 
 	public joinPaths(paths: string[]): string {
-		return iOSNativeHelper.joinPaths(...paths);
+		return iosUtils.joinPaths(...paths);
 	}
 }
 
diff --git a/packages/core/file-system/index.ts b/packages/core/file-system/index.ts
index 1ff959eed6..42055416c2 100644
--- a/packages/core/file-system/index.ts
+++ b/packages/core/file-system/index.ts
@@ -1,6 +1,6 @@
 import { IFileSystemAccess, FileSystemAccess, FileSystemAccess29 } from './file-system-access';
-import { SDK_VERSION } from '../utils';
-import { Application } from '../application';
+import { SDK_VERSION } from '../utils/constants';
+import { android as androidUtils } from '../utils';
 
 // The FileSystemAccess implementation, used through all the APIs.
 let fileAccess: IFileSystemAccess;
@@ -182,15 +182,6 @@ export class FileSystemEntity {
 	}
 }
 
-let applicationContext;
-function getApplicationContext() {
-	if (!applicationContext) {
-		applicationContext = Application.android.getNativeApplication().getApplicationContext();
-	}
-
-	return applicationContext;
-}
-
 export enum AndroidDirectory {
 	ALARMS = 'alarms',
 	AUDIOBOOKS = 'audiobooks',
@@ -279,7 +270,7 @@ class Android {
 			throw new Error(`createFile is available on Android only!`);
 		}
 
-		const context = getApplicationContext() as android.content.Context;
+		const context = androidUtils.getApplicationContext() as android.content.Context;
 
 		const meta = new android.content.ContentValues();
 		meta.put(android.provider.MediaStore.MediaColumns.DISPLAY_NAME, options.name);
@@ -332,7 +323,7 @@ export class File extends FileSystemEntity {
 				// falls back to creating a temp file without a known extension.
 				if (!fileInfo) {
 					const tempFile = `${knownFolders.temp().path}/${java.util.UUID.randomUUID().toString()}`;
-					org.nativescript.widgets.Async.File.copySync(path, tempFile, getApplicationContext());
+					org.nativescript.widgets.Async.File.copySync(path, tempFile, androidUtils.getApplicationContext());
 					path = tempFile;
 				} else {
 					const ext = fileInfo.extension;
diff --git a/packages/core/globals/index.ts b/packages/core/globals/index.ts
index 5cc9397cf2..236988d8f7 100644
--- a/packages/core/globals/index.ts
+++ b/packages/core/globals/index.ts
@@ -1,7 +1,37 @@
-import type * as tslibType from 'tslib';
-const tslib: typeof tslibType = require('tslib');
+import tslib from 'tslib';
 import { Observable } from '../data/observable';
 import { trace as profilingTrace, time, uptime, level as profilingLevel } from '../profiling';
+import * as timer from '../timer';
+import * as animationFrame from '../animation-frame';
+import * as mediaQueryList from '../media-query-list';
+import * as text from '../text';
+import * as xhrImpl from '../xhr';
+import '../fetch';
+import * as fetchPolyfill from '../fetch';
+import * as wgc from '../wgc';
+import * as cryptoImpl from '../wgc/crypto';
+import * as subtleCryptoImpl from '../wgc/crypto/SubtleCrypto';
+
+if (typeof global.__metadata === 'undefined') {
+	/**
+	 * TS decorator metadata helper.
+	 * @param metadataKey   the metadata key (e.g. "design:type")
+	 * @param metadataValue the metadata value (e.g. the constructor function)
+	 * @returns a decorator function, or undefined if Reflect.metadata isn’t available
+	 */
+	global.__metadata = (metadataKey, metadataValue) => {
+		if (
+			typeof Reflect === 'object' &&
+			// @ts-expect-error
+			typeof Reflect.metadata === 'function'
+		) {
+			// Delegate to the reflect-metadata shim
+			// @ts-expect-error
+			return Reflect.metadata(metadataKey, metadataValue);
+		}
+		// no-op if no Reflect.metadata
+	};
+}
 
 type ModuleLoader = (name?: string) => any;
 
@@ -301,34 +331,31 @@ export function initGlobal() {
 		};
 
 		// DOM api polyfills
-		global.registerModule('timer', () => require('../timer'));
+		global.registerModule('timer', () => timer);
 		installPolyfills('timer', ['setTimeout', 'clearTimeout', 'setInterval', 'clearInterval']);
 
-		global.registerModule('animation', () => require('../animation-frame'));
+		global.registerModule('animation', () => animationFrame);
 		installPolyfills('animation', ['requestAnimationFrame', 'cancelAnimationFrame']);
 
-		global.registerModule('media-query-list', () => require('../media-query-list'));
+		global.registerModule('media-query-list', () => mediaQueryList);
 		installPolyfills('media-query-list', ['matchMedia', 'MediaQueryList']);
 
-		global.registerModule('ui-dialogs', () => require('../ui/dialogs'));
-		installPolyfills('ui-dialogs', ['alert', 'confirm', 'prompt', 'login', 'action']);
-
-		global.registerModule('text', () => require('../text'));
+		global.registerModule('text', () => text);
 		installPolyfills('text', ['TextDecoder', 'TextEncoder']);
 
-		global.registerModule('xhr', () => require('../xhr'));
+		global.registerModule('xhr', () => xhrImpl);
 		installPolyfills('xhr', ['XMLHttpRequest', 'FormData', 'Blob', 'File', 'FileReader']);
 
-		global.registerModule('fetch', () => require('../fetch'));
+		global.registerModule('fetch', () => fetchPolyfill);
 		installPolyfills('fetch', ['fetch', 'Headers', 'Request', 'Response']);
 
-		global.registerModule('wgc', () => require('../wgc'));
+		global.registerModule('wgc', () => wgc);
 		installPolyfills('wgc', ['atob', 'btoa']);
 
-		global.registerModule('crypto', () => require('../wgc/crypto'));
+		global.registerModule('crypto', () => cryptoImpl);
 		installPolyfills('crypto', ['Crypto']);
 
-		global.registerModule('subtle', () => require('../wgc/crypto/SubtleCrypto'));
+		global.registerModule('subtle', () => subtleCryptoImpl);
 		installPolyfills('subtle-crypto', ['Subtle']);
 
 		global.crypto = new global.Crypto();
@@ -381,11 +408,34 @@ function isTestingEnv() {
 	return typeof jest !== 'undefined' || global.__UNIT_TEST__;
 }
 
+if (typeof global.__metadata === 'undefined') {
+	/**
+	 * TS decorator metadata helper.
+	 * @param metadataKey   the metadata key (e.g. "design:type")
+	 * @param metadataValue the metadata value (e.g. the constructor function)
+	 * @returns a decorator function, or undefined if Reflect.metadata isn’t available
+	 */
+	global.__metadata = (metadataKey, metadataValue) => {
+		if (
+			typeof Reflect === 'object' &&
+			// @ts-expect-error
+			typeof Reflect.metadata === 'function'
+		) {
+			// Delegate to the reflect-metadata shim
+			// @ts-expect-error
+			return Reflect.metadata(metadataKey, metadataValue);
+		}
+		// no-op if no Reflect.metadata
+	};
+}
+
 if (!global.NativeScriptHasInitGlobal && !isTestingEnv()) {
 	initGlobal();
 }
 
-if (!isTestingEnv()) {
-	// ensure the Application instance is initialized before any other module imports it.
-	require('@nativescript/core/application');
-}
+// if (!isTestingEnv()) {
+// 	// ensure the Application instance is initialized before any other module imports it.
+// 	require('@nativescript/core/application');
+// }
+// ensure the Application instance is initialized before any other module imports it.
+import '@nativescript/core/application';
diff --git a/packages/core/http/http-request/index.ios.ts b/packages/core/http/http-request/index.ios.ts
index 27417b8682..4e004d64ca 100644
--- a/packages/core/http/http-request/index.ios.ts
+++ b/packages/core/http/http-request/index.ios.ts
@@ -4,7 +4,7 @@ import * as imageSourceModule from '../../image-source';
 import * as fsModule from '../../file-system';
 
 import { SDK_VERSION } from '../../utils/constants';
-import { isRealDevice } from '../../utils/ios';
+import { isRealDevice } from '../../utils';
 import * as types from '../../utils/types';
 import * as domainDebugger from '../../debugger';
 import { getFilenameFromUrl } from './http-request-common';
diff --git a/packages/core/http/http-shared.ts b/packages/core/http/http-shared.ts
new file mode 100644
index 0000000000..827ea86ea1
--- /dev/null
+++ b/packages/core/http/http-shared.ts
@@ -0,0 +1,9 @@
+// Shared types and interfaces for http and image-source modules.
+// Only put platform-agnostic types/interfaces here.
+
+// Example: (add more as needed)
+// TODO: look at removing this after circulars are completely resolved.
+export interface ImageSourceLike {
+	toBase64String(format: string, quality?: number): string;
+	// ... add other shared methods/properties as needed
+}
diff --git a/packages/core/http/index.d.ts b/packages/core/http/index.d.ts
index 724f78ed9a..b039c73c15 100644
--- a/packages/core/http/index.d.ts
+++ b/packages/core/http/index.d.ts
@@ -1,4 +1,5 @@
-import { ImageSource } from '../image-source';
+// import { ImageSource } from '../image-source';
+import type { ImageSourceLike } from './http-shared';
 import { File } from '../file-system';
 
 /**
@@ -29,13 +30,13 @@ export function getJSON<T>(options: HttpRequestOptions): Promise<T>;
  * Downloads the content from the specified URL and attempts to decode it as an image.
  * @param url The URL to request from.
  */
-export function getImage(url: string): Promise<ImageSource>;
+export function getImage(url: string): Promise<ImageSourceLike>;
 
 /**
  * Downloads the content from the specified URL and attempts to decode it as an image.
  * @param options An object that specifies various request options.
  */
-export function getImage(options: HttpRequestOptions): Promise<ImageSource>;
+export function getImage(options: HttpRequestOptions): Promise<ImageSourceLike>;
 
 /**
  * Downloads the content from the specified URL and attempts to save it as file.
@@ -157,7 +158,7 @@ export interface HttpContent {
 	/**
 	 * Gets the response body as ImageSource.
 	 */
-	toImage: () => Promise<ImageSource>;
+	toImage: () => Promise<ImageSourceLike>;
 
 	/**
 	 * Gets the response body as file.
diff --git a/packages/core/http/index.ts b/packages/core/http/index.ts
index 873b09fa58..6f85175138 100644
--- a/packages/core/http/index.ts
+++ b/packages/core/http/index.ts
@@ -1,4 +1,4 @@
-import { ImageSource } from '../image-source';
+import type { ImageSourceLike } from './http-shared';
 import { File } from '../file-system';
 import * as httpRequest from './http-request';
 export * from './http-request';
@@ -25,7 +25,7 @@ export interface HttpRequestOptions {
 	/**
 	 * Gets or sets the request body.
 	 */
-	content?: string | FormData | ArrayBuffer;
+	content?: string | FormData | ArrayBuffer | Uint8Array<ArrayBufferLike>;
 
 	/**
 	 * Gets or sets the request timeout in milliseconds.
@@ -91,7 +91,7 @@ export interface HttpContent {
 	/**
 	 * Gets the response body as ImageSource.
 	 */
-	toImage: () => Promise<ImageSource>;
+	toImage: () => Promise<ImageSourceLike>;
 
 	/**
 	 * Gets the response body as file.
@@ -110,7 +110,7 @@ export function getString(arg: any): Promise<string> {
 					reject(e);
 				}
 			},
-			(e) => reject(e)
+			(e) => reject(e),
 		);
 	});
 }
@@ -126,12 +126,12 @@ export function getJSON<T>(arg: any): Promise<T> {
 					reject(e);
 				}
 			},
-			(e) => reject(e)
+			(e) => reject(e),
 		);
 	});
 }
 
-export function getImage(arg: any): Promise<ImageSource> {
+export function getImage(arg: any): Promise<ImageSourceLike> {
 	return new Promise<any>((resolve, reject) => {
 		httpRequest.request(typeof arg === 'string' ? { url: arg, method: 'GET' } : arg).then(
 			(r) => {
@@ -143,7 +143,7 @@ export function getImage(arg: any): Promise<ImageSource> {
 			},
 			(err) => {
 				reject(err);
-			}
+			},
 		);
 	});
 }
@@ -159,7 +159,7 @@ export function getFile(arg: any, destinationFilePath?: string): Promise<any> {
 					reject(e);
 				}
 			},
-			(e) => reject(e)
+			(e) => reject(e),
 		);
 	});
 }
@@ -175,7 +175,7 @@ export function getBinary(arg: any): Promise<ArrayBuffer> {
 					reject(e);
 				}
 			},
-			(e) => reject(e)
+			(e) => reject(e),
 		);
 	});
 }
diff --git a/packages/core/image-source/index.android.ts b/packages/core/image-source/index.android.ts
index b0c3f4ffd2..e51847f2ba 100644
--- a/packages/core/image-source/index.android.ts
+++ b/packages/core/image-source/index.android.ts
@@ -1,12 +1,9 @@
-// Definitions.
 import { ImageSource as ImageSourceDefinition, iosSymbolScaleType } from '.';
 import { ImageAsset } from '../image-asset';
-import * as httpModule from '../http';
-
-// Types.
+import * as http from '../http';
 import { path as fsPath, knownFolders } from '../file-system';
 import { isFileOrResourcePath, RESOURCE_PREFIX, layout } from '../utils';
-import { Application } from '../application';
+import { getNativeApp } from '../application/helpers-common';
 import { Font } from '../ui/styling/font';
 import { Color } from '../color';
 
@@ -14,30 +11,8 @@ import { getScaledDimensions } from './image-source-common';
 
 export { isFileOrResourcePath };
 
-let http: typeof httpModule;
-function ensureHttp() {
-	if (!http) {
-		http = require('../http');
-	}
-}
-
-let application: android.app.Application;
-let resources: android.content.res.Resources;
-
 function getApplication() {
-	if (!application) {
-		application = Application.android.getNativeApplication();
-	}
-
-	return application;
-}
-
-function getResources() {
-	if (!resources) {
-		resources = getApplication().getResources();
-	}
-
-	return resources;
+	return getNativeApp() as android.app.Application;
 }
 
 export class ImageSource implements ImageSourceDefinition {
@@ -87,14 +62,12 @@ export class ImageSource implements ImageSourceDefinition {
 		});
 	}
 
-	static fromUrl(url: string): Promise<ImageSourceDefinition> {
-		ensureHttp();
-
-		return http.getImage(url);
+	static fromUrl(url: string): Promise<ImageSource> {
+		return http.getImage(url) as Promise<ImageSource>;
 	}
 
 	static fromResourceSync(name: string): ImageSource {
-		const res = getResources();
+		const res = getApplication().getResources();
 		if (res) {
 			const identifier: number = res.getIdentifier(name, 'drawable', getApplication().getPackageName());
 			if (0 < identifier) {
diff --git a/packages/core/image-source/index.ios.ts b/packages/core/image-source/index.ios.ts
index e4ed7dbc80..aa555d4271 100644
--- a/packages/core/image-source/index.ios.ts
+++ b/packages/core/image-source/index.ios.ts
@@ -2,7 +2,6 @@
 import { ImageSource as ImageSourceDefinition, iosSymbolScaleType } from '.';
 import { ImageAsset } from '../image-asset';
 import type { ImageBase } from '../ui/image/image-common';
-import * as httpModule from '../http';
 import { Font } from '../ui/styling/font';
 import { Color } from '../color';
 import { Trace } from '../trace';
@@ -12,16 +11,10 @@ import { path as fsPath, knownFolders } from '../file-system';
 import { isFileOrResourcePath, RESOURCE_PREFIX, layout, releaseNativeObject, SYSTEM_PREFIX } from '../utils';
 
 import { getScaledDimensions } from './image-source-common';
+import * as http from '../http';
 
 export { isFileOrResourcePath };
 
-let http: typeof httpModule;
-function ensureHttp() {
-	if (!http) {
-		http = require('../http');
-	}
-}
-
 export class ImageSource implements ImageSourceDefinition {
 	public android: android.graphics.Bitmap;
 	public ios: UIImage;
@@ -69,9 +62,7 @@ export class ImageSource implements ImageSourceDefinition {
 	}
 
 	static fromUrl(url: string): Promise<ImageSource> {
-		ensureHttp();
-
-		return http.getImage(url);
+		return http.getImage(url) as Promise<ImageSource>;
 	}
 
 	static iosSystemScaleFor(scale: iosSymbolScaleType) {
diff --git a/packages/core/index.d.ts b/packages/core/index.d.ts
index 9a7987b49a..c151254d44 100644
--- a/packages/core/index.d.ts
+++ b/packages/core/index.d.ts
@@ -8,6 +8,8 @@
 export type { NativeScriptConfig } from './config';
 
 export * from './application';
+export { androidRegisterBroadcastReceiver, androidUnregisterBroadcastReceiver, androidRegisteredReceivers, iosAddNotificationObserver, iosRemoveNotificationObserver, iosNotificationObservers } from './application/helpers';
+export { getNativeApp, setNativeApp } from './application/helpers-common';
 export * as ApplicationSettings from './application-settings';
 import * as Accessibility from './accessibility';
 export namespace AccessibilityEvents {
@@ -40,8 +42,10 @@ export * as Http from './http';
 export { ImageAsset } from './image-asset';
 export type { ImageAssetOptions } from './image-asset';
 export { ImageSource } from './image-source';
-export { ModuleNameResolver, _setResolver } from './module-name-resolver';
-export type { ModuleListProvider, PlatformContext } from './module-name-resolver';
+export { ModuleNameResolver } from './module-name-resolver';
+export { _setResolver } from './module-name-resolver/helpers';
+export type { PlatformContext } from './module-name-resolver';
+export type { ModuleListProvider } from './module-name-resolver/helpers';
 export { isAndroid, isIOS, isVisionOS, isApple, Screen, Device, platformNames } from './platform';
 export type { IDevice } from './platform';
 export { profile, enable as profilingEnable, disable as profilingDisable, time as profilingTime, uptime as profilingUptime, start as profilingStart, stop as profilingStop, isRunning as profilingIsRunning, dumpProfiles as profilingDumpProfiles, resetProfiles as profilingResetProfiles, startCPUProfile as profilingStartCPU, stopCPUProfile as profilingStopCPU } from './profiling';
diff --git a/packages/core/index.ts b/packages/core/index.ts
index ef39e07344..2ac3a095d6 100644
--- a/packages/core/index.ts
+++ b/packages/core/index.ts
@@ -3,6 +3,8 @@
 // Init globals first (use import to ensure it's always at the top)
 import './globals';
 export * from './application';
+export { androidRegisterBroadcastReceiver, androidUnregisterBroadcastReceiver, androidRegisteredReceivers, iosAddNotificationObserver, iosRemoveNotificationObserver, iosNotificationObservers } from './application/helpers';
+export { getNativeApp, setNativeApp } from './application/helpers-common';
 export * as ApplicationSettings from './application-settings';
 import * as Accessibility from './accessibility';
 export namespace AccessibilityEvents {
@@ -24,23 +26,21 @@ export type { PropertyChangeData, EventData } from './data/observable';
 export { VirtualArray } from './data/virtual-array';
 export type { ItemsLoading } from './data/virtual-array';
 export { File, FileSystemEntity, Folder, knownFolders, path, getFileAccess, AndroidDirectory } from './file-system';
-
-// Export all interfaces from "http" module
 export type { HttpRequestOptions, HttpResponse, Headers, HttpResponseEncoding, HttpContent } from './http';
 export * as Http from './http';
 export { ImageAsset } from './image-asset';
 export type { ImageAssetOptions } from './image-asset';
 export { ImageSource } from './image-source';
-export { ModuleNameResolver, _setResolver } from './module-name-resolver';
-export type { ModuleListProvider, PlatformContext } from './module-name-resolver';
+export { ModuleNameResolver } from './module-name-resolver';
+export { _setResolver } from './module-name-resolver/helpers';
+export type { PlatformContext } from './module-name-resolver';
+export type { ModuleListProvider } from './module-name-resolver/helpers';
 export { isAndroid, isIOS, isVisionOS, isApple, Screen, Device, platformNames } from './platform';
 export type { IDevice } from './platform';
-
-// Profiling
 export { profile, enable as profilingEnable, disable as profilingDisable, time as profilingTime, uptime as profilingUptime, start as profilingStart, stop as profilingStop, isRunning as profilingIsRunning, dumpProfiles as profilingDumpProfiles, resetProfiles as profilingResetProfiles, startCPUProfile as profilingStartCPU, stopCPUProfile as profilingStopCPU } from './profiling';
 export type { InstrumentationMode, TimerInfo } from './profiling';
 export { encoding } from './text';
 export * from './trace';
-export * from './ui';
 export * as Utils from './utils';
 export { XmlParser, ParserEventType, ParserEvent } from './xml';
+export * from './ui';
diff --git a/packages/core/media-query-list/index.ts b/packages/core/media-query-list/index.ts
index eea29e9dea..f15e42de41 100644
--- a/packages/core/media-query-list/index.ts
+++ b/packages/core/media-query-list/index.ts
@@ -1,25 +1,15 @@
 import { EventData, Observable } from '../data/observable';
 import { Screen } from '../platform';
-import { Application, ApplicationEventData } from '../application';
+import { getApplicationProperties, toggleApplicationEventListeners } from '../application/helpers-common';
+import type { ApplicationEventData } from '../application/application-interfaces';
 import { matchQuery, MediaQueryType } from '../css-mediaquery';
 import { Trace } from '../trace';
 
 const mediaQueryLists: MediaQueryListImpl[] = [];
-const applicationEvents: string[] = [Application.orientationChangedEvent, Application.systemAppearanceChangedEvent];
 
 // In browser, developers cannot create MediaQueryList instances without calling matchMedia
 let isMediaInitializationEnabled: boolean = false;
 
-function toggleApplicationEventListeners(toAdd: boolean) {
-	for (const eventName of applicationEvents) {
-		if (toAdd) {
-			Application.on(eventName, onDeviceChange);
-		} else {
-			Application.off(eventName, onDeviceChange);
-		}
-	}
-}
-
 function onDeviceChange(args: ApplicationEventData) {
 	for (const mql of mediaQueryLists) {
 		const matches = checkIfMediaQueryMatches(mql.media);
@@ -42,14 +32,15 @@ function checkIfMediaQueryMatches(mediaQueryString: string): boolean {
 	let matches: boolean;
 
 	try {
+		const appProperties = getApplicationProperties();
 		matches = matchQuery(mediaQueryString, {
 			type: MediaQueryType.screen,
 			width: widthPixels,
 			height: heightPixels,
 			'device-width': widthPixels,
 			'device-height': heightPixels,
-			orientation: Application.orientation(),
-			'prefers-color-scheme': Application.systemAppearance(),
+			orientation: appProperties.orientation,
+			'prefers-color-scheme': appProperties.systemAppearance,
 		});
 	} catch (err) {
 		matches = false;
@@ -130,7 +121,7 @@ class MediaQueryListImpl extends Observable implements MediaQueryList {
 			mediaQueryLists.push(this);
 
 			if (mediaQueryLists.length === 1) {
-				toggleApplicationEventListeners(true);
+				toggleApplicationEventListeners(true, onDeviceChange);
 			}
 		}
 	}
@@ -151,7 +142,7 @@ class MediaQueryListImpl extends Observable implements MediaQueryList {
 					mediaQueryLists.splice(index, 1);
 
 					if (!mediaQueryLists.length) {
-						toggleApplicationEventListeners(false);
+						toggleApplicationEventListeners(false, onDeviceChange);
 					}
 				}
 			}
diff --git a/packages/core/module-name-resolver/helpers.ts b/packages/core/module-name-resolver/helpers.ts
new file mode 100644
index 0000000000..4627f1c25e
--- /dev/null
+++ b/packages/core/module-name-resolver/helpers.ts
@@ -0,0 +1,38 @@
+export type ModuleListProvider = () => string[];
+
+let appForModuleResolverCallback: () => void;
+export function prepareAppForModuleResolver(callback: () => void) {
+	appForModuleResolverCallback = callback;
+}
+
+export function initAppForModuleResolver() {
+	if (appForModuleResolverCallback) {
+		appForModuleResolverCallback();
+		appForModuleResolverCallback = undefined;
+	}
+}
+
+export interface ModuleNameResolverType {
+	resolveModuleName(path: string, ext: string): string;
+	clearCache(): void;
+}
+
+let resolverInstance: ModuleNameResolverType;
+
+export function getResolveInstance() {
+	return resolverInstance;
+}
+
+/**
+ * Used to set a global singular instance of ModuleNameResolver
+ * @param resolver instance
+ */
+export function _setResolver(resolver: ModuleNameResolverType) {
+	resolverInstance = resolver;
+}
+
+export function clearResolverCache() {
+	if (resolverInstance) {
+		resolverInstance.clearCache();
+	}
+}
diff --git a/packages/core/module-name-resolver/index.d.ts b/packages/core/module-name-resolver/index.d.ts
index 584706f76c..812a580fa3 100644
--- a/packages/core/module-name-resolver/index.d.ts
+++ b/packages/core/module-name-resolver/index.d.ts
@@ -2,12 +2,10 @@
  * Provides ModuleNameResolver class used for loading files based on device capabilities.
  */ /** */
 
-import { PlatformContext } from './qualifier-matcher';
-
+import type { PlatformContext } from './qualifier-matcher';
+import type { ModuleListProvider } from './helpers';
 export { PlatformContext } from './qualifier-matcher';
 
-export type ModuleListProvider = () => string[];
-
 export class ModuleNameResolver {
 	constructor(context: PlatformContext, moduleListProvider?: ModuleListProvider);
 	resolveModuleName(path: string, ext: string): string;
@@ -15,10 +13,3 @@ export class ModuleNameResolver {
 }
 
 export function resolveModuleName(path: string, ext: string): string;
-export function clearCache(): void;
-
-/**
- * Used to set a global singular instance of ModuleNameResolver
- * @param resolver instance
- */
-export function _setResolver(resolver: ModuleNameResolver);
diff --git a/packages/core/module-name-resolver/index.ts b/packages/core/module-name-resolver/index.ts
index 74b77dacdb..aa78e17eb8 100644
--- a/packages/core/module-name-resolver/index.ts
+++ b/packages/core/module-name-resolver/index.ts
@@ -1,21 +1,18 @@
 import { Screen, Device } from '../platform';
 import { PlatformContext, findMatch, stripQualifiers } from './qualifier-matcher';
-import { registerModulesFromFileSystem } from './non-bundle-workflow-compat';
 import { Trace } from '../trace';
-import { Application } from '../application';
+import { ModuleNameResolverType, ModuleListProvider, initAppForModuleResolver, getResolveInstance, _setResolver } from './helpers';
 
 export type { PlatformContext } from './qualifier-matcher';
 
-export type ModuleListProvider = () => string[];
-
-export class ModuleNameResolver {
+export class ModuleNameResolver implements ModuleNameResolverType {
 	private _cache = {};
 
-	constructor(private context: PlatformContext, private moduleListProvider: ModuleListProvider = global.getRegisteredModules) {
-		Application.on('livesync', (args) => clearCache());
-		Application.on('orientationChanged', (args) => {
-			resolverInstance = undefined;
-		});
+	constructor(
+		private context: PlatformContext,
+		private moduleListProvider: ModuleListProvider = global.getRegisteredModules,
+	) {
+		initAppForModuleResolver();
 	}
 
 	public resolveModuleName(path: string, ext: string): string {
@@ -57,23 +54,23 @@ export class ModuleNameResolver {
 	}
 }
 
-let resolverInstance: ModuleNameResolver;
-
 export function resolveModuleName(path: string, ext: string): string {
 	if (global.__snapshot) {
 		return resolveModuleSnapshot(path, ext);
 	}
 
-	if (!resolverInstance) {
-		resolverInstance = new ModuleNameResolver({
-			width: Screen.mainScreen.widthDIPs,
-			height: Screen.mainScreen.heightDIPs,
-			os: Device.os,
-			deviceType: Device.deviceType,
-		});
+	if (!getResolveInstance()) {
+		_setResolver(
+			new ModuleNameResolver({
+				width: Screen.mainScreen.widthDIPs,
+				height: Screen.mainScreen.heightDIPs,
+				os: Device.os,
+				deviceType: Device.deviceType,
+			}),
+		);
 	}
 
-	return resolverInstance.resolveModuleName(path, ext);
+	return getResolveInstance().resolveModuleName(path, ext);
 }
 
 function resolveModuleSnapshot(path, ext) {
@@ -89,13 +86,3 @@ function resolveModuleSnapshot(path, ext) {
 		deviceType: 'Phone',
 	}).resolveModuleName(path, ext);
 }
-
-export function clearCache() {
-	if (resolverInstance) {
-		resolverInstance.clearCache();
-	}
-}
-
-export function _setResolver(resolver: ModuleNameResolver) {
-	resolverInstance = resolver;
-}
diff --git a/packages/core/module-name-resolver/non-bundle-workflow-compat.ts b/packages/core/module-name-resolver/non-bundle-workflow-compat.ts
index ba588a854c..e1802a5734 100644
--- a/packages/core/module-name-resolver/non-bundle-workflow-compat.ts
+++ b/packages/core/module-name-resolver/non-bundle-workflow-compat.ts
@@ -1,4 +1,3 @@
-import { Application } from '../application';
 import * as fs from '../file-system';
 import { Trace } from '../trace';
 
@@ -136,7 +135,7 @@ export function registerModulesFromFileSystem(moduleName: string) {
 
 function initialize() {
 	if (!initialized) {
-		Application.on('livesync', (args) => cache.clear());
+		// Application.on('livesync', (args) => cache.clear());
 		initialized = true;
 	}
 }
diff --git a/packages/core/package.json b/packages/core/package.json
index b3868fc159..8804919bbe 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -2,8 +2,10 @@
 	"name": "@nativescript/core",
 	"version": "8.9.3",
 	"description": "A JavaScript library providing an easy to use api for interacting with iOS and Android platform APIs.",
+	"type": "module",
 	"main": "index",
 	"types": "index.d.ts",
+	"module": "./index.js",
 	"sideEffects": [
 		"bundle-entry-points.js",
 		"./globals/index.js",
@@ -49,15 +51,15 @@
 	},
 	"license": "Apache-2.0",
 	"scripts": {
-		"postinstall": "node cli-hooks/postinstall.js",
-		"preuninstall": "node cli-hooks/preuninstall.js"
+		"postinstall": "node cli-hooks/postinstall.mjs",
+		"preuninstall": "node cli-hooks/preuninstall.mjs"
 	},
 	"dependencies": {
 		"@csstools/css-calc": "~2.1.2",
 		"@csstools/css-color-parser": "^3.0.8",
 		"@csstools/css-parser-algorithms": "^3.0.4",
 		"@csstools/css-tokenizer": "^3.0.3",
-		"@nativescript/hook": "~2.0.0",
+		"@nativescript/hook": "~3.0.1",
 		"acorn": "^8.7.0",
 		"css-tree": "^1.1.2",
 		"css-what": "^6.1.0",
@@ -73,7 +75,7 @@
 			{
 				"name": "nativescript-core",
 				"type": "before-checkForChanges",
-				"script": "cli-hooks/before-checkForChanges.js",
+				"script": "cli-hooks/before-checkForChanges.mjs",
 				"inject": true
 			}
 		]
diff --git a/packages/core/platform/device/index.android.ts b/packages/core/platform/device/index.android.ts
index d9df196162..dbc4bf9029 100644
--- a/packages/core/platform/device/index.android.ts
+++ b/packages/core/platform/device/index.android.ts
@@ -1,4 +1,4 @@
-import { Application } from '../../application';
+import { getNativeApp } from '../../application/helpers-common';
 import { SDK_VERSION } from '../../utils/constants';
 import { platformNames } from '../common';
 import { Screen } from '../screen';
@@ -65,7 +65,7 @@ class DeviceRef {
 
 	get uuid(): string {
 		if (!this._uuid) {
-			const nativeApp = Application.android.getNativeApplication();
+			const nativeApp = getNativeApp() as android.app.Application;
 			this._uuid = android.provider.Settings.Secure.getString(nativeApp.getContentResolver(), android.provider.Settings.Secure.ANDROID_ID);
 		}
 
diff --git a/packages/core/platform/screen/index.android.ts b/packages/core/platform/screen/index.android.ts
index d898811f5b..664f06e407 100644
--- a/packages/core/platform/screen/index.android.ts
+++ b/packages/core/platform/screen/index.android.ts
@@ -1,10 +1,10 @@
-import { Application } from '../../application';
+import { getNativeApp } from '../../application/helpers-common';
 
 class MainScreen {
 	private _metrics: android.util.DisplayMetrics;
 
 	private initMetrics(): void {
-		const nativeApp = Application.android.getNativeApplication();
+		const nativeApp = getNativeApp() as android.app.Application;
 		nativeApp.getSystemService(android.content.Context.WINDOW_SERVICE).getDefaultDisplay().getRealMetrics(this._metrics);
 	}
 
diff --git a/packages/core/platform/screen/index.ios.ts b/packages/core/platform/screen/index.ios.ts
index 6a036ff18e..acfed170dd 100644
--- a/packages/core/platform/screen/index.ios.ts
+++ b/packages/core/platform/screen/index.ios.ts
@@ -1,4 +1,4 @@
-import { ios } from '../../utils';
+import { getWindow } from '../../utils/ios-helper';
 
 class MainScreen {
 	private _screen: UIScreen;
@@ -6,7 +6,7 @@ class MainScreen {
 	private get screen(): UIScreen {
 		if (!this._screen) {
 			// NOTE: may not want to cache this value with SwiftUI app lifecycle based apps (using NativeScriptViewFactory) given the potential of multiple scenes
-			const window = ios.getWindow();
+			const window = getWindow() as UIWindow;
 			this._screen = window ? window.screen : UIScreen.mainScreen;
 		}
 
diff --git a/packages/core/profiling/index.ts b/packages/core/profiling/index.ts
index 2e976f92c9..e7affab0b5 100644
--- a/packages/core/profiling/index.ts
+++ b/packages/core/profiling/index.ts
@@ -110,8 +110,7 @@ function countersProfileFunctionFactory<F extends Function>(fn: F, name: string,
 }
 
 function timelineProfileFunctionFactory<F extends Function>(fn: F, name: string, type: MemberType = MemberType.Instance): F {
-	return type === MemberType.Instance
-		? <any>function () {
+	return type === MemberType.Instance ? <any>function () {
 				const start = time();
 				try {
 					return fn.apply(this, arguments);
@@ -119,8 +118,7 @@ function timelineProfileFunctionFactory<F extends Function>(fn: F, name: string,
 					const end = time();
 					console.log(`Timeline: Modules: ${name} ${this}  (${start}ms. - ${end}ms.)`);
 				}
-			}
-		: function () {
+			} : <any>function () {
 				const start = time();
 				try {
 					return fn.apply(this, arguments);
diff --git a/packages/core/project.json b/packages/core/project.json
index 28853c1ad8..7fb25d8bb8 100644
--- a/packages/core/project.json
+++ b/packages/core/project.json
@@ -20,9 +20,9 @@
 					"{workspaceRoot}/LICENSE",
 					"{projectRoot}/README.md",
 					"{projectRoot}/global-types.d.ts",
+					"{projectRoot}/fetch/LICENSE",
 					{ "glob": "**/*", "input": "{projectRoot}/js-libs/", "output": "./js-libs/" },
 					{ "glob": "**/*", "input": "{projectRoot}/cli-hooks/", "output": "./cli-hooks/" },
-					{ "glob": "**/*", "input": "{projectRoot}/fetch/", "output": "./fetch/" },
 					{ "glob": "**/*", "input": "{projectRoot}/css/", "output": "./css/" },
 					{ "glob": "**/*", "input": "{projectRoot}/css-value/", "output": "./css-value/" },
 					{ "glob": "**/*", "input": "{projectRoot}/platforms/", "output": "./platforms/" },
diff --git a/packages/core/ui/action-bar/action-bar-common.ts b/packages/core/ui/action-bar/action-bar-common.ts
index 02ce9526a1..6ffbd6f4a4 100644
--- a/packages/core/ui/action-bar/action-bar-common.ts
+++ b/packages/core/ui/action-bar/action-bar-common.ts
@@ -5,8 +5,10 @@ import { CoreTypes } from '../../core-types';
 import { View, CSSType } from '../core/view';
 import { ViewBase, booleanConverter } from '../core/view-base';
 import { Trace } from '../../trace';
-import { ShorthandProperty, CssProperty, Property, unsetValue } from '../core/properties';
-import { Length, horizontalAlignmentProperty, verticalAlignmentProperty } from '../styling/style-properties';
+import { ShorthandProperty, CssProperty, Property } from '../core/properties';
+import { unsetValue } from '../core/properties/property-shared';
+import { horizontalAlignmentProperty, verticalAlignmentProperty } from '../styling/style-properties';
+import { Length } from '../styling/length-shared';
 import { Style } from '../styling/style';
 
 @CSSType('ActionBar')
diff --git a/packages/core/ui/action-bar/index.android.ts b/packages/core/ui/action-bar/index.android.ts
index 7792e5c135..509049053e 100644
--- a/packages/core/ui/action-bar/index.android.ts
+++ b/packages/core/ui/action-bar/index.android.ts
@@ -1,15 +1,14 @@
 import { AndroidActionItemSettings, AndroidActionBarSettings as AndroidActionBarSettingsDefinition, ActionItem as ActionItemDefinition } from '.';
+import { isAccessibilityServiceEnabled } from '../../application';
+import { updateContentDescription } from '../../application/helpers';
 import { ActionItemBase, ActionBarBase, isVisible, flatProperty, traceMissingIcon, androidContentInsetLeftProperty, androidContentInsetRightProperty } from './action-bar-common';
 import { AndroidHelper, View } from '../core/view';
 import { Color } from '../../color';
 import { layout, RESOURCE_PREFIX, isFontIconURI } from '../../utils';
 import { colorProperty } from '../styling/style-properties';
 import { ImageSource } from '../../image-source';
-import { Application } from '../../application';
-import { isAccessibilityServiceEnabled, updateContentDescription } from '../../accessibility';
-import type { Background } from '../styling/background';
+import { getNativeApp } from '../../application/helpers-common';
 import { SDK_VERSION } from '../../utils/constants';
-import { NativeScriptAndroidView } from '../utils';
 
 export * from './action-bar-common';
 
@@ -81,7 +80,7 @@ function initializeMenuItemClickListener(): void {
 	}
 
 	MenuItemClickListener = MenuItemClickListenerImpl;
-	appResources = Application.android.context.getResources();
+	appResources = (getNativeApp() as android.app.Application).getApplicationContext().getResources();
 }
 
 export class ActionItem extends ActionItemBase {
@@ -296,7 +295,7 @@ export class ActionBar extends ActionBarBase {
 					traceMissingIcon(icon);
 				}
 			} else {
-				const defaultIcon = Application.android.nativeApp.getApplicationInfo().icon;
+				const defaultIcon = (getNativeApp() as android.app.Application).getApplicationInfo().icon;
 				this.nativeViewProtected.setLogo(defaultIcon);
 			}
 		} else {
@@ -311,7 +310,7 @@ export class ActionBar extends ActionBarBase {
 			if (title !== undefined) {
 				this.nativeViewProtected.setTitle(title);
 			} else {
-				const appContext = Application.android.context;
+				const appContext = (getNativeApp() as android.app.Application).getApplicationContext();
 				const appInfo = appContext.getApplicationInfo();
 				const appLabel = appContext.getPackageManager().getApplicationLabel(appInfo);
 				if (appLabel) {
@@ -548,7 +547,7 @@ function getDrawableOrResourceId(icon: string, resources: android.content.res.Re
 
 	let result = null;
 	if (icon.indexOf(RESOURCE_PREFIX) === 0) {
-		const resourceId: number = resources.getIdentifier(icon.substr(RESOURCE_PREFIX.length), 'drawable', Application.android.packageName);
+		const resourceId: number = resources.getIdentifier(icon.substr(RESOURCE_PREFIX.length), 'drawable', (getNativeApp() as android.app.Application).getApplicationContext().getPackageName());
 		if (resourceId > 0) {
 			result = resourceId;
 		}
diff --git a/packages/core/ui/action-bar/index.ios.ts b/packages/core/ui/action-bar/index.ios.ts
index 6ed96382cb..ebb3cc1c1e 100644
--- a/packages/core/ui/action-bar/index.ios.ts
+++ b/packages/core/ui/action-bar/index.ios.ts
@@ -7,13 +7,12 @@ import { LinearGradient } from '../styling/linear-gradient';
 import { colorProperty, backgroundInternalProperty, backgroundColorProperty, backgroundImageProperty } from '../styling/style-properties';
 import { ios as iosViewUtils } from '../utils';
 import { ImageSource } from '../../image-source';
-import { layout, iOSNativeHelper, isFontIconURI } from '../../utils';
+import { layout, isFontIconURI } from '../../utils';
 import { SDK_VERSION } from '../../utils/constants';
 import { accessibilityHintProperty, accessibilityLabelProperty, accessibilityLanguageProperty, accessibilityValueProperty } from '../../accessibility/accessibility-properties';
 
 export * from './action-bar-common';
 
-const majorVersion = iOSNativeHelper.MajorVersion;
 const UNSPECIFIED = layout.makeMeasureSpec(0, layout.UNSPECIFIED);
 
 interface NSUINavigationBar extends UINavigationBar {
@@ -271,7 +270,7 @@ export class ActionBar extends ActionBarBase {
 		// show the one from the old page but the new page will still be visible (because we canceled EdgeBackSwipe gesutre)
 		// Consider moving this to new method and call it from - navigationControllerDidShowViewControllerAnimated.
 		const image = img ? img.imageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal) : null;
-		if (majorVersion >= 15) {
+		if (SDK_VERSION >= 15) {
 			const appearance = this._getAppearance(navigationBar);
 			appearance.setBackIndicatorImageTransitionMaskImage(image, image);
 			this._updateAppearance(navigationBar, appearance);
@@ -378,7 +377,7 @@ export class ActionBar extends ActionBarBase {
 		}
 		if (color) {
 			const titleTextColor = NSDictionary.dictionaryWithObjectForKey(color.ios, NSForegroundColorAttributeName);
-			if (majorVersion >= 15) {
+			if (SDK_VERSION >= 15) {
 				const appearance = this._getAppearance(navBar);
 				appearance.titleTextAttributes = titleTextColor;
 			}
@@ -398,7 +397,7 @@ export class ActionBar extends ActionBarBase {
 		}
 
 		const nativeColor = color instanceof Color ? color.ios : color;
-		if (__VISIONOS__ || majorVersion >= 15) {
+		if (__VISIONOS__ || SDK_VERSION >= 15) {
 			const appearance = this._getAppearance(navBar);
 			// appearance.configureWithOpaqueBackground();
 			appearance.backgroundColor = nativeColor;
@@ -416,7 +415,7 @@ export class ActionBar extends ActionBarBase {
 
 		let color: UIColor;
 
-		if (__VISIONOS__ || majorVersion >= 15) {
+		if (__VISIONOS__ || SDK_VERSION >= 15) {
 			const appearance = this._getAppearance(navBar);
 			color = appearance.backgroundColor;
 		} else {
@@ -432,7 +431,7 @@ export class ActionBar extends ActionBarBase {
 			return;
 		}
 
-		if (__VISIONOS__ || majorVersion >= 15) {
+		if (__VISIONOS__ || SDK_VERSION >= 15) {
 			const appearance = this._getAppearance(navBar);
 			// appearance.configureWithOpaqueBackground();
 			appearance.backgroundImage = image;
@@ -456,7 +455,7 @@ export class ActionBar extends ActionBarBase {
 
 		let image: UIImage;
 
-		if (__VISIONOS__ || majorVersion >= 15) {
+		if (__VISIONOS__ || SDK_VERSION >= 15) {
 			const appearance = this._getAppearance(navBar);
 			image = appearance.backgroundImage;
 		} else {
@@ -517,7 +516,7 @@ export class ActionBar extends ActionBarBase {
 
 	private updateFlatness(navBar: UINavigationBar) {
 		if (this.flat) {
-			if (majorVersion >= 15) {
+			if (SDK_VERSION >= 15) {
 				const appearance = this._getAppearance(navBar);
 				appearance.shadowColor = UIColor.clearColor;
 				this._updateAppearance(navBar, appearance);
@@ -530,7 +529,7 @@ export class ActionBar extends ActionBarBase {
 				navBar.translucent = false;
 			}
 		} else {
-			if (majorVersion >= 15) {
+			if (SDK_VERSION >= 15) {
 				if (navBar.standardAppearance) {
 					// Not flat and never been set do nothing.
 					const appearance = navBar.standardAppearance;
@@ -581,7 +580,7 @@ export class ActionBar extends ActionBarBase {
 	public onLayout(left: number, top: number, right: number, bottom: number) {
 		const titleView = this.titleView;
 		if (titleView) {
-			if (majorVersion > 10) {
+			if (SDK_VERSION > 10) {
 				// On iOS 11 titleView is wrapped in another view that is centered with constraints.
 				View.layoutChild(this, titleView, 0, 0, titleView.getMeasuredWidth(), titleView.getMeasuredHeight());
 			} else {
diff --git a/packages/core/ui/activity-indicator/index.ios.ts b/packages/core/ui/activity-indicator/index.ios.ts
index a8847e4d28..44dd9f6e69 100644
--- a/packages/core/ui/activity-indicator/index.ios.ts
+++ b/packages/core/ui/activity-indicator/index.ios.ts
@@ -1,13 +1,11 @@
 import { ActivityIndicatorBase, busyProperty, iosIndicatorViewStyleProperty } from './activity-indicator-common';
 import { colorProperty } from '../styling/style-properties';
 import { Color } from '../../color';
-import { iOSNativeHelper } from '../../utils';
+import { SDK_VERSION } from '../../utils/constants';
 import { IOSIndicatorViewStyle } from '.';
 
 export * from './activity-indicator-common';
 
-const majorVersion = iOSNativeHelper.MajorVersion;
-
 export class ActivityIndicator extends ActivityIndicatorBase {
 	nativeViewProtected: UIActivityIndicatorView;
 
@@ -29,10 +27,10 @@ export class ActivityIndicator extends ActivityIndicatorBase {
 
 		switch (value) {
 			case 'large':
-				viewStyle = majorVersion > 12 ? UIActivityIndicatorViewStyle.Large : UIActivityIndicatorViewStyle.WhiteLarge;
+				viewStyle = SDK_VERSION > 12 ? UIActivityIndicatorViewStyle.Large : UIActivityIndicatorViewStyle.WhiteLarge;
 				break;
 			default:
-				viewStyle = majorVersion > 12 ? UIActivityIndicatorViewStyle.Medium : UIActivityIndicatorViewStyle.Gray;
+				viewStyle = SDK_VERSION > 12 ? UIActivityIndicatorViewStyle.Medium : UIActivityIndicatorViewStyle.Gray;
 				break;
 		}
 
diff --git a/packages/core/ui/animation/animation-common.ts b/packages/core/ui/animation/animation-common.ts
index cdcb86c47e..12ab1a96d2 100644
--- a/packages/core/ui/animation/animation-common.ts
+++ b/packages/core/ui/animation/animation-common.ts
@@ -1,13 +1,12 @@
 // Types.
-import { Animation as AnimationBaseDefinition, Point3D } from '.';
-import { AnimationDefinition, AnimationPromise as AnimationPromiseDefinition, Pair, PropertyAnimation } from './animation-interfaces';
-
-// Requires.
+import { Point3D } from './animation-types';
+import { AnimationDefinition, AnimationPromise as AnimationPromiseDefinition, Pair } from './animation-shared';
+import { PropertyAnimation } from './animation-shared';
 import { Color } from '../../color';
 import { Trace } from '../../trace';
-import { PercentLength } from '../styling/style-properties';
+import { PercentLength } from '../styling/length-shared';
 
-export * from './animation-interfaces';
+export * from './animation-shared';
 
 export namespace Properties {
 	export const opacity = 'opacity';
@@ -19,7 +18,7 @@ export namespace Properties {
 	export const width = 'width';
 }
 
-export abstract class AnimationBase implements AnimationBaseDefinition {
+export abstract class AnimationBase {
 	public _propertyAnimations: Array<PropertyAnimation>;
 	public _playSequentially: boolean;
 	private _isPlaying: boolean;
diff --git a/packages/core/ui/animation/animation-interfaces.ts b/packages/core/ui/animation/animation-shared.ts
similarity index 61%
rename from packages/core/ui/animation/animation-interfaces.ts
rename to packages/core/ui/animation/animation-shared.ts
index ca6536ea08..db65d1c509 100644
--- a/packages/core/ui/animation/animation-interfaces.ts
+++ b/packages/core/ui/animation/animation-shared.ts
@@ -1,7 +1,9 @@
-// Types
-import { View } from '../core/view';
-import { CoreTypes } from '../../core-types';
-import { Color } from '../../color';
+// Shared animation types/interfaces for animation and styling modules.
+// Only put platform-agnostic types/interfaces here.
+
+import type { View } from '../core/view';
+import type { CoreTypes } from '../../core-types';
+import type { Color } from '../../color';
 
 export type Transformation = {
 	property: TransformationType;
@@ -24,9 +26,36 @@ export type TransformFunctionsInfo = {
 	scale: Pair;
 };
 
-export interface AnimationPromise extends Promise<any>, Cancelable {
-	then(...args): AnimationPromise;
-	catch(...args): AnimationPromise;
+export interface Pair {
+	x: number;
+	y: number;
+}
+
+export interface Cancelable {
+	cancel(): void;
+}
+
+export type AnimationPromise = Promise<void> & Cancelable;
+
+export interface AnimationDefinition {
+	target?: View;
+	opacity?: number;
+	backgroundColor?: Color | any;
+	translate?: Pair | { x: number; y: number };
+	scale?: Pair | { x: number; y: number };
+	height?: CoreTypes.PercentLengthType | string | any;
+	width?: CoreTypes.PercentLengthType | string | any;
+	rotate?: number | Point3D | { x: number; y: number; z: number };
+	duration?: number;
+	delay?: number;
+	iterations?: number;
+	curve?: any;
+}
+
+export interface Point3D {
+	x: number;
+	y: number;
+	z: number;
 }
 
 export interface Pair {
@@ -53,21 +82,6 @@ export interface PropertyAnimationInfo extends PropertyAnimation {
 	_originalValue?: any;
 }
 
-export interface AnimationDefinition {
-	target?: View;
-	opacity?: number;
-	backgroundColor?: Color;
-	translate?: Pair;
-	scale?: Pair;
-	height?: CoreTypes.PercentLengthType | string;
-	width?: CoreTypes.PercentLengthType | string;
-	rotate?: number | Point3D;
-	duration?: number;
-	delay?: number;
-	iterations?: number;
-	curve?: any;
-}
-
 export interface AnimationDefinitionInternal extends AnimationDefinition {
 	valueSource?: 'animation' | 'keyframe';
 }
@@ -77,21 +91,3 @@ export interface IOSView extends View {
 	_resumePresentationLayerUpdates();
 	_isPresentationLayerUpdateSuspended();
 }
-
-/**
- * Defines a custom animation timing curve by using the cubic-bezier function.
- * Possible values are numeric values from 0 to 1
- */
-export class CubicBezierAnimationCurve {
-	public x1: number;
-	public y1: number;
-	public x2: number;
-	public y2: number;
-
-	constructor(x1: number, y1: number, x2: number, y2: number) {
-		this.x1 = x1;
-		this.y1 = y1;
-		this.x2 = x2;
-		this.y2 = y2;
-	}
-}
diff --git a/packages/core/ui/animation/animation-types.ts b/packages/core/ui/animation/animation-types.ts
new file mode 100644
index 0000000000..d593aac090
--- /dev/null
+++ b/packages/core/ui/animation/animation-types.ts
@@ -0,0 +1,2 @@
+// Shared types/interfaces for animation
+export * from './animation-shared';
diff --git a/packages/core/ui/animation/index.android.ts b/packages/core/ui/animation/index.android.ts
index 9bfd918d42..f6294898a4 100644
--- a/packages/core/ui/animation/index.android.ts
+++ b/packages/core/ui/animation/index.android.ts
@@ -1,16 +1,16 @@
 import { AnimationDefinitionInternal, AnimationPromise, PropertyAnimation, AnimationBase, Properties } from './animation-common';
 import { View } from '../core/view';
-import { CubicBezierAnimationCurve } from './animation-interfaces';
+import { CubicBezierAnimationCurve } from '../../core-types/animation-types';
 import { Color } from '../../color';
 import { Trace } from '../../trace';
-import { opacityProperty, backgroundColorProperty, rotateProperty, rotateXProperty, rotateYProperty, translateXProperty, translateYProperty, scaleXProperty, scaleYProperty, heightProperty, widthProperty, PercentLength } from '../styling/style-properties';
+import { opacityProperty, backgroundColorProperty, rotateProperty, rotateXProperty, rotateYProperty, translateXProperty, translateYProperty, scaleXProperty, scaleYProperty, heightProperty, widthProperty } from '../styling/style-properties';
+import { PercentLength } from '../styling/length-shared';
 import { layout } from '../../utils';
 import { SDK_VERSION } from '../../utils/constants';
 import { Device, Screen } from '../../platform';
 import lazy from '../../utils/lazy';
 
 export * from './animation-common';
-export { KeyframeAnimation, KeyframeAnimationInfo, KeyframeDeclaration, KeyframeInfo } from './keyframe-animation';
 
 let argbEvaluator: android.animation.ArgbEvaluator;
 function ensureArgbEvaluator() {
diff --git a/packages/core/ui/animation/index.d.ts b/packages/core/ui/animation/index.d.ts
index 4eaae4c6cd..602a61bccf 100644
--- a/packages/core/ui/animation/index.d.ts
+++ b/packages/core/ui/animation/index.d.ts
@@ -1,139 +1,3 @@
-import { View } from '../core/view';
-import { CoreTypes } from '../../core-types';
-import { Color } from '../../color';
-
+export type { Pair, Transformation, TransformationType, TransformationValue, TransformFunctionsInfo, Point3D, AnimationPromise, Cancelable } from './animation-types';
+export { Animation, _resolveAnimationCurve } from './animation';
 export { KeyframeAnimation, KeyframeAnimationInfo, KeyframeDeclaration, KeyframeInfo } from './keyframe-animation';
-
-/**
- * Defines animation options for the View.animate method.
- */
-export interface AnimationDefinition {
-	/**
-	 * The view whose property is to be animated.
-	 */
-	target?: View;
-
-	/**
-	 * Animates the opacity of the view. Value should be a number between 0.0 and 1.0
-	 */
-	opacity?: number;
-
-	/**
-	 * Animates the backgroundColor of the view.
-	 */
-	backgroundColor?: Color;
-
-	/**
-	 * Animates the translate affine transform of the view.
-	 */
-	translate?: Pair;
-
-	/**
-	 * Animates the scale affine transform of the view.
-	 */
-	scale?: Pair;
-
-	/**
-	 * Animates the height of a view.
-	 */
-	height?: CoreTypes.PercentLengthType | string;
-
-	/**
-	 * Animates the width of a view.
-	 */
-	width?: CoreTypes.PercentLengthType | string;
-
-	/**
-	 * Animates the rotate affine transform of the view. Value should be a number specifying the rotation amount in degrees.
-	 */
-	rotate?: number | Point3D;
-
-	/**
-	 * The length of the animation in milliseconds. The default duration is 300 milliseconds.
-	 */
-	duration?: number;
-
-	/**
-	 * The amount of time, in milliseconds, to delay starting the animation.
-	 */
-	delay?: number;
-
-	/**
-	 * Specifies how many times the animation should be played. Default is 1.
-	 * iOS animations support fractional iterations, i.e. 1.5.
-	 * To repeat an animation infinitely, use Number.POSITIVE_INFINITY
-	 */
-	iterations?: number;
-
-	/**
-	 * An optional animation curve. Possible values are contained in the [AnimationCurve enumeration](../modules/_ui_enums_.animationcurve.html).
-	 * Alternatively, you can pass an instance of type UIViewAnimationCurve for iOS or android.animation.TimeInterpolator for Android.
-	 */
-	curve?: any;
-}
-
-/**
- * Defines a key-value pair for css transformation
- */
-export type Transformation = {
-	property: TransformationType;
-	value: TransformationValue;
-};
-
-/**
- * Defines possible css transformations
- */
-export type TransformationType = 'rotate' | 'rotate3d' | 'rotateX' | 'rotateY' | 'translate' | 'translate3d' | 'translateX' | 'translateY' | 'scale' | 'scale3d' | 'scaleX' | 'scaleY';
-
-/**
- * Defines possible css transformation values
- */
-export type TransformationValue = Point3D | Pair | number;
-
-/**
- * Defines a point in 3d space (x, y and z) for rotation in 3d animations.
- */
-export interface Point3D {
-	x: number;
-	y: number;
-	z: number;
-}
-
-/**
- * Defines a pair of values (horizontal and vertical) for translate and scale animations.
- */
-export interface Pair {
-	x: number;
-	y: number;
-}
-
-/**
- * Defines full information for css transformation
- */
-export type TransformFunctionsInfo = {
-	translate: Pair;
-	rotate: Point3D;
-	scale: Pair;
-};
-
-export interface Cancelable {
-	cancel(): void;
-}
-
-/**
- * A Promise that can cancel the animation.
- */
-export type AnimationPromise = Promise<void> & Cancelable;
-
-/**
- * Defines a animation set.
- */
-export class Animation {
-	constructor(animationDefinitions: Array<AnimationDefinition>, playSequentially?: boolean);
-	public play: (resetOnFinish?: boolean) => AnimationPromise;
-	public cancel: () => void;
-	public isPlaying: boolean;
-	public _resolveAnimationCurve(curve: any): any;
-}
-
-export function _resolveAnimationCurve(curve: any): any;
diff --git a/packages/core/ui/animation/index.ios.ts b/packages/core/ui/animation/index.ios.ts
index 860ea77994..d8c719fc0d 100644
--- a/packages/core/ui/animation/index.ios.ts
+++ b/packages/core/ui/animation/index.ios.ts
@@ -1,9 +1,10 @@
 // Types
 import { AnimationDefinitionInternal, AnimationPromise, IOSView, PropertyAnimation, PropertyAnimationInfo, AnimationBase, Properties } from './animation-common';
 import { View } from '../core/view';
-import { CubicBezierAnimationCurve } from './animation-interfaces';
+import { CubicBezierAnimationCurve } from '../../core-types/animation-types';
 import { Trace } from '../../trace';
-import { opacityProperty, backgroundColorProperty, rotateProperty, rotateXProperty, rotateYProperty, translateXProperty, translateYProperty, scaleXProperty, scaleYProperty, heightProperty, widthProperty, PercentLength } from '../styling/style-properties';
+import { opacityProperty, backgroundColorProperty, rotateProperty, rotateXProperty, rotateYProperty, translateXProperty, translateYProperty, scaleXProperty, scaleYProperty, heightProperty, widthProperty } from '../styling/style-properties';
+import { PercentLength } from '../styling/length-shared';
 import { ios as iosBackground } from '../styling/background';
 import { ios as iosViewUtils, NativeScriptUIView } from '../utils';
 
@@ -12,7 +13,6 @@ import { ios as iosHelper } from '../../utils/native-helper';
 import { Screen } from '../../platform';
 
 export * from './animation-common';
-export { KeyframeAnimation, KeyframeAnimationInfo, KeyframeDeclaration, KeyframeInfo } from './keyframe-animation';
 
 const _transform = '_transform';
 const _skip = '_skip';
diff --git a/packages/core/ui/animation/keyframe-animation.d.ts b/packages/core/ui/animation/keyframe-animation.d.ts
deleted file mode 100644
index e0cd84ad3c..0000000000
--- a/packages/core/ui/animation/keyframe-animation.d.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { View } from '../core/view';
-import { CoreTypes } from '../../core-types';
-import { Color } from '../../color';
-
-export declare const ANIMATION_PROPERTIES;
-
-interface Keyframe {
-	backgroundColor?: Color;
-	scale?: { x: number; y: number };
-	translate?: { x: number; y: number };
-	rotate?: { x: number; y: number; z: number };
-	opacity?: number;
-	width?: CoreTypes.PercentLengthType;
-	height?: CoreTypes.PercentLengthType;
-	valueSource?: 'keyframe' | 'animation';
-	duration?: number;
-	curve?: any;
-	forceLayer?: boolean;
-}
-
-export interface Keyframes {
-	name: string;
-	keyframes: Array<UnparsedKeyframe>;
-	tag?: string | number;
-	scopedTag?: string;
-	mediaQueryString?: string;
-}
-
-export interface UnparsedKeyframe {
-	values: Array<any>;
-	declarations: Array<KeyframeDeclaration>;
-}
-
-export interface KeyframeDeclaration {
-	property: string;
-	value: any;
-}
-
-export interface KeyframeInfo {
-	duration: number;
-	declarations: Array<KeyframeDeclaration>;
-	curve?: any;
-}
-
-/**
- * Defines animation options for the View.animate method.
- */
-export class KeyframeAnimationInfo {
-	/**
-	 * Return animation keyframes.
-	 */
-	keyframes: Array<KeyframeInfo>;
-
-	/**
-	 * The animation name.
-	 */
-	name?: string;
-
-	/**
-	 * The length of the animation in milliseconds. The default duration is 300 milliseconds.
-	 */
-	duration?: number;
-
-	/**
-	 * The amount of time, in milliseconds, to delay starting the animation.
-	 */
-	delay?: number;
-
-	/**
-	 * Specifies how many times the animation should be played. Default is 1.
-	 * iOS animations support fractional iterations, i.e. 1.5.
-	 * To repeat an animation infinitely, use Number.POSITIVE_INFINITY
-	 */
-	iterations?: number;
-
-	/**
-	 * An optional animation curve. Possible values are contained in the [AnimationCurve enumeration](../modules/_ui_enums_.animationcurve.html).
-	 * Alternatively, you can pass an instance of type UIViewAnimationCurve for iOS or android.animation.TimeInterpolator for Android.
-	 */
-	curve?: any;
-
-	/**
-	 * Determines whether the animation values will be applied on the animated object after the animation finishes.
-	 */
-	isForwards: boolean;
-
-	/**
-	 * If true the animation will be played backwards.
-	 */
-	isReverse?: boolean;
-}
-
-export class KeyframeAnimation {
-	animations: Array<Keyframe>;
-
-	/**
-	 * The amount of time, in milliseconds, to delay starting the animation.
-	 */
-	delay: number;
-
-	/**
-	 * Specifies how many times the animation should be played. Default is 1.
-	 * iOS animations support fractional iterations, i.e. 1.5.
-	 * To repeat an animation infinitely, use Number.POSITIVE_INFINITY
-	 */
-	iterations: number;
-
-	/**
-	 * Returns true if the application is currently running.
-	 */
-	isPlaying: boolean;
-
-	/**
-	 * Plays the animation.
-	 */
-	public play: (view: View) => Promise<void>;
-
-	/**
-	 * Cancels a playing animation.
-	 */
-	public cancel: () => void;
-
-	/**
-	 * Creates a keyframe animation from animation definition.
-	 */
-	public static keyframeAnimationFromInfo(info: KeyframeAnimationInfo): KeyframeAnimation;
-}
diff --git a/packages/core/ui/animation/keyframe-animation.ts b/packages/core/ui/animation/keyframe-animation.ts
index 9e6bffa2bb..d5617034cb 100644
--- a/packages/core/ui/animation/keyframe-animation.ts
+++ b/packages/core/ui/animation/keyframe-animation.ts
@@ -6,8 +6,8 @@ import { CoreTypes } from '../../core-types';
 import { Trace } from '../../trace';
 
 // Types.
-import { unsetValue } from '../core/properties';
-import { Animation } from '.';
+import { unsetValue } from '../core/properties/property-shared';
+import { Animation } from './index';
 import { backgroundColorProperty, scaleXProperty, scaleYProperty, translateXProperty, translateYProperty, rotateProperty, opacityProperty, rotateXProperty, rotateYProperty, widthProperty, heightProperty } from '../styling/style-properties';
 
 export interface Keyframes {
diff --git a/packages/core/ui/builder/xml2ui.ts b/packages/core/ui/builder/xml2ui.ts
index 4408baef8f..51f6d1b2a6 100644
--- a/packages/core/ui/builder/xml2ui.ts
+++ b/packages/core/ui/builder/xml2ui.ts
@@ -8,6 +8,28 @@ import { Device } from '../../platform';
 import { profile } from '../../profiling';
 import { android, ios, visionos, apple, loadCustomComponent, defaultNameSpaceMatcher, getExports, Builder } from './index';
 
+// Note: after all circulars are resolve, try importing this from single place or see if globals/index.ts properly handles it
+if (typeof global.__metadata === 'undefined') {
+	/**
+	 * TS decorator metadata helper.
+	 * @param metadataKey   the metadata key (e.g. "design:type")
+	 * @param metadataValue the metadata value (e.g. the constructor function)
+	 * @returns a decorator function, or undefined if Reflect.metadata isn’t available
+	 */
+	global.__metadata = (metadataKey, metadataValue) => {
+		if (
+			typeof Reflect === 'object' &&
+			// @ts-expect-error
+			typeof Reflect.metadata === 'function'
+		) {
+			// Delegate to the reflect-metadata shim
+			// @ts-expect-error
+			return Reflect.metadata(metadataKey, metadataValue);
+		}
+		// no-op if no Reflect.metadata
+	};
+}
+
 export namespace xml2ui {
 	/**
 	 * Pipes and filters:
@@ -80,6 +102,7 @@ export namespace xml2ui {
 
 	export function SourceErrorFormat(uri): ErrorFormatter {
 		return (e: Error, p: xml.Position) => {
+			console.error(uri);
 			const source = p ? new Source(uri, p.line, p.column) : new Source(uri, -1, -1);
 			e = new SourceError(e, source, 'Building UI from XML.');
 
diff --git a/packages/core/ui/button/index.android.ts b/packages/core/ui/button/index.android.ts
index 09aa8ba98a..16e294b65c 100644
--- a/packages/core/ui/button/index.android.ts
+++ b/packages/core/ui/button/index.android.ts
@@ -1,14 +1,12 @@
 import { ButtonBase } from './button-common';
-import { AndroidHelper, PseudoClassHandler } from '../core/view';
-import { paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, Length, zIndexProperty, minWidthProperty, minHeightProperty } from '../styling/style-properties';
+import { PseudoClassHandler } from '../core/view';
+import { paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, zIndexProperty, minWidthProperty, minHeightProperty } from '../styling/style-properties';
+import { Length } from '../styling/length-shared';
 import { textAlignmentProperty } from '../text-base';
 import { CoreTypes } from '../../core-types';
 import { profile } from '../../profiling';
 import { TouchGestureEventData, TouchAction, GestureTypes } from '../gestures';
-import { Device } from '../../platform';
 import { SDK_VERSION } from '../../utils/constants';
-import type { Background } from '../styling/background';
-import { NativeScriptAndroidView } from '../utils';
 
 export * from './button-common';
 
diff --git a/packages/core/ui/core/bindable/bindable-types.ts b/packages/core/ui/core/bindable/bindable-types.ts
new file mode 100644
index 0000000000..89e5470df4
--- /dev/null
+++ b/packages/core/ui/core/bindable/bindable-types.ts
@@ -0,0 +1,40 @@
+// Shared types/interfaces for bindable and view-base
+
+/**
+ * The options object used in the Bindable.bind method.
+ */
+export interface BindingOptions {
+	/**
+	 * The property name of the source object (typically the ViewModel) to bind to.
+	 */
+	sourceProperty: string;
+	/**
+	 * The property name of the target object (that is the Bindable instance) to bind the source property to.
+	 */
+	targetProperty: string;
+	/**
+	 * True to establish a two-way binding, false otherwise. A two-way binding will synchronize both the source and the target property values regardless of which one initiated the change.
+	 */
+	twoWay?: boolean;
+	/**
+	 * An expression used for calculations (convertions) based on the value of the property.
+	 */
+	expression?: string;
+}
+
+/**
+ * An interface which defines methods need to create binding value converter.
+ */
+export interface ValueConverter {
+	/**
+	 * A method that will be executed when a value (of the binding property) should be converted to the observable model.
+	 * For example: user types in a text field, but our business logic requires to store data in a different manner (e.g. in lower case).
+	 * @param params - An array of parameters where first element is the value of the property and next elements are parameters send to converter.
+	 */
+	toModel: (...params: any[]) => any;
+	/**
+	 * A method that will be executed when a value should be converted to the UI view. For example we have a date object which should be displayed to the end user in a specific date format.
+	 * @param params - An array of parameters where first element is the value of the property and next elements are parameters send to converter.
+	 */
+	toView: (...params: any[]) => any;
+}
diff --git a/packages/core/ui/core/bindable/index.ts b/packages/core/ui/core/bindable/index.ts
index d893e51a7a..76466b1913 100644
--- a/packages/core/ui/core/bindable/index.ts
+++ b/packages/core/ui/core/bindable/index.ts
@@ -1,10 +1,7 @@
-// Types
-import { ViewBase } from '../view-base';
-
-// Requires
-import { unsetValue } from '../properties';
+import type { ViewBase } from '../view-base';
+import type { BindingOptions } from './bindable-types';
+import { unsetValue } from '../properties/property-shared';
 import { Observable, PropertyChangeData } from '../../../data/observable';
-import { fromString as gestureFromString } from '../../../ui/gestures/gestures-common';
 import { addWeakEventListener, removeWeakEventListener } from '../weak-event-listener';
 import { bindingConstants, parentsRegex } from '../../builder/binding-builder';
 import { escapeRegexSymbols } from '../../../utils';
@@ -49,45 +46,6 @@ function getProperties(property: string): Array<string> {
 	return result;
 }
 
-/**
- * The options object used in the Bindable.bind method.
- */
-export interface BindingOptions {
-	/**
-	 * The property name of the source object (typically the ViewModel) to bind to.
-	 */
-	sourceProperty: string;
-	/**
-	 * The property name of the target object (that is the Bindable instance) to bind the source property to.
-	 */
-	targetProperty: string;
-	/**
-	 * True to establish a two-way binding, false otherwise. A two-way binding will synchronize both the source and the target property values regardless of which one initiated the change.
-	 */
-	twoWay?: boolean;
-	/**
-	 * An expression used for calculations (convertions) based on the value of the property.
-	 */
-	expression?: string;
-}
-
-/**
- * An interface which defines methods need to create binding value converter.
- */
-export interface ValueConverter {
-	/**
-	 * A method that will be executed when a value (of the binding property) should be converted to the observable model.
-	 * For example: user types in a text field, but our business logic requires to store data in a different manner (e.g. in lower case).
-	 * @param params - An array of parameters where first element is the value of the property and next elements are parameters send to converter.
-	 */
-	toModel: (...params: any[]) => any;
-	/**
-	 * A method that will be executed when a value should be converted to the UI view. For example we have a date object which should be displayed to the end user in a specific date format.
-	 * @param params - An array of parameters where first element is the value of the property and next elements are parameters send to converter.
-	 */
-	toView: (...params: any[]) => any;
-}
-
 /**
  * Normalizes "ontap" to "tap", and "ondoubletap" to "ondoubletap".
  *
diff --git a/packages/core/ui/core/properties/index.ts b/packages/core/ui/core/properties/index.ts
index 3980e39c14..a44045bda1 100644
--- a/packages/core/ui/core/properties/index.ts
+++ b/packages/core/ui/core/properties/index.ts
@@ -6,44 +6,8 @@ import { Style } from '../../styling/style';
 
 import { profile } from '../../../profiling';
 import { CoreTypes } from '../../enums';
-
-/**
- * Value specifying that Property should be set to its initial value.
- */
-export const unsetValue: any = new Object();
-
-export interface PropertyOptions<T, U> {
-	readonly name: string;
-	readonly defaultValue?: U;
-	readonly affectsLayout?: boolean;
-	readonly equalityComparer?: (x: U, y: U) => boolean;
-	readonly valueChanged?: (target: T, oldValue: U, newValue: U) => void;
-	readonly valueConverter?: (value: string) => U;
-}
-
-export interface CoerciblePropertyOptions<T, U> extends PropertyOptions<T, U> {
-	readonly coerceValue: (t: T, u: U) => U;
-}
-
-export interface CssPropertyOptions<T extends Style, U> extends PropertyOptions<T, U> {
-	readonly cssName: string;
-}
-
-export interface ShorthandPropertyOptions<P> {
-	readonly name: string;
-	readonly cssName: string;
-	readonly converter: (value: string | P) => [CssProperty<any, any> | CssAnimationProperty<any, any>, any][];
-	readonly getter: (this: Style) => string | P;
-}
-
-export interface CssAnimationPropertyOptions<T, U> {
-	readonly name: string;
-	readonly cssName?: string;
-	readonly defaultValue?: U;
-	readonly equalityComparer?: (x: U, y: U) => boolean;
-	readonly valueChanged?: (target: T, oldValue: U, newValue: U) => void;
-	readonly valueConverter?: (value: string) => U;
-}
+import { makeValidator, makeParser } from '../../../core-types/validators';
+import { unsetValue, PropertyOptions, CoerciblePropertyOptions, CssPropertyOptions, ShorthandPropertyOptions, CssAnimationPropertyOptions, isCssWideKeyword, isCssUnsetValue, isResetValue } from './property-shared';
 
 const cssPropertyNames: string[] = [];
 const symbolPropertyMap = {};
@@ -70,14 +34,6 @@ function print(map) {
 	}
 }
 
-function isCssUnsetValue(value: any): boolean {
-	return value === 'unset' || value === 'revert';
-}
-
-function isResetValue(value: any): boolean {
-	return value === unsetValue || value === 'initial' || value === 'inherit' || isCssUnsetValue(value);
-}
-
 export function _printUnregisteredProperties(): void {
 	print(symbolPropertyMap);
 	print(cssSymbolPropertyMap);
@@ -103,10 +59,6 @@ export function isCssVariableExpression(value: string) {
 	return value.includes('var(--');
 }
 
-export function isCssWideKeyword(value: any): value is CoreTypes.CSSWideKeywords {
-	return value === 'initial' || value === 'inherit' || isCssUnsetValue(value);
-}
-
 export function _evaluateCssVariableExpression(view: ViewBase, cssName: string, value: string): string {
 	if (typeof value !== 'string') {
 		return value;
@@ -196,7 +148,7 @@ export class Property<T extends ViewBase, U> implements TypedPropertyDescriptor<
 	public readonly key: symbol;
 
 	public readonly getDefault: symbol;
-	public readonly setNative: symbol;
+	public readonly setNative: any;
 
 	public readonly defaultValueKey: symbol;
 	public readonly defaultValue: U;
@@ -397,7 +349,7 @@ export class CoercibleProperty<T extends ViewBase, U> extends Property<T, U> imp
 		const propertyName = options.name;
 		const key = this.key;
 		const getDefault: symbol = this.getDefault;
-		const setNative: symbol = this.setNative;
+		const setNative: any = this.setNative;
 		const defaultValueKey = this.defaultValueKey;
 		const defaultValue: U = this.defaultValue;
 
@@ -598,7 +550,7 @@ export class InheritedProperty<T extends ViewBase, U> extends Property<T, U> imp
 	}
 }
 
-export class CssProperty<T extends Style, U> implements CssProperty<T, U> {
+export class CssProperty<T extends Style, U> {
 	private registered: boolean;
 
 	public readonly name: string;
@@ -612,7 +564,7 @@ export class CssProperty<T extends Style, U> implements CssProperty<T, U> {
 
 	public readonly key: symbol;
 	public readonly getDefault: symbol;
-	public readonly setNative: symbol;
+	public readonly setNative: any;
 	public readonly sourceKey: symbol;
 	public readonly defaultValueKey: symbol;
 	public readonly defaultValue: U;
@@ -879,7 +831,7 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
 	public readonly cssLocalName: string;
 
 	public readonly getDefault: symbol;
-	public readonly setNative: symbol;
+	public readonly setNative: any;
 
 	public readonly register: (cls: { prototype }) => void;
 
@@ -1348,6 +1300,8 @@ export class ShorthandProperty<T extends Style, P> implements ShorthandProperty<
 	}
 }
 
+export { makeValidator, makeParser } from '../../../core-types/validators';
+
 function inheritablePropertyValuesOn(view: ViewBase): Array<{ property: InheritedProperty<any, any>; value: any }> {
 	const array = new Array<{
 		property: InheritedProperty<any, any>;
@@ -1564,29 +1518,6 @@ export function propagateInheritableCssProperties(parentStyle: Style, childStyle
 	}
 }
 
-export function makeValidator<T>(...values: T[]): (value: any) => value is T {
-	const set = new Set(values);
-
-	return (value: any): value is T => set.has(value);
-}
-
-export function makeParser<T>(isValid: (value: any) => boolean, allowNumbers = false): (value: any) => T {
-	return (value) => {
-		const lower = value && value.toLowerCase();
-		if (isValid(lower)) {
-			return lower;
-		} else {
-			if (allowNumbers) {
-				const convNumber = +value;
-				if (!isNaN(convNumber)) {
-					return value;
-				}
-			}
-			throw new Error('Invalid value: ' + value);
-		}
-	};
-}
-
 export function getSetProperties(view: ViewBase): [string, any][] {
 	const result = [];
 
diff --git a/packages/core/ui/core/properties/property-shared.ts b/packages/core/ui/core/properties/property-shared.ts
new file mode 100644
index 0000000000..4618c78e59
--- /dev/null
+++ b/packages/core/ui/core/properties/property-shared.ts
@@ -0,0 +1,63 @@
+// Shared property types, interfaces, and value helpers for properties and view-base modules.
+// Only put platform-agnostic logic here.
+
+/**
+ * Value specifying that Property should be set to its initial value.
+ */
+export const unsetValue: any = new Object();
+
+export interface PropertyOptions<T, U> {
+	readonly name: string;
+	readonly defaultValue?: U;
+	readonly affectsLayout?: boolean;
+	readonly equalityComparer?: (x: U, y: U) => boolean;
+	readonly valueChanged?: (target: T, oldValue: U, newValue: U) => void;
+	readonly valueConverter?: (value: string) => U;
+}
+
+export interface CoerciblePropertyOptions<T, U> extends PropertyOptions<T, U> {
+	readonly coerceValue: (t: T, u: U) => U;
+}
+
+export interface CssPropertyOptions<T, U> extends PropertyOptions<T, U> {
+	readonly cssName: string;
+}
+// TODO: revisit this after circular dependency issues are resolved to see if types can be retained.
+// export interface CssPropertyOptions<T extends Style, U> extends PropertyOptions<T, U> {
+// 	readonly cssName: string;
+// }
+
+export interface ShorthandPropertyOptions<P> {
+	readonly name: string;
+	readonly cssName: string;
+	readonly converter: (value: string | P) => [any, any][];
+	readonly getter: (this: any) => string | P;
+}
+// TODO: revisit this after circular dependency issues are resolved to see if types can be retained.
+// export interface ShorthandPropertyOptions<P> {
+// 	readonly name: string;
+// 	readonly cssName: string;
+// 	readonly converter: (value: string | P) => [CssProperty<any, any> | CssAnimationProperty<any, any>, any][];
+// 	readonly getter: (this: Style) => string | P;
+// }
+
+export interface CssAnimationPropertyOptions<T, U> {
+	readonly name: string;
+	readonly cssName?: string;
+	readonly defaultValue?: U;
+	readonly equalityComparer?: (x: U, y: U) => boolean;
+	readonly valueChanged?: (target: T, oldValue: U, newValue: U) => void;
+	readonly valueConverter?: (value: string) => U;
+}
+
+export function isCssUnsetValue(value: any): boolean {
+	return value === 'unset' || value === 'revert';
+}
+
+export function isResetValue(value: any): boolean {
+	return value === unsetValue || value === 'initial' || value === 'inherit' || isCssUnsetValue(value);
+}
+
+export function isCssWideKeyword(value: any): boolean {
+	return value === 'initial' || value === 'inherit' || isCssUnsetValue(value);
+}
diff --git a/packages/core/ui/core/view-base/index.ts b/packages/core/ui/core/view-base/index.ts
index 39f0668a44..228733b5c5 100644
--- a/packages/core/ui/core/view-base/index.ts
+++ b/packages/core/ui/core/view-base/index.ts
@@ -1,11 +1,11 @@
 import { AlignSelf, Flex, FlexFlow, FlexGrow, FlexShrink, FlexWrapBefore, Order } from '../../layouts/flexbox-layout';
 import { Page } from '../../page';
-import { CoreTypes } from '../../../core-types';
+import { CoreTypes, Trace } from '../../styling/styling-shared';
 import { Property, CssProperty, CssAnimationProperty, InheritedProperty, clearInheritedProperties, propagateInheritableProperties, propagateInheritableCssProperties, initNativeView } from '../properties';
 import { CSSUtils } from '../../../css/system-classes';
-import { Source } from '../../../utils/debug';
-import { Binding, BindingOptions } from '../bindable';
-import { Trace } from '../../../trace';
+import { Source } from '../../../utils/debug-source';
+import { Binding } from '../bindable';
+import { BindingOptions } from '../bindable/bindable-types';
 import { Observable, PropertyChangeData, WrappedValue } from '../../../data/observable';
 import { Style } from '../../styling/style';
 import { paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty } from '../../styling/style-properties';
@@ -13,27 +13,15 @@ import type { ModalTransition } from '../../transition/modal-transition';
 
 // TODO: Remove this import!
 import { getClass } from '../../../utils/types';
+import { unsetValue } from '../properties/property-shared';
 
 import { profile } from '../../../profiling';
 
-import * as dnm from '../../../debugger/dom-node';
-import * as ssm from '../../styling/style-scope';
-import { ViewBase as ViewBaseDefinition } from '.';
+import { DOMNode } from '../../../debugger/dom-types';
+import { applyInlineStyle, CssState, StyleScope } from '../../styling/style-scope';
+import { booleanConverter } from './utils';
 
-let domNodeModule: typeof dnm;
-
-function ensuredomNodeModule(): void {
-	if (!domNodeModule) {
-		domNodeModule = require('../../../debugger/dom-node');
-	}
-}
-
-let styleScopeModule: typeof ssm;
-function ensureStyleScopeModule() {
-	if (!styleScopeModule) {
-		styleScopeModule = require('../../styling/style-scope');
-	}
-}
+export { booleanConverter } from './utils';
 
 const defaultBindingSource = {};
 
@@ -117,12 +105,12 @@ export interface ShowModalOptions {
  * @param criterion - The type of ancestor view we are looking for. Could be a string containing a class name or an actual type.
  * Returns an instance of a view (if found), otherwise undefined.
  */
-export function getAncestor(view: ViewBaseDefinition, criterion: string | { new () }): ViewBaseDefinition {
-	let matcher: (view: ViewBaseDefinition) => boolean = null;
+export function getAncestor(view: ViewBase, criterion: string | { new () }): ViewBase {
+	let matcher: (view: ViewBase) => boolean = null;
 	if (typeof criterion === 'string') {
-		matcher = (view: ViewBaseDefinition) => view.typeName === criterion;
+		matcher = (view: ViewBase) => view.typeName === criterion;
 	} else {
-		matcher = (view: ViewBaseDefinition) => view instanceof criterion;
+		matcher = (view: ViewBase) => view instanceof criterion;
 	}
 
 	for (let parent = view.parent; parent != null; parent = parent.parent) {
@@ -140,7 +128,7 @@ export function getAncestor(view: ViewBaseDefinition, criterion: string | { new
  * @param id - The id of the view to look for.
  * Returns an instance of a view (if found), otherwise undefined.
  */
-export function getViewById(view: ViewBaseDefinition, id: string): ViewBaseDefinition {
+export function getViewById(view: ViewBase, id: string): ViewBase {
 	if (!view) {
 		return undefined;
 	}
@@ -149,8 +137,8 @@ export function getViewById(view: ViewBaseDefinition, id: string): ViewBaseDefin
 		return view;
 	}
 
-	let retVal: ViewBaseDefinition;
-	const descendantsCallback = function (child: ViewBaseDefinition): boolean {
+	let retVal: ViewBase;
+	const descendantsCallback = function (child: ViewBase): boolean {
 		if (child.id === id) {
 			retVal = child;
 
@@ -172,7 +160,7 @@ export function getViewById(view: ViewBaseDefinition, id: string): ViewBaseDefin
  * @param domId - The id of the view to look for.
  * Returns an instance of a view (if found), otherwise undefined.
  */
-export function getViewByDomId(view: ViewBaseDefinition, domId: number): ViewBaseDefinition {
+export function getViewByDomId(view: ViewBase, domId: number): ViewBase {
 	if (!view) {
 		return undefined;
 	}
@@ -181,8 +169,8 @@ export function getViewByDomId(view: ViewBaseDefinition, domId: number): ViewBas
 		return view;
 	}
 
-	let retVal: ViewBaseDefinition;
-	const descendantsCallback = function (child: ViewBaseDefinition): boolean {
+	let retVal: ViewBase;
+	const descendantsCallback = function (child: ViewBase): boolean {
 		if (view._domId === domId) {
 			retVal = child;
 
@@ -205,17 +193,17 @@ export function getViewByDomId(view: ViewBaseDefinition, domId: number): ViewBas
  * @param selector - The selector of the view to look for.
  * Returns an instance of a view (if found), otherwise undefined.
  */
-export function querySelectorAll(view: ViewBaseDefinition, selector: string): Array<ViewBaseDefinition> {
+export function querySelectorAll(view: ViewBase, selector: string): Array<ViewBase> {
 	if (!view) {
 		return [];
 	}
 
-	const retVal: Array<ViewBaseDefinition> = [];
+	const retVal: Array<ViewBase> = [];
 	if (view[selector]) {
 		retVal.push(view);
 	}
 
-	const descendantsCallback = function (child: ViewBaseDefinition): boolean {
+	const descendantsCallback = function (child: ViewBase): boolean {
 		if (child[selector]) {
 			retVal.push(child);
 		}
@@ -233,13 +221,13 @@ export function querySelectorAll(view: ViewBaseDefinition, selector: string): Ar
  * @param view - Starting view (parent container).
  * @param callback - A function to execute on every child. If function returns false it breaks the iteration.
  */
-export function eachDescendant(view: ViewBaseDefinition, callback: (child: ViewBaseDefinition) => boolean) {
+export function eachDescendant(view: ViewBase, callback: (child: ViewBase) => boolean) {
 	if (!callback || !view) {
 		return;
 	}
 
 	let continueIteration: boolean;
-	const localCallback = function (child: ViewBaseDefinition): boolean {
+	const localCallback = function (child: ViewBase): boolean {
 		continueIteration = callback(child);
 		if (continueIteration) {
 			child.eachChild(localCallback);
@@ -313,7 +301,7 @@ const DEFAULT_VIEW_PADDINGS: Map<string, any> = new Map();
  *
  * @nsView ViewBase
  */
-export abstract class ViewBase extends Observable implements ViewBaseDefinition {
+export abstract class ViewBase extends Observable {
 	/**
 	 * String value used when hooking to loaded event.
 	 *
@@ -355,7 +343,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
 	private __nativeView: any;
 	// private _disableNativeViewRecycling: boolean;
 
-	public domNode: dnm.DOMNode;
+	public domNode: DOMNode;
 
 	public recycleNativeView: 'always' | 'never' | 'auto';
 	/**
@@ -422,8 +410,8 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
 	public _domId: number;
 	public _context: any /* android.content.Context */;
 	public _isAddedToNativeVisualTree: boolean;
-	/* "ui/styling/style-scope" */ public _cssState: ssm.CssState = new ssm.CssState(new WeakRef(this));
-	public _styleScope: ssm.StyleScope;
+	/* "ui/styling/style-scope" */ public _cssState: CssState = new CssState(new WeakRef(this));
+	public _styleScope: StyleScope;
 	/**
 	 * A property bag holding suspended native updates.
 	 * Native setters that had to execute while there was no native view,
@@ -647,14 +635,14 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
 	/**
 	 * Returns the child view with the specified id.
 	 */
-	getViewById<T extends ViewBaseDefinition>(id: string): T {
+	getViewById<T extends ViewBase>(id: string): T {
 		return <T>getViewById(this, id);
 	}
 
 	/**
 	 * Returns the child view with the specified domId.
 	 */
-	getViewByDomId<T extends ViewBaseDefinition>(domId: number): T {
+	getViewByDomId<T extends ViewBase>(domId: number): T {
 		return <T>getViewByDomId(this, domId);
 	}
 
@@ -675,8 +663,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
 	 */
 	public ensureDomNode() {
 		if (!this.domNode) {
-			ensuredomNodeModule();
-			this.domNode = new domNodeModule.DOMNode(this);
+			this.domNode = new DOMNode(this);
 		}
 	}
 
@@ -1406,8 +1393,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
 			throw new Error('Parameter should be valid CSS string!');
 		}
 
-		ensureStyleScopeModule();
-		styleScopeModule.applyInlineStyle(this, style, undefined);
+		applyInlineStyle(this, style, undefined);
 	}
 
 	public _parentChanged(oldParent: ViewBase): void {
@@ -1459,7 +1445,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
 		});
 	}
 
-	_inheritStyleScope(styleScope: ssm.StyleScope): void {
+	_inheritStyleScope(styleScope: StyleScope): void {
 		// If we are styleScope don't inherit parent stylescope.
 		// TODO: Consider adding parent scope and merge selectors.
 		if (this._isStyleScopeHost) {
@@ -1629,14 +1615,3 @@ export const defaultVisualStateProperty = new Property<ViewBase, string>({
 	},
 });
 defaultVisualStateProperty.register(ViewBase);
-
-export function booleanConverter(v: string | boolean): boolean {
-	const lowercase = (v + '').toLowerCase();
-	if (lowercase === 'true') {
-		return true;
-	} else if (lowercase === 'false') {
-		return false;
-	}
-
-	throw new Error(`Invalid boolean: ${v}`);
-}
diff --git a/packages/core/ui/core/view-base/utils.ts b/packages/core/ui/core/view-base/utils.ts
new file mode 100644
index 0000000000..e4fac75d75
--- /dev/null
+++ b/packages/core/ui/core/view-base/utils.ts
@@ -0,0 +1,9 @@
+// Utility functions for view-base and related modules
+
+export function booleanConverter(v: string | boolean): boolean {
+	if (typeof v === 'string') {
+		v = v.trim().toLowerCase();
+		return v === 'true' || v === '1';
+	}
+	return !!v;
+}
diff --git a/packages/core/ui/core/view/index.android.ts b/packages/core/ui/core/view/index.android.ts
index 9f3f10a38c..9b84140656 100644
--- a/packages/core/ui/core/view/index.android.ts
+++ b/packages/core/ui/core/view/index.android.ts
@@ -1,13 +1,13 @@
-// Definitions.
-import type { Point, CustomLayoutView as CustomLayoutViewDefinition, Position } from '.';
+import type { Point, Position } from './view-interfaces';
 import type { GestureTypes, GestureEventData } from '../../gestures';
 
 import { ViewCommon, isEnabledProperty, originXProperty, originYProperty, isUserInteractionEnabledProperty, testIDProperty, AndroidHelper } from './view-common';
-import { paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, Length } from '../../styling/style-properties';
+import { paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty } from '../../styling/style-properties';
+import { Length } from '../../styling/length-shared';
 import { layout } from '../../../utils';
 import { Trace } from '../../../trace';
 import { ShowModalOptions, hiddenProperty } from '../view-base';
-import { isCssWideKeyword } from '../properties';
+import { isCssWideKeyword } from '../properties/property-shared';
 import { EventData } from '../../../data/observable';
 
 import { perspectiveProperty, visibilityProperty, opacityProperty, horizontalAlignmentProperty, verticalAlignmentProperty, minWidthProperty, minHeightProperty, widthProperty, heightProperty, marginLeftProperty, marginTopProperty, marginRightProperty, marginBottomProperty, rotateProperty, rotateXProperty, rotateYProperty, scaleXProperty, scaleYProperty, translateXProperty, translateYProperty, zIndexProperty, backgroundInternalProperty, androidElevationProperty, androidDynamicElevationOffsetProperty } from '../../styling/style-properties';
@@ -17,9 +17,11 @@ import { Background, BackgroundClearFlags, refreshBorderDrawable } from '../../s
 import { profile } from '../../../profiling';
 import { topmost } from '../../frame/frame-stack';
 import { Screen } from '../../../platform';
-import { AndroidActivityBackPressedEventData, Application } from '../../../application';
+import { AndroidActivityBackPressedEventData } from '../../../application/application-interfaces';
+import { isAppInBackground, updateA11yPropertiesCallback } from '../../../application/helpers-common';
+import { updateContentDescription } from '../../../application/helpers';
 import { accessibilityEnabledProperty, accessibilityHiddenProperty, accessibilityHintProperty, accessibilityIdentifierProperty, accessibilityLabelProperty, accessibilityLiveRegionProperty, accessibilityMediaSessionProperty, accessibilityRoleProperty, accessibilityStateProperty, accessibilityValueProperty } from '../../../accessibility/accessibility-properties';
-import { AccessibilityLiveRegion, AccessibilityRole, AndroidAccessibilityEvent, updateAccessibilityProperties, updateContentDescription, AccessibilityState } from '../../../accessibility';
+import { AccessibilityLiveRegion, AccessibilityRole, AndroidAccessibilityEvent, AccessibilityState } from '../../../accessibility';
 import * as Utils from '../../../utils';
 import { SDK_VERSION } from '../../../utils/constants';
 import { BoxShadow } from '../../styling/box-shadow';
@@ -141,7 +143,7 @@ function initializeDialogFragment() {
 			};
 
 			// Fist fire application.android global event
-			Application.android.notify(args);
+			global.NativeScriptGlobals.events.notify(args);
 			if (args.cancel) {
 				return;
 			}
@@ -681,7 +683,7 @@ export class View extends ViewCommon {
 		// if the app is in background while triggering _showNativeModalView
 		// then DialogFragment.show will trigger IllegalStateException: Can not perform this action after onSaveInstanceState
 		// so if in background we create an event to call _showNativeModalView when loaded (going back in foreground)
-		if (Application.inBackground && !parent.isLoaded) {
+		if (isAppInBackground() && !parent.isLoaded) {
 			const onLoaded = () => {
 				parent.off('loaded', onLoaded);
 				this._showNativeModalView(parent, options);
@@ -826,16 +828,17 @@ export class View extends ViewCommon {
 	[accessibilityEnabledProperty.setNative](value: boolean): void {
 		this.nativeViewProtected.setFocusable(!!value);
 
-		updateAccessibilityProperties(this);
+		updateA11yPropertiesCallback(this);
 	}
 
 	[accessibilityIdentifierProperty.setNative](value: string): void {
 		this.setAccessibilityIdentifier(this.nativeViewProtected, value);
 	}
 
+	// @ts-expect-error
 	[accessibilityRoleProperty.setNative](value: AccessibilityRole): void {
 		this.accessibilityRole = value;
-		updateAccessibilityProperties(this);
+		updateA11yPropertiesCallback(this);
 
 		if (SDK_VERSION >= 28) {
 			this.nativeViewProtected?.setAccessibilityHeading(value === AccessibilityRole.Header);
@@ -865,6 +868,7 @@ export class View extends ViewCommon {
 		}
 	}
 
+	// @ts-expect-error
 	[accessibilityLiveRegionProperty.setNative](value: AccessibilityLiveRegion): void {
 		switch (value) {
 			case AccessibilityLiveRegion.Assertive: {
@@ -882,13 +886,14 @@ export class View extends ViewCommon {
 		}
 	}
 
+	// @ts-expect-error
 	[accessibilityStateProperty.setNative](value: AccessibilityState): void {
 		this.accessibilityState = value;
-		updateAccessibilityProperties(this);
+		updateA11yPropertiesCallback(this);
 	}
 
 	[accessibilityMediaSessionProperty.setNative](): void {
-		updateAccessibilityProperties(this);
+		updateA11yPropertiesCallback(this);
 	}
 
 	[androidElevationProperty.getDefault](): number {
@@ -974,6 +979,7 @@ export class View extends ViewCommon {
 	[horizontalAlignmentProperty.getDefault](): CoreTypes.HorizontalAlignmentType {
 		return <CoreTypes.HorizontalAlignmentType>org.nativescript.widgets.ViewHelper.getHorizontalAlignment(this.nativeViewProtected);
 	}
+	// @ts-expect-error
 	[horizontalAlignmentProperty.setNative](value: CoreTypes.HorizontalAlignmentType) {
 		const nativeView = this.nativeViewProtected;
 		const lp: any = nativeView.getLayoutParams() || new org.nativescript.widgets.CommonLayoutParams();
@@ -1014,6 +1020,7 @@ export class View extends ViewCommon {
 	[verticalAlignmentProperty.getDefault](): CoreTypes.VerticalAlignmentType {
 		return <CoreTypes.VerticalAlignmentType>org.nativescript.widgets.ViewHelper.getVerticalAlignment(this.nativeViewProtected);
 	}
+	// @ts-expect-error
 	[verticalAlignmentProperty.setNative](value: CoreTypes.VerticalAlignmentType) {
 		const nativeView = this.nativeViewProtected;
 		const lp: any = nativeView.getLayoutParams() || new org.nativescript.widgets.CommonLayoutParams();
@@ -1271,7 +1278,7 @@ export class ContainerView extends View {
 	public iosOverflowSafeArea: boolean;
 }
 
-export class CustomLayoutView extends ContainerView implements CustomLayoutViewDefinition {
+export class CustomLayoutView extends ContainerView {
 	nativeViewProtected: android.view.ViewGroup;
 
 	public createNativeView() {
@@ -1370,15 +1377,15 @@ function createNativePercentLengthProperty(options: NativePercentLengthPropertyO
 				setPixels(this.nativeViewProtected, auto);
 			} else if (typeof length === 'number') {
 				setPixels(this.nativeViewProtected, layout.round(layout.toDevicePixels(length)));
-			} else if (length.unit == 'dip') {
+			} else if ((length as CoreTypes.LengthDipUnit).unit == 'dip') {
 				// tslint:disable-line
-				setPixels(this.nativeViewProtected, layout.round(layout.toDevicePixels(length.value)));
-			} else if (length.unit == 'px') {
+				setPixels(this.nativeViewProtected, layout.round(layout.toDevicePixels((length as CoreTypes.LengthDipUnit).value)));
+			} else if ((length as CoreTypes.LengthPxUnit).unit == 'px') {
 				// tslint:disable-line
-				setPixels(this.nativeViewProtected, layout.round(length.value));
-			} else if (length.unit == '%') {
+				setPixels(this.nativeViewProtected, layout.round((length as CoreTypes.LengthPxUnit).value));
+			} else if ((length as CoreTypes.LengthPercentUnit).unit == '%') {
 				// tslint:disable-line
-				setPercent(this.nativeViewProtected, length.value);
+				setPercent(this.nativeViewProtected, (length as CoreTypes.LengthPercentUnit).value);
 			} else {
 				throw new Error(`Unsupported PercentLength ${length}`);
 			}
diff --git a/packages/core/ui/core/view/index.d.ts b/packages/core/ui/core/view/index.d.ts
index 7186aaeb6b..b79cd796bf 100644
--- a/packages/core/ui/core/view/index.d.ts
+++ b/packages/core/ui/core/view/index.d.ts
@@ -9,6 +9,7 @@ import { LinearGradient } from '../../styling/linear-gradient';
 import { InheritedProperty, Property } from '../properties';
 import { ViewBase } from '../view-base';
 import { ViewCommon } from './view-common';
+import type { Point } from './view-interfaces';
 
 export * from './view-common';
 // helpers (these are okay re-exported here)
@@ -43,67 +44,6 @@ export function CSSType(type: string): ClassDecorator;
  */
 export function viewMatchesModuleContext(view: View, context: ModuleContext, type: ModuleType[]): boolean;
 
-/**
- * The Point interface describes a two dimensional location.
- * It has two properties x and y, representing the x and y coordinate of the location.
- */
-export interface Point {
-	/**
-	 * Represents the x coordinate of the location.
-	 */
-	x: number;
-
-	/**
-	 * Represents the y coordinate of the location.
-	 */
-	y: number;
-
-	/**
-	 * Represents the z coordinate of the location.
-	 */
-	z?: number;
-}
-
-export interface Position {
-	top: number;
-	right: number;
-	bottom: number;
-	left: number;
-}
-
-/**
- * The Size interface describes abstract dimensions in two dimensional space.
- * It has two properties width and height, representing the width and height values of the size.
- */
-export interface Size {
-	/**
-	 * Represents the width of the size.
-	 */
-	width: number;
-
-	/**
-	 * Represents the height of the size.
-	 */
-	height: number;
-}
-
-/**
- * Defines the data for the shownModally event.
- */
-export interface ShownModallyData extends EventData {
-	/**
-	 * The context (optional, may be undefined) passed to the view when shown modally.
-	 */
-	context?: any;
-
-	/**
-	 * A callback to call when you want to close the modally shown view.
-	 * Pass in any kind of arguments and you will receive when the callback parameter
-	 * of View.showModal is executed.
-	 */
-	closeCallback?: Function;
-}
-
 /**
  * This class is the base class for all UI components.
  * A View occupies a rectangular area on the screen and is responsible for drawing and layouting of all UI components within.
diff --git a/packages/core/ui/core/view/index.ios.ts b/packages/core/ui/core/view/index.ios.ts
index 39d3d2f485..eb2f484ea0 100644
--- a/packages/core/ui/core/view/index.ios.ts
+++ b/packages/core/ui/core/view/index.ios.ts
@@ -1,8 +1,7 @@
-// Types.
-import { Point, Position, View as ViewDefinition } from '.';
-
-// Requires
+import type { Point, Position } from './view-interfaces';
 import { ViewCommon, isEnabledProperty, originXProperty, originYProperty, isUserInteractionEnabledProperty, testIDProperty } from './view-common';
+import { isAccessibilityServiceEnabled } from '../../../application';
+import { updateA11yPropertiesCallback } from '../../../application/helpers-common';
 import { ShowModalOptions, hiddenProperty } from '../view-base';
 import { Trace } from '../../../trace';
 import { layout, ios as iosUtils, SDK_VERSION } from '../../../utils';
@@ -11,14 +10,13 @@ import { ios as iosBackground, Background } from '../../styling/background';
 import { perspectiveProperty, visibilityProperty, opacityProperty, rotateProperty, rotateXProperty, rotateYProperty, scaleXProperty, scaleYProperty, translateXProperty, translateYProperty, zIndexProperty, backgroundInternalProperty } from '../../styling/style-properties';
 import { profile } from '../../../profiling';
 import { accessibilityEnabledProperty, accessibilityHiddenProperty, accessibilityHintProperty, accessibilityIdentifierProperty, accessibilityLabelProperty, accessibilityLanguageProperty, accessibilityLiveRegionProperty, accessibilityMediaSessionProperty, accessibilityRoleProperty, accessibilityStateProperty, accessibilityValueProperty, accessibilityIgnoresInvertColorsProperty } from '../../../accessibility/accessibility-properties';
-import { IOSPostAccessibilityNotificationType, isAccessibilityServiceEnabled, updateAccessibilityProperties, AccessibilityEventOptions, AccessibilityRole, AccessibilityState } from '../../../accessibility';
+import { IOSPostAccessibilityNotificationType, AccessibilityEventOptions, AccessibilityRole, AccessibilityState } from '../../../accessibility';
 import { CoreTypes } from '../../../core-types';
 import type { ModalTransition } from '../../transition/modal-transition';
 import { SharedTransition } from '../../transition/shared-transition';
 import { NativeScriptUIView } from '../../utils';
 
 export * from './view-common';
-// helpers (these are okay re-exported here)
 export * from './view-helper';
 // This one can eventually be cleaned up but causes issues with a lot of ui-suite plugins in particular if not exported here
 export * from '../properties';
@@ -27,7 +25,7 @@ const PFLAG_FORCE_LAYOUT = 1;
 const PFLAG_MEASURED_DIMENSION_SET = 1 << 1;
 const PFLAG_LAYOUT_REQUIRED = 1 << 2;
 
-export class View extends ViewCommon implements ViewDefinition {
+export class View extends ViewCommon {
 	// @ts-ignore
 	nativeViewProtected: UIView;
 	// @ts-ignore
@@ -375,7 +373,7 @@ export class View extends ViewCommon implements ViewDefinition {
 		};
 	}
 
-	public getLocationRelativeTo(otherView: ViewDefinition): Point {
+	public getLocationRelativeTo(otherView: View): Point {
 		if (!this.nativeViewProtected || !this.nativeViewProtected.window || !otherView.nativeViewProtected || !otherView.nativeViewProtected.window || this.nativeViewProtected.window !== otherView.nativeViewProtected.window) {
 			return undefined;
 		}
@@ -693,7 +691,7 @@ export class View extends ViewCommon implements ViewDefinition {
 	[accessibilityEnabledProperty.setNative](value: boolean): void {
 		this.nativeViewProtected.isAccessibilityElement = !!value;
 
-		updateAccessibilityProperties(this);
+		updateA11yPropertiesCallback(this);
 	}
 
 	[accessibilityIdentifierProperty.getDefault](): string {
@@ -706,7 +704,7 @@ export class View extends ViewCommon implements ViewDefinition {
 
 	[accessibilityRoleProperty.setNative](value: AccessibilityRole): void {
 		this.accessibilityRole = value;
-		updateAccessibilityProperties(this);
+		updateA11yPropertiesCallback(this);
 	}
 
 	[accessibilityValueProperty.setNative](value: string): void {
@@ -741,20 +739,20 @@ export class View extends ViewCommon implements ViewDefinition {
 	[accessibilityHiddenProperty.setNative](value: boolean): void {
 		this.nativeViewProtected.accessibilityElementsHidden = !!value;
 
-		updateAccessibilityProperties(this);
+		updateA11yPropertiesCallback(this);
 	}
 
 	[accessibilityLiveRegionProperty.setNative](): void {
-		updateAccessibilityProperties(this);
+		updateA11yPropertiesCallback(this);
 	}
 
 	[accessibilityStateProperty.setNative](value: AccessibilityState): void {
 		this.accessibilityState = value;
-		updateAccessibilityProperties(this);
+		updateA11yPropertiesCallback(this);
 	}
 
 	[accessibilityMediaSessionProperty.setNative](): void {
-		updateAccessibilityProperties(this);
+		updateA11yPropertiesCallback(this);
 	}
 
 	[isUserInteractionEnabledProperty.getDefault](): boolean {
diff --git a/packages/core/ui/core/view/view-common.ts b/packages/core/ui/core/view/view-common.ts
index 1bb2b50fe5..b729208102 100644
--- a/packages/core/ui/core/view/view-common.ts
+++ b/packages/core/ui/core/view/view-common.ts
@@ -1,6 +1,5 @@
-// Definitions.
-import { View as ViewDefinition, Point, Size, ShownModallyData, Position } from '.';
-
+import type { View as ViewType } from '.';
+import { Point, Size, ShownModallyData, Position } from './view-interfaces';
 import { booleanConverter, ShowModalOptions, ViewBase } from '../view-base';
 import { getEventOrGestureName } from '../bindable';
 import { layout } from '../../../utils';
@@ -9,45 +8,39 @@ import { sanitizeModuleName } from '../../../utils/common';
 import { Color } from '../../../color';
 import { Property, InheritedProperty } from '../properties';
 import { EventData } from '../../../data/observable';
-import { Trace } from '../../../trace';
-import { CoreTypes } from '../../../core-types';
 import { ViewHelper } from './view-helper';
-import { setupAccessibleView } from '../../../accessibility';
+import { setupAccessibleView } from '../../../application/helpers';
 
-import { PercentLength } from '../../styling/style-properties';
+import { PercentLength } from '../../styling/length-shared';
 
-import { observe as gestureObserve, GesturesObserver, GestureTypes, GestureEventData, fromString as gestureFromString, toString as gestureToString, TouchManager, TouchAnimationOptions, VisionHoverOptions } from '../../gestures';
+import { observe as gestureObserve, GesturesObserver, GestureTypes, fromString as gestureFromString, toString as gestureToString, TouchManager, TouchAnimationOptions, VisionHoverOptions } from '../../gestures';
+import type { GestureEventData } from '../../gestures/gestures-types';
 
 import { CSSUtils } from '../../../css/system-classes';
 import { Builder } from '../../builder';
 import { StyleScope } from '../../styling/style-scope';
 import { LinearGradient } from '../../styling/linear-gradient';
 
-import * as am from '../../animation';
-import { AccessibilityEventOptions, AccessibilityLiveRegion, AccessibilityRole, AccessibilityState } from '../../../accessibility/accessibility-types';
+import { Animation } from '../../animation';
+import type { AnimationPromise } from '../../animation/animation-types';
+import { AccessibilityEventOptions, AccessibilityLiveRegion, AccessibilityRole, AccessibilityState, getFontScale } from '../../../accessibility';
 import { accessibilityHintProperty, accessibilityIdentifierProperty, accessibilityLabelProperty, accessibilityValueProperty, accessibilityIgnoresInvertColorsProperty } from '../../../accessibility/accessibility-properties';
-import { accessibilityBlurEvent, accessibilityFocusChangedEvent, accessibilityFocusEvent, accessibilityPerformEscapeEvent, getCurrentFontScale } from '../../../accessibility';
+import { accessibilityBlurEvent, accessibilityFocusChangedEvent, accessibilityFocusEvent, accessibilityPerformEscapeEvent } from '../../../accessibility';
 import { ShadowCSSValues } from '../../styling/css-shadow';
 import { SharedTransition, SharedTransitionInteractiveOptions } from '../../transition/shared-transition';
 import { Flex, FlexFlow } from '../../layouts/flexbox-layout';
+import { CoreTypes, Trace } from '../../styling/styling-shared';
 
 // helpers (these are okay re-exported here)
 export * from './view-helper';
 
-let animationModule: typeof am;
-function ensureAnimationModule() {
-	if (!animationModule) {
-		animationModule = require('../../animation');
-	}
-}
-
 export function CSSType(type: string): ClassDecorator {
 	return (cls) => {
 		cls.prototype.cssType = type;
 	};
 }
 
-export function viewMatchesModuleContext(view: ViewDefinition, context: ModuleContext, types: ModuleType[]): boolean {
+export function viewMatchesModuleContext(view: ViewCommon, context: ModuleContext, types: ModuleType[]): boolean {
 	return context && view._moduleName && context.type && types.some((type) => type === context.type) && context.path && context.path.includes(view._moduleName);
 }
 
@@ -78,7 +71,7 @@ type InteractiveTransitionState = { began?: boolean; cancelled?: boolean; option
 // TODO: remove once we fully switch to the new event system
 const warnedEvent = new Set<string>();
 
-export abstract class ViewCommon extends ViewBase implements ViewDefinition {
+export abstract class ViewCommon extends ViewBase {
 	public static layoutChangedEvent = 'layoutChanged';
 	public static shownModallyEvent = 'shownModally';
 	public static showingModallyEvent = 'showingModally';
@@ -107,7 +100,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 
 	protected _closeModalCallback: Function;
 	public _manager: any;
-	public _modalParent: ViewCommon;
+	public _modalParent?: ViewCommon;
 	private _modalContext: any;
 	private _modal: ViewCommon;
 
@@ -122,7 +115,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 	protected _isLayoutValid: boolean;
 	private _cssType: string;
 
-	private _localAnimations: Set<am.Animation>;
+	private _localAnimations: Set<Animation>;
 
 	_currentWidthMeasureSpec: number;
 	_currentHeightMeasureSpec: number;
@@ -404,7 +397,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 		}
 	}
 
-	public showModal(...args): ViewDefinition {
+	public showModal(...args): ViewType {
 		const { view, options } = this.getModalOptions(args);
 		if (options.transition?.instance) {
 			SharedTransition.updateState(options.transition?.instance.id, {
@@ -441,7 +434,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 		modalRootViewCssClasses.forEach((c) => this.cssClasses.add(c));
 
 		parent._modal = this;
-		this.style.fontScaleInternal = getCurrentFontScale();
+		this.style.fontScaleInternal = getFontScale();
 		this._modalParent = parent;
 		this._modalContext = options.context;
 		this._closeModalCallback = (...originalArgs) => {
@@ -1055,7 +1048,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 		return ViewHelper.combineMeasuredStates(curState, newState);
 	}
 
-	public static layoutChild(parent: ViewDefinition, child: ViewDefinition, left: number, top: number, right: number, bottom: number, setFrame = true): void {
+	public static layoutChild(parent: ViewCommon, child: ViewCommon, left: number, top: number, right: number, bottom: number, setFrame = true): void {
 		ViewHelper.layoutChild(parent, child, left, top, right, bottom);
 	}
 
@@ -1094,7 +1087,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 		this.eachChildView(<any>callback);
 	}
 
-	public eachChildView(callback: (view: ViewDefinition) => boolean) {
+	public eachChildView(callback: (view: ViewCommon) => boolean) {
 		//
 	}
 
@@ -1122,7 +1115,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 		return undefined;
 	}
 
-	public getLocationRelativeTo(otherView: ViewDefinition): Point {
+	public getLocationRelativeTo(otherView: ViewCommon): Point {
 		return undefined;
 	}
 
@@ -1138,23 +1131,25 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 		};
 	}
 
-	public animate(animation: any): am.AnimationPromise {
-		return this.createAnimation(animation).play();
+	public animate(animation: any): AnimationPromise {
+		const animationInstance = this.createAnimation(animation);
+		const promise = animationInstance.play();
+		(promise as AnimationPromise).cancel = () => animationInstance.cancel();
+		return promise as AnimationPromise;
 	}
 
-	public createAnimation(animation: any): am.Animation {
-		ensureAnimationModule();
+	public createAnimation(animation: any): Animation {
 		if (!this._localAnimations) {
 			this._localAnimations = new Set();
 		}
 		animation.target = this;
-		const anim = new animationModule.Animation([animation]);
+		const anim = new Animation([animation]);
 		this._localAnimations.add(anim);
 
 		return anim;
 	}
 
-	public _removeAnimation(animation: am.Animation): boolean {
+	public _removeAnimation(animation: Animation): boolean {
 		const localAnimations = this._localAnimations;
 		if (localAnimations && localAnimations.has(animation)) {
 			localAnimations.delete(animation);
@@ -1227,11 +1222,11 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 		//
 	}
 
-	_hasAncestorView(ancestorView: ViewDefinition): boolean {
-		const matcher = (view: ViewDefinition) => view === ancestorView;
+	_hasAncestorView(ancestorView: ViewCommon): boolean {
+		const matcher = (view: ViewCommon) => view === ancestorView;
 
 		for (let parent = this.parent; parent != null; parent = parent.parent) {
-			if (matcher(<ViewDefinition>parent)) {
+			if (matcher(<ViewCommon>parent)) {
 				return true;
 			}
 		}
diff --git a/packages/core/ui/core/view/view-helper/index.ios.ts b/packages/core/ui/core/view/view-helper/index.ios.ts
index 90648d1d39..ffb5edb5ed 100644
--- a/packages/core/ui/core/view/view-helper/index.ios.ts
+++ b/packages/core/ui/core/view/view-helper/index.ios.ts
@@ -1,11 +1,12 @@
 // Types
-import { Position, View } from '..';
+import { Position } from '../view-interfaces';
+import type { View } from '..';
 
 // Requires
 import { ViewHelper } from './view-helper-common';
 import { SDK_VERSION } from '../../../../utils/constants';
-import { ios as iOSUtils, layout } from '../../../../utils';
-import { Trace } from '../../../../trace';
+import { layout, Trace } from './view-helper-shared';
+import { ios as iOSUtils } from '../../../../utils';
 
 export * from './view-helper-common';
 export const AndroidHelper = 0;
@@ -41,7 +42,7 @@ class UILayoutViewController extends UIViewController {
 		super.viewDidLayoutSubviews();
 		const owner = this.owner?.deref();
 		if (owner) {
-			if (iOSUtils.MajorVersion >= 11) {
+			if (SDK_VERSION >= 11) {
 				// Handle nested UILayoutViewController safe area application.
 				// Currently, UILayoutViewController can be nested only in a TabView.
 				// The TabView itself is handled by the OS, so we check the TabView's parent (usually a Page, but can be a Layout).
@@ -116,7 +117,7 @@ class UILayoutViewController extends UIViewController {
 	public traitCollectionDidChange(previousTraitCollection: UITraitCollection): void {
 		super.traitCollectionDidChange(previousTraitCollection);
 
-		if (iOSUtils.MajorVersion >= 13) {
+		if (SDK_VERSION >= 13) {
 			const owner = this.owner?.deref();
 			if (owner && this.traitCollection.hasDifferentColorAppearanceComparedToTraitCollection && this.traitCollection.hasDifferentColorAppearanceComparedToTraitCollection(previousTraitCollection)) {
 				owner.notify({
diff --git a/packages/core/ui/core/view/view-helper/view-helper-common.ts b/packages/core/ui/core/view/view-helper/view-helper-common.ts
index 14b638f7df..54a01e4f16 100644
--- a/packages/core/ui/core/view/view-helper/view-helper-common.ts
+++ b/packages/core/ui/core/view/view-helper/view-helper-common.ts
@@ -1,10 +1,6 @@
 // Types
 import { View as ViewDefinition } from '..';
-import { CoreTypes } from '../../../../core-types';
-
-// Requires
-import { layout } from '../../../../utils';
-import { Trace } from '../../../../trace';
+import { CoreTypes, layout, Trace } from './view-helper-shared';
 
 export class ViewHelper {
 	public static measureChild(parent: ViewDefinition, child: ViewDefinition, widthMeasureSpec: number, heightMeasureSpec: number): { measuredWidth: number; measuredHeight: number } {
diff --git a/packages/core/ui/core/view/view-helper/view-helper-shared.ts b/packages/core/ui/core/view/view-helper/view-helper-shared.ts
new file mode 100644
index 0000000000..1bcb1031c0
--- /dev/null
+++ b/packages/core/ui/core/view/view-helper/view-helper-shared.ts
@@ -0,0 +1,9 @@
+// Shared helpers and types for view-helper, used by both common and platform-specific files.
+// Only put platform-agnostic logic here.
+
+import { CoreTypes } from '../../../../core-types';
+import { layout } from '../../../../utils';
+import { Trace } from '../../../../trace';
+
+export type { CoreTypes };
+export { layout, Trace };
diff --git a/packages/core/ui/core/view/view-interfaces.ts b/packages/core/ui/core/view/view-interfaces.ts
new file mode 100644
index 0000000000..1e471f1a9c
--- /dev/null
+++ b/packages/core/ui/core/view/view-interfaces.ts
@@ -0,0 +1,61 @@
+import type { EventData } from '../../../data/observable';
+/**
+ * Defines the data for the shownModally event.
+ */
+export interface ShownModallyData extends EventData {
+	/**
+	 * The context (optional, may be undefined) passed to the view when shown modally.
+	 */
+	context?: any;
+
+	/**
+	 * A callback to call when you want to close the modally shown view.
+	 * Pass in any kind of arguments and you will receive when the callback parameter
+	 * of View.showModal is executed.
+	 */
+	closeCallback?: Function;
+}
+
+/**
+ * The Point interface describes a two dimensional location.
+ * It has two properties x and y, representing the x and y coordinate of the location.
+ */
+export interface Point {
+	/**
+	 * Represents the x coordinate of the location.
+	 */
+	x: number;
+
+	/**
+	 * Represents the y coordinate of the location.
+	 */
+	y: number;
+
+	/**
+	 * Represents the z coordinate of the location.
+	 */
+	z?: number;
+}
+
+export interface Position {
+	top: number;
+	right: number;
+	bottom: number;
+	left: number;
+}
+
+/**
+ * The Size interface describes abstract dimensions in two dimensional space.
+ * It has two properties width and height, representing the width and height values of the size.
+ */
+export interface Size {
+	/**
+	 * Represents the width of the size.
+	 */
+	width: number;
+
+	/**
+	 * Represents the height of the size.
+	 */
+	height: number;
+}
diff --git a/packages/core/ui/dialogs/index.ios.ts b/packages/core/ui/dialogs/index.ios.ts
index 3127803d65..d7a5c6e045 100644
--- a/packages/core/ui/dialogs/index.ios.ts
+++ b/packages/core/ui/dialogs/index.ios.ts
@@ -4,7 +4,7 @@
 import { Trace } from '../../trace';
 import { ConfirmOptions, PromptOptions, PromptResult, LoginOptions, LoginResult, ActionOptions, getCurrentPage, getLabelColor, getButtonColors, getTextFieldColor, isDialogOptions, inputType, capitalizationType, DialogStrings, parseLoginOptions } from './dialogs-common';
 import { isString, isDefined, isFunction } from '../../utils/types';
-import { Application } from '../../application';
+import { getiOSWindow } from '../../application/helpers-common';
 
 export * from './dialogs-common';
 
@@ -17,7 +17,7 @@ function addButtonsToAlertController(alertController: UIAlertController, options
 		alertController.addAction(
 			UIAlertAction.actionWithTitleStyleHandler(options.cancelButtonText, UIAlertActionStyle.Default, () => {
 				raiseCallback(callback, false);
-			})
+			}),
 		);
 	}
 
@@ -25,7 +25,7 @@ function addButtonsToAlertController(alertController: UIAlertController, options
 		alertController.addAction(
 			UIAlertAction.actionWithTitleStyleHandler(options.neutralButtonText, UIAlertActionStyle.Default, () => {
 				raiseCallback(callback, undefined);
-			})
+			}),
 		);
 	}
 
@@ -33,7 +33,7 @@ function addButtonsToAlertController(alertController: UIAlertController, options
 		alertController.addAction(
 			UIAlertAction.actionWithTitleStyleHandler(options.okButtonText, UIAlertActionStyle.Default, () => {
 				raiseCallback(callback, true);
-			})
+			}),
 		);
 	}
 }
@@ -45,7 +45,7 @@ function raiseCallback(callback, result) {
 }
 
 function showUIAlertController(alertController: UIAlertController) {
-	let viewController = Application.ios.rootController;
+	let viewController = getiOSWindow()?.rootViewController;
 
 	while (viewController && viewController.presentedViewController && !viewController.presentedViewController.beingDismissed) {
 		viewController = viewController.presentedViewController;
@@ -91,7 +91,7 @@ export function alert(arg: any): Promise<void> {
 						title: DialogStrings.ALERT,
 						okButtonText: DialogStrings.OK,
 						message: arg + '',
-				  }
+					}
 				: arg;
 			const alertController = UIAlertController.alertControllerWithTitleMessagePreferredStyle(options.title, options.message, UIAlertControllerStyle.Alert);
 
@@ -115,7 +115,7 @@ export function confirm(arg: any): Promise<boolean> {
 						okButtonText: DialogStrings.OK,
 						cancelButtonText: DialogStrings.CANCEL,
 						message: arg + '',
-				  }
+					}
 				: arg;
 			const alertController = UIAlertController.alertControllerWithTitleMessagePreferredStyle(options.title, options.message, UIAlertControllerStyle.Alert);
 
@@ -301,7 +301,7 @@ export function action(...args): Promise<string> {
 						alertController.addAction(
 							UIAlertAction.actionWithTitleStyleHandler(action, dialogType, (arg: UIAlertAction) => {
 								resolve(arg.title);
-							})
+							}),
 						);
 					}
 				}
@@ -311,7 +311,7 @@ export function action(...args): Promise<string> {
 				alertController.addAction(
 					UIAlertAction.actionWithTitleStyleHandler(options.cancelButtonText, UIAlertActionStyle.Cancel, (arg: UIAlertAction) => {
 						resolve(arg.title);
-					})
+					}),
 				);
 			}
 
diff --git a/packages/core/ui/frame/callbacks/fragment-callbacks.ts b/packages/core/ui/frame/callbacks/fragment-callbacks.ts
index 5119545776..d55296c258 100644
--- a/packages/core/ui/frame/callbacks/fragment-callbacks.ts
+++ b/packages/core/ui/frame/callbacks/fragment-callbacks.ts
@@ -1,7 +1,7 @@
 import { profile } from '../../../profiling';
 import { AndroidFragmentCallbacks, BackstackEntry, Frame, getFrameByNumberId } from '..';
 import { Trace } from '../../../trace';
-import { Application } from '../../../application';
+import { getNativeApp } from '../../../application/helpers-common';
 import { Color } from '../../../color';
 import { _updateTransitions } from '../fragment.transitions';
 import { Page } from '../../page';
@@ -159,7 +159,7 @@ export class FragmentCallbacksImplementation implements AndroidFragmentCallbacks
 			if (hasRemovingParent) {
 				const nativeFrameView = this.frame.nativeViewProtected;
 				if (nativeFrameView) {
-					const bitmapDrawable = new android.graphics.drawable.BitmapDrawable(Application.android.context.getResources(), this.backgroundBitmap);
+					const bitmapDrawable = new android.graphics.drawable.BitmapDrawable((getNativeApp() as android.app.Application).getApplicationContext().getResources(), this.backgroundBitmap);
 					this.frame._originalBackground = this.frame.backgroundColor || new Color('White');
 					nativeFrameView.setBackgroundDrawable(bitmapDrawable);
 					this.backgroundBitmap = null;
diff --git a/packages/core/ui/frame/frame-common.ts b/packages/core/ui/frame/frame-common.ts
index 3a42c2979d..36e48f3a23 100644
--- a/packages/core/ui/frame/frame-common.ts
+++ b/packages/core/ui/frame/frame-common.ts
@@ -685,7 +685,7 @@ export class FrameBase extends CustomLayoutView {
 		}
 
 		// Handle markup/script changes in currentPage
-		if (this.currentPage && viewMatchesModuleContext(this.currentPage, context, ['markup', 'script'])) {
+		if (this.currentPage && viewMatchesModuleContext(this.currentPage as any, context, ['markup', 'script'])) {
 			Trace.write(`Change Handled: Replacing page ${context.path}`, Trace.categories.Livesync);
 
 			// Replace current page with a default fade transition
diff --git a/packages/core/ui/frame/index.android.ts b/packages/core/ui/frame/index.android.ts
index 1bf7569a14..e97facb562 100644
--- a/packages/core/ui/frame/index.android.ts
+++ b/packages/core/ui/frame/index.android.ts
@@ -137,7 +137,7 @@ export class Frame extends FrameBase {
 		// _onAttachedToWindow called from OS again after it was detach
 		// still happens with androidx.fragment:1.3.2
 		const activity = androidUtils.getCurrentActivity();
-		const lifecycleState = activity?.getLifecycle?.()?.getCurrentState() || androidx.lifecycle.Lifecycle.State.CREATED;
+		const lifecycleState = (activity as androidx.fragment.app.FragmentActivity)?.getLifecycle?.()?.getCurrentState() || androidx.lifecycle.Lifecycle.State.CREATED;
 		if ((this._manager && this._manager.isDestroyed()) || !lifecycleState.isAtLeast(androidx.lifecycle.Lifecycle.State.CREATED)) {
 			return;
 		}
diff --git a/packages/core/ui/frame/index.ios.ts b/packages/core/ui/frame/index.ios.ts
index 33787b214c..78411fec25 100644
--- a/packages/core/ui/frame/index.ios.ts
+++ b/packages/core/ui/frame/index.ios.ts
@@ -5,7 +5,8 @@ import { Page } from '../page';
 import { View } from '../core/view';
 import { IOSHelper } from '../core/view/view-helper';
 import { profile } from '../../profiling';
-import { CORE_ANIMATION_DEFAULTS, ios as iOSUtils, layout } from '../../utils';
+import { CORE_ANIMATION_DEFAULTS, layout } from '../../utils';
+import { SDK_VERSION } from '../../utils/constants';
 import { Trace } from '../../trace';
 import type { PageTransition } from '../transition/page-transition';
 import { SlideTransition } from '../transition/slide-transition';
@@ -14,8 +15,6 @@ import { SharedTransition } from '../transition/shared-transition';
 
 export * from './frame-common';
 
-const majorVersion = iOSUtils.MajorVersion;
-
 const ENTRY = '_entry';
 const DELEGATE = '_delegate';
 const NAV_DEPTH = '_navDepth';
@@ -144,7 +143,7 @@ export class Frame extends FrameBase {
 		backstackEntry[NAV_DEPTH] = navDepth;
 		viewController[ENTRY] = backstackEntry;
 
-		if (!animated && majorVersion > 10) {
+		if (!animated && SDK_VERSION > 10) {
 			// Reset back button title before pushing view controller to prevent
 			// displaying default 'back' title (when NavigaitonButton custom title is set).
 			const barButtonItem = UIBarButtonItem.alloc().initWithTitleStyleTargetAction('', UIBarButtonItemStyle.Plain, null, null);
@@ -633,7 +632,7 @@ class UINavigationControllerImpl extends UINavigationController {
 	public traitCollectionDidChange(previousTraitCollection: UITraitCollection): void {
 		super.traitCollectionDidChange(previousTraitCollection);
 
-		if (majorVersion >= 13) {
+		if (SDK_VERSION >= 13) {
 			const owner = this._owner?.deref?.();
 			if (owner && this.traitCollection.hasDifferentColorAppearanceComparedToTraitCollection && this.traitCollection.hasDifferentColorAppearanceComparedToTraitCollection(previousTraitCollection)) {
 				owner.notify({
diff --git a/packages/core/ui/gestures/gestures-common.ts b/packages/core/ui/gestures/gestures-common.ts
index 5572c35195..ac2cf9ce6a 100644
--- a/packages/core/ui/gestures/gestures-common.ts
+++ b/packages/core/ui/gestures/gestures-common.ts
@@ -1,304 +1,6 @@
-import type { GesturesObserver as GesturesObserverDefinition } from '.';
+import type { GesturesObserverDefinition, GestureEvents, GestureStateTypes, SwipeDirection, TouchAction, GestureEventData, TapGestureEventData, TouchGestureEventData, Pointer, GestureEventDataWithState, PinchGestureEventData, SwipeGestureEventData, PanGestureEventData, RotationGestureEventData } from './gestures-types';
+import { GestureTypes } from './gestures-types';
 import type { View } from '../core/view';
-import type { EventData } from '../../data/observable';
-
-export * from './touch-manager';
-
-/**
- * Events emitted during gesture lifecycle
- */
-export enum GestureEvents {
-	/**
-	 * When the gesture is attached to the view
-	 * Provides access to the native gesture recognizer for further customization
-	 *
-	 * @nsEvent {GestureEventData} gestureAttached
-	 */
-	gestureAttached = 'gestureAttached',
-	/**
-	 * When a touch down was detected
-	 *
-	 * @nsEvent touchDown
-	 */
-	touchDown = 'touchDown',
-	/**
-	 * When a touch up was detected
-	 *
-	 * @nsEvent touchUp
-	 */
-	touchUp = 'touchUp',
-}
-
-/**
- * Defines an enum with supported gesture types.
- */
-export enum GestureTypes {
-	/**
-	 * Denotes tap (click) gesture.
-	 *
-	 * @nsEvent {TapGestureEventData} tap
-	 */
-	tap = 1 << 0,
-	/**
-	 * Denotes double tap gesture.
-	 *
-	 * @nsEvent {TapGestureEventData} doubleTap
-	 */
-	doubleTap = 1 << 1,
-	/**
-	 * Denotes pinch gesture.
-	 *
-	 * @nsEvent {PinchGestureEventData} pinch
-	 */
-	pinch = 1 << 2,
-	/**
-	 * Denotes pan gesture.
-	 *
-	 * @nsEvent {PanGestureEventData} pan
-	 */
-	pan = 1 << 3,
-	/**
-	 * Denotes swipe gesture.
-	 *
-	 * @nsEvent {SwipeGestureEventData} swipe
-	 */
-	swipe = 1 << 4,
-	/**
-	 * Denotes rotation gesture.
-	 *
-	 * @nsEvent {RotationGestureEventData} rotate
-	 */
-	rotation = 1 << 5,
-	/**
-	 * Denotes long press gesture.
-	 *
-	 * @nsEvent {GestureEventDataWithState} longPress
-	 */
-	longPress = 1 << 6,
-	/**
-	 * Denotes touch action.
-	 *
-	 * @nsEvent {TouchGestureEventData} touch
-	 */
-	touch = 1 << 7,
-}
-
-/**
- * Defines an enum with supported gesture states.
- */
-export enum GestureStateTypes {
-	/**
-	 * Gesture canceled.
-	 */
-	cancelled,
-	/**
-	 * Gesture began.
-	 */
-	began,
-	/**
-	 * Gesture changed.
-	 */
-	changed,
-	/**
-	 * Gesture ended.
-	 */
-	ended,
-}
-
-/**
- * Defines an enum for swipe gesture direction.
- */
-export enum SwipeDirection {
-	/**
-	 * Denotes right direction for swipe gesture.
-	 */
-	right = 1 << 0,
-	/**
-	 * Denotes left direction for swipe gesture.
-	 */
-	left = 1 << 1,
-	/**
-	 * Denotes up direction for swipe gesture.
-	 */
-	up = 1 << 2,
-	/**
-	 * Denotes down direction for swipe gesture.
-	 */
-	down = 1 << 3,
-}
-
-/**
- * Defines a touch action
- */
-export enum TouchAction {
-	/**
-	 * Down action.
-	 */
-	down = 'down',
-
-	/**
-	 * Up action.
-	 */
-	up = 'up',
-
-	/**
-	 * Move action.
-	 */
-	move = 'move',
-
-	/**
-	 * Cancel action.
-	 */
-	cancel = 'cancel',
-}
-
-/**
- * Provides gesture event data.
- */
-export interface GestureEventData extends EventData {
-	/**
-	 * Gets the type of the gesture.
-	 */
-	type: GestureTypes;
-	/**
-	 * Gets the view which originates the gesture.
-	 */
-	view: View;
-	/**
-	 * Gets the underlying native iOS specific [UIGestureRecognizer](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIGestureRecognizer_Class/).
-	 */
-	ios: any /* UIGestureRecognizer */;
-	/**
-	 * Gets the underlying native android specific [gesture detector](http://developer.android.com/reference/android/view/GestureDetector.html).
-	 */
-	android: any;
-}
-
-/**
- * Provides gesture event data.
- */
-export interface TapGestureEventData extends GestureEventData {
-	/**
-	 * Gets the number of pointers in the event.
-	 */
-	getPointerCount(): number;
-	/**
-	 * Gets the X coordinate of this event inside the view that triggered the event
-	 */
-	getX(): number;
-	/**
-	 * Gets the Y coordinate of the event inside the view that triggered the event.
-	 */
-	getY(): number;
-}
-
-/**
- * Provides gesture event data.
- */
-export interface TouchGestureEventData extends TapGestureEventData {
-	/**
-	 * Gets action of the touch. Possible values: 'up', 'move', 'down', 'cancel'
-	 */
-	action: 'up' | 'move' | 'down' | 'cancel';
-	/**
-	 * Gets the pointers that triggered the event.
-	 * Note: In Android there is aways only one active pointer.
-	 */
-	getActivePointers(): Array<Pointer>;
-
-	/**
-	 * Gets all pointers.
-	 */
-	getAllPointers(): Array<Pointer>;
-}
-
-/**
- * Pointer is an object representing a finger (or other object) that is touching the screen.
- */
-export interface Pointer {
-	/**
-	 * The id of the pointer.
-	 */
-	android: any;
-
-	/**
-	 * The UITouch object associated to the touch
-	 */
-	ios: any;
-
-	/**
-	 * Gets the X coordinate of the pointer inside the view that triggered the event.
-	 */
-	getX(): number;
-
-	/**
-	 * Gets the Y coordinate of the pointer inside the view that triggered the event.
-	 */
-	getY(): number;
-
-	/**
-	 * Gests the X coordinate of the pointer inside the view that triggered the event.
-	 * @returns The X coordinate in _Device Pixels_.
-	 */
-	getXPixels(): number;
-
-	/**
-	 * Gets the X coordinate of the pointer inside the view that triggered the event.
-	 * @returns The X coordinate in _Device Independent Pixels_.
-	 */
-	getXDIP(): number;
-
-	/**
-	 * Gests the Y coordinate of the pointer inside the view that triggered the event.
-	 * @returns The Y coordinate in _Device Pixels_.
-	 */
-	getYPixels(): number;
-
-	/**
-	 * Gets the Y coordinate of the pointer inside the view that triggered the event.
-	 * @returns The Y coordinate in _Device Independent Pixels_.
-	 */
-	getYDIP(): number;
-}
-
-/**
- * Provides gesture event data.
- */
-export interface GestureEventDataWithState extends GestureEventData {
-	state: number;
-}
-
-/**
- * Provides gesture event data for pinch gesture.
- */
-export interface PinchGestureEventData extends GestureEventDataWithState {
-	scale: number;
-
-	getFocusX(): number;
-	getFocusY(): number;
-}
-
-/**
- * Provides gesture event data for swipe gesture.
- */
-export interface SwipeGestureEventData extends GestureEventData {
-	direction: SwipeDirection;
-}
-
-/**
- * Provides gesture event data for pan gesture.
- */
-export interface PanGestureEventData extends GestureEventDataWithState {
-	deltaX: number;
-	deltaY: number;
-}
-
-/**
- * Provides gesture event data for rotation gesture.
- */
-export interface RotationGestureEventData extends GestureEventDataWithState {
-	rotation: number;
-}
 
 /**
  * Returns a string representation of a gesture type.
@@ -399,3 +101,7 @@ export abstract class GesturesObserverBase implements GesturesObserverDefinition
 		this._context = null;
 	}
 }
+
+export { GesturesObserverBase as GesturesObserver };
+
+export { TouchAction, GestureStateTypes, GestureTypes, SwipeDirection, GestureEvents } from './gestures-types';
diff --git a/packages/core/ui/gestures/gestures-types.ts b/packages/core/ui/gestures/gestures-types.ts
new file mode 100644
index 0000000000..13e249d16d
--- /dev/null
+++ b/packages/core/ui/gestures/gestures-types.ts
@@ -0,0 +1,130 @@
+// Shared types/interfaces for gestures
+import type { View } from '../core/view';
+import type { EventData } from '../../data/observable';
+
+export interface GesturesObserverDefinition {
+	/**
+	 * Registers a gesture observer to a view and gesture.
+	 * @param type - Type of the gesture.
+	 */
+	observe(type: any): void;
+
+	/**
+	 * Disconnects the gesture observer.
+	 */
+	disconnect(): void;
+
+	/**
+	 * Singular gesture type (e.g. GestureTypes.tap) attached to the observer.
+	 * Does not support plural gesture types (e.g.
+	 * GestureTypes.tap & GestureTypes.doubleTap).
+	 */
+	type: any;
+
+	/**
+	 * A function that will be executed when a gesture is received.
+	 */
+	callback: (args: any) => void;
+
+	/**
+	 * A context which will be used as `this` in callback execution.
+	 */
+	context: any;
+
+	/**
+	 * An internal Android specific method used to pass the motion event to the correct gesture observer.
+	 */
+	androidOnTouchEvent: (motionEvent: any /* android.view.MotionEvent */) => void;
+}
+
+// Shared gesture types, interfaces, and enums for gestures-common.ts and touch-manager.ts
+export enum GestureEvents {
+	gestureAttached = 'gestureAttached',
+	touchDown = 'touchDown',
+	touchUp = 'touchUp',
+}
+
+export enum GestureTypes {
+	tap = 1 << 0,
+	doubleTap = 1 << 1,
+	pinch = 1 << 2,
+	pan = 1 << 3,
+	swipe = 1 << 4,
+	rotation = 1 << 5,
+	longPress = 1 << 6,
+	touch = 1 << 7,
+}
+
+export enum GestureStateTypes {
+	cancelled,
+	began,
+	changed,
+	ended,
+}
+
+export enum SwipeDirection {
+	right = 1 << 0,
+	left = 1 << 1,
+	up = 1 << 2,
+	down = 1 << 3,
+}
+
+export enum TouchAction {
+	down = 'down',
+	up = 'up',
+	move = 'move',
+	cancel = 'cancel',
+}
+
+export interface GestureEventData extends EventData {
+	type: GestureTypes;
+	view: View;
+	ios: any;
+	android: any;
+}
+
+export interface TapGestureEventData extends GestureEventData {
+	getPointerCount(): number;
+	getX(): number;
+	getY(): number;
+}
+
+export interface TouchGestureEventData extends TapGestureEventData {
+	action: 'up' | 'move' | 'down' | 'cancel';
+	getActivePointers(): Array<Pointer>;
+	getAllPointers(): Array<Pointer>;
+}
+
+export interface Pointer {
+	android: any;
+	ios: any;
+	getX(): number;
+	getY(): number;
+	getXPixels(): number;
+	getXDIP(): number;
+	getYPixels(): number;
+	getYDIP(): number;
+}
+
+export interface GestureEventDataWithState extends GestureEventData {
+	state: number;
+}
+
+export interface PinchGestureEventData extends GestureEventDataWithState {
+	scale: number;
+	getFocusX(): number;
+	getFocusY(): number;
+}
+
+export interface SwipeGestureEventData extends GestureEventData {
+	direction: SwipeDirection;
+}
+
+export interface PanGestureEventData extends GestureEventDataWithState {
+	deltaX: number;
+	deltaY: number;
+}
+
+export interface RotationGestureEventData extends GestureEventDataWithState {
+	rotation: number;
+}
diff --git a/packages/core/ui/gestures/index.android.ts b/packages/core/ui/gestures/index.android.ts
index 31ddf9d331..e998f2ad7e 100644
--- a/packages/core/ui/gestures/index.android.ts
+++ b/packages/core/ui/gestures/index.android.ts
@@ -1,5 +1,5 @@
 // Definitions.
-import { GestureEventData, TapGestureEventData, SwipeGestureEventData, PanGestureEventData, RotationGestureEventData, GestureEventDataWithState } from '.';
+import type { GestureEventData, TapGestureEventData, SwipeGestureEventData, PanGestureEventData, RotationGestureEventData, GestureEventDataWithState } from './gestures-types';
 import type { View } from '../core/view';
 import { EventData } from '../../data/observable';
 
@@ -12,6 +12,8 @@ import { layout } from '../../utils';
 import * as timer from '../../timer';
 
 export * from './gestures-common';
+export * from './gestures-types';
+export * from './touch-manager';
 
 interface TapAndDoubleTapGestureListener {
 	new (observer: GesturesObserver, target: View, type: number): android.view.GestureDetector.SimpleOnGestureListener;
@@ -689,7 +691,7 @@ class CustomRotateGestureDetector {
 	}
 }
 
-class Pointer implements Pointer {
+class Pointer {
 	public android: number;
 	public ios: any = undefined;
 
@@ -709,7 +711,7 @@ class Pointer implements Pointer {
 	}
 }
 
-class TouchGestureEventData implements TouchGestureEventData {
+export class TouchGestureEventData {
 	eventName: string = toString(GestureTypes.touch);
 	type: GestureTypes = GestureTypes.touch;
 	ios: any = undefined;
diff --git a/packages/core/ui/gestures/index.d.ts b/packages/core/ui/gestures/index.d.ts
index 81e13e7ae4..d043f285f7 100644
--- a/packages/core/ui/gestures/index.d.ts
+++ b/packages/core/ui/gestures/index.d.ts
@@ -1,7 +1,9 @@
 import type { View } from '../core/view';
+import { GestureEventData, GestureTypes } from './gestures-types';
 
 export * from './gestures-common';
 export * from './touch-manager';
+export * from './gestures-types';
 
 /**
  * Provides options for the GesturesObserver.
@@ -49,6 +51,39 @@ export class GesturesObserver {
 	androidOnTouchEvent: (motionEvent: any /* android.view.MotionEvent */) => void;
 }
 
+class Pointer {
+	android: any;
+	ios: UITouch;
+
+	get location();
+
+	getX(): number;
+
+	getY(): number;
+}
+
+export class TouchGestureEventData {
+	eventName: string;
+	type: GestureTypes;
+	ios: any;
+	action: string;
+	view: View;
+	android: android.view.MotionEvent;
+	object: any;
+
+	prepare(view: View, e: any): void;
+
+	getPointerCount(): number;
+
+	getActivePointers(): Array<Pointer>;
+
+	getAllPointers(): Array<Pointer>;
+
+	getX(): number;
+
+	getY(): number;
+}
+
 /**
  * A short-hand function that is used to create a gesture observer for a view and gesture.
  * @param target - View which will be watched for originating a specific gesture.
diff --git a/packages/core/ui/gestures/index.ios.ts b/packages/core/ui/gestures/index.ios.ts
index 93696c026d..b569ea2f80 100644
--- a/packages/core/ui/gestures/index.ios.ts
+++ b/packages/core/ui/gestures/index.ios.ts
@@ -1,16 +1,11 @@
-// Definitions.
-
-import { GestureEventData, TapGestureEventData, GestureEventDataWithState, SwipeGestureEventData, PanGestureEventData, RotationGestureEventData, PinchGestureEventData } from '.';
+import type { GestureEventData, TapGestureEventData, GestureEventDataWithState, SwipeGestureEventData, PanGestureEventData, RotationGestureEventData, PinchGestureEventData } from './gestures-types';
 import type { View } from '../core/view';
 import { EventData } from '../../data/observable';
-
-// Types.
 import { GesturesObserverBase, toString, TouchAction, GestureStateTypes, GestureTypes, SwipeDirection, GestureEvents } from './gestures-common';
 
-// Import layout from utils directly to avoid circular references
-import { layout } from '../../utils';
-
 export * from './gestures-common';
+export * from './gestures-types';
+export * from './touch-manager';
 
 export function observe(target: View, type: GestureTypes, callback: (args: GestureEventData) => void, context?: any): GesturesObserver {
 	const observer = new GesturesObserver(target, callback, context);
@@ -539,7 +534,7 @@ class TouchGestureRecognizer extends UIGestureRecognizer {
 	}
 }
 
-class Pointer implements Pointer {
+class Pointer {
 	public android: any = undefined;
 	public ios: UITouch = undefined;
 
@@ -569,7 +564,7 @@ class Pointer implements Pointer {
 	}
 }
 
-class TouchGestureEventData implements TouchGestureEventData {
+export class TouchGestureEventData {
 	eventName: string = toString(GestureTypes.touch);
 	type: GestureTypes = GestureTypes.touch;
 	android: any = undefined;
diff --git a/packages/core/ui/gestures/touch-manager.ts b/packages/core/ui/gestures/touch-manager.ts
index 726be7e28b..e904643412 100644
--- a/packages/core/ui/gestures/touch-manager.ts
+++ b/packages/core/ui/gestures/touch-manager.ts
@@ -2,9 +2,9 @@
  * Provides various helpers for adding easy touch handling animations.
  * Use when needing to implement more interactivity with your UI regarding touch down/up behavior.
  */
-import { GestureEventData, GestureEventDataWithState, TouchGestureEventData } from '.';
+import { GestureEventData, GestureEventDataWithState, TouchGestureEventData } from './gestures-types';
 import { Animation } from '../animation';
-import { AnimationDefinition } from '../animation/animation-interfaces';
+import { AnimationDefinition } from '../animation/animation-shared';
 import type { View } from '../core/view';
 import { isObject, isFunction } from '../../utils/types';
 import { GestureEvents, GestureStateTypes, GestureTypes } from './gestures-common';
diff --git a/packages/core/ui/html-view/index.ios.ts b/packages/core/ui/html-view/index.ios.ts
index 730e1a0c8c..5361527459 100644
--- a/packages/core/ui/html-view/index.ios.ts
+++ b/packages/core/ui/html-view/index.ios.ts
@@ -3,12 +3,11 @@ import { Font } from '../styling/font';
 import { colorProperty, fontInternalProperty } from '../styling/style-properties';
 import { HtmlViewBase, htmlProperty, selectableProperty, linkColorProperty } from './html-view-common';
 import { View } from '../core/view';
-import { iOSNativeHelper, layout } from '../../utils';
+import { layout } from '../../utils';
+import { SDK_VERSION } from '../../utils/constants';
 
 export * from './html-view-common';
 
-const majorVersion = iOSNativeHelper.MajorVersion;
-
 export class HtmlView extends HtmlViewBase {
 	nativeViewProtected: UITextView;
 
@@ -89,7 +88,7 @@ export class HtmlView extends HtmlViewBase {
 
 		this.nativeViewProtected.attributedText = NSAttributedString.alloc().initWithDataOptionsDocumentAttributesError(nsData, attributes, null);
 
-		if (!this.style.color && majorVersion >= 13 && UIColor.labelColor) {
+		if (!this.style.color && SDK_VERSION >= 13 && UIColor.labelColor) {
 			this.nativeViewProtected.textColor = UIColor.labelColor;
 		}
 	}
diff --git a/packages/core/ui/image/image-common.ts b/packages/core/ui/image/image-common.ts
index 40ac84aa6e..6c2bd59e09 100644
--- a/packages/core/ui/image/image-common.ts
+++ b/packages/core/ui/image/image-common.ts
@@ -7,7 +7,7 @@ import { ImageSource, iosSymbolScaleType } from '../../image-source';
 import { isDataURI, isFontIconURI, isFileOrResourcePath, RESOURCE_PREFIX, SYSTEM_PREFIX } from '../../utils';
 import { Color } from '../../color';
 import { Style } from '../styling/style';
-import { Length } from '../styling/style-properties';
+import { Length } from '../styling/length-shared';
 import { Property, InheritedCssProperty } from '../core/properties';
 import { Trace } from '../../trace';
 import { ImageSymbolEffect, ImageSymbolEffects } from './symbol-effects';
diff --git a/packages/core/ui/image/index.android.ts b/packages/core/ui/image/index.android.ts
index 6de990c73b..26b2c73171 100644
--- a/packages/core/ui/image/index.android.ts
+++ b/packages/core/ui/image/index.android.ts
@@ -3,7 +3,7 @@ import { isDataURI, isFontIconURI, isFileOrResourcePath, RESOURCE_PREFIX } from
 import { Color } from '../../color';
 import { ImageSource } from '../../image-source';
 import { ImageAsset } from '../../image-asset';
-import { Length } from '../styling/style-properties';
+import { Length } from '../styling/length-shared';
 import { knownFolders } from '../../file-system';
 
 import { Screen } from '../../platform';
diff --git a/packages/core/ui/image/index.ios.ts b/packages/core/ui/image/index.ios.ts
index 7f82114a54..08c1d38764 100644
--- a/packages/core/ui/image/index.ios.ts
+++ b/packages/core/ui/image/index.ios.ts
@@ -219,6 +219,7 @@ export class Image extends ImageBase {
 		}
 	}
 
+	// @ts-expect-error
 	[iosSymbolScaleProperty.setNative](value: iosSymbolScaleType) {
 		// reset src to configure scale
 		this._setSrc(this.src);
diff --git a/packages/core/ui/index.ts b/packages/core/ui/index.ts
index 5b6f611fb8..9ea21c1f6e 100644
--- a/packages/core/ui/index.ts
+++ b/packages/core/ui/index.ts
@@ -1,7 +1,9 @@
 export { ActionBar, ActionItem, ActionItems, NavigationButton } from './action-bar';
 export { ActivityIndicator } from './activity-indicator';
-export { Animation, KeyframeAnimation, KeyframeAnimationInfo, KeyframeDeclaration, KeyframeInfo } from './animation';
-export type { AnimationDefinition } from './animation';
+export { Animation, _resolveAnimationCurve } from './animation';
+export { KeyframeAnimation, KeyframeAnimationInfo, KeyframeDeclaration, KeyframeInfo } from './animation/keyframe-animation';
+export type { AnimationDefinition, Pair, Transformation, TransformationType, TransformationValue, TransformFunctionsInfo, Point3D, AnimationPromise, Cancelable } from './animation/animation-types';
+export * from './animation/animation-shared';
 export { Builder } from './builder';
 export type { LoadOptions } from './builder';
 export type { ComponentModule } from './builder/component-builder';
@@ -9,17 +11,23 @@ export { sanitizeModuleName } from '../utils/common';
 export { Button } from './button';
 export { ContentView } from './content-view';
 export { Binding } from './core/bindable';
-export type { BindingOptions } from './core/bindable';
+export type { BindingOptions } from './core/bindable/bindable-types';
 export { ControlStateChangeListener } from './core/control-state-change';
 export { ViewBase, eachDescendant, getAncestor, getViewById, booleanConverter, querySelectorAll } from './core/view-base';
 export type { ShowModalOptions } from './core/view-base';
 export { View, CSSType, ContainerView, ViewHelper, AndroidHelper, IOSHelper, isUserInteractionEnabledProperty, PseudoClassHandler, CustomLayoutView } from './core/view';
-export type { Template, KeyedTemplate, ShownModallyData, AddArrayFromBuilder, AddChildFromBuilder, Size } from './core/view';
-export { Property, CoercibleProperty, InheritedProperty, CssProperty, InheritedCssProperty, ShorthandProperty, CssAnimationProperty, unsetValue, makeParser, makeValidator } from './core/properties';
+export type { Template, KeyedTemplate, AddArrayFromBuilder, AddChildFromBuilder } from './core/view';
+export type { ShownModallyData, Size } from './core/view/view-interfaces';
+export { Property, CoercibleProperty, InheritedProperty, CssProperty, InheritedCssProperty, ShorthandProperty, CssAnimationProperty, makeParser, makeValidator } from './core/properties';
+export { unsetValue } from './core/properties/property-shared';
 export { addWeakEventListener, removeWeakEventListener } from './core/weak-event-listener';
 export { DatePicker } from './date-picker';
 
-// No need go export dialogs, they are already export exported globally
+import { installPolyfills } from '../globals';
+// No need to export dialogs, they are already export exported globally
+import * as uiDialogs from '../ui/dialogs';
+global.registerModule('ui-dialogs', () => uiDialogs);
+installPolyfills('ui-dialogs', ['alert', 'confirm', 'prompt', 'login', 'action']);
 export { DialogStrings, action, alert, confirm, login, prompt, getCurrentPage, Dialogs, inputType, capitalizationType } from './dialogs';
 export type { DialogOptions, CancelableOptions, AlertOptions, PromptResult, PromptOptions, ActionOptions, ConfirmOptions, LoginResult, LoginOptions } from './dialogs';
 
@@ -66,6 +74,7 @@ export { Font, FontStyle, FontWeight, FontVariationSettings } from './styling/fo
 export { Style } from './styling/style';
 export type { CommonLayoutParams } from './styling/style';
 export * from './styling/style-properties';
+export * from './styling/length-shared';
 export { CssAnimationParser, parseKeyframeDeclarations } from './styling/css-animation-parser';
 export { CSSHelper } from './styling/css-selector';
 
diff --git a/packages/core/ui/label/index.ios.ts b/packages/core/ui/label/index.ios.ts
index e3cf12f543..c39ab6cba0 100644
--- a/packages/core/ui/label/index.ios.ts
+++ b/packages/core/ui/label/index.ios.ts
@@ -1,6 +1,6 @@
 import { Label as LabelDefinition } from '.';
 import { Background } from '../styling/background';
-import { Length, borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty } from '../styling/style-properties';
+import { borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty } from '../styling/style-properties';
 import { booleanConverter } from '../core/view-base';
 import { View, CSSType } from '../core/view';
 import { CoreTypes } from '../../core-types';
diff --git a/packages/core/ui/layouts/absolute-layout/absolute-layout-common.ts b/packages/core/ui/layouts/absolute-layout/absolute-layout-common.ts
index eabc13c5ea..05edc3ec49 100644
--- a/packages/core/ui/layouts/absolute-layout/absolute-layout-common.ts
+++ b/packages/core/ui/layouts/absolute-layout/absolute-layout-common.ts
@@ -3,7 +3,7 @@ import { LayoutBase } from '../layout-base';
 import { CoreTypes } from '../../../core-types';
 import { View, CSSType } from '../../core/view';
 import { Property } from '../../core/properties';
-import { Length } from '../../styling/style-properties';
+import { Length } from '../../styling/length-shared';
 
 export * from '../layout-base';
 
diff --git a/packages/core/ui/layouts/absolute-layout/index.android.ts b/packages/core/ui/layouts/absolute-layout/index.android.ts
index df8d0023b4..cd1e3fffb6 100644
--- a/packages/core/ui/layouts/absolute-layout/index.android.ts
+++ b/packages/core/ui/layouts/absolute-layout/index.android.ts
@@ -1,6 +1,6 @@
 import { AbsoluteLayoutBase, leftProperty, topProperty } from './absolute-layout-common';
 import { View } from '../../core/view';
-import { Length } from '../../styling/style-properties';
+import { Length } from '../../styling/length-shared';
 
 export * from './absolute-layout-common';
 
diff --git a/packages/core/ui/layouts/absolute-layout/index.d.ts b/packages/core/ui/layouts/absolute-layout/index.d.ts
index f298f26196..02369e7576 100644
--- a/packages/core/ui/layouts/absolute-layout/index.d.ts
+++ b/packages/core/ui/layouts/absolute-layout/index.d.ts
@@ -1,7 +1,7 @@
 import { LayoutBase } from '../layout-base';
 import { Property } from '../../core/properties';
 import { View } from '../../core/view';
-import { Length } from '../../styling/style-properties';
+import { Length } from '../../styling/length-shared';
 import { CoreTypes } from '../../../core-types';
 
 /**
diff --git a/packages/core/ui/layouts/absolute-layout/index.ios.ts b/packages/core/ui/layouts/absolute-layout/index.ios.ts
index 82b08ad940..ae9541a604 100644
--- a/packages/core/ui/layouts/absolute-layout/index.ios.ts
+++ b/packages/core/ui/layouts/absolute-layout/index.ios.ts
@@ -1,7 +1,6 @@
 import { AbsoluteLayoutBase } from './absolute-layout-common';
 import { CoreTypes } from '../../../core-types';
 import { View } from '../../core/view';
-import { Length } from '../../styling/style-properties';
 import { layout } from '../../../utils';
 
 export * from './absolute-layout-common';
diff --git a/packages/core/ui/layouts/flexbox-layout/flexbox-layout-common.ts b/packages/core/ui/layouts/flexbox-layout/flexbox-layout-common.ts
index a73b436848..95ff911420 100644
--- a/packages/core/ui/layouts/flexbox-layout/flexbox-layout-common.ts
+++ b/packages/core/ui/layouts/flexbox-layout/flexbox-layout-common.ts
@@ -1,6 +1,7 @@
 import { LayoutBase } from '../layout-base';
 import { View, CSSType } from '../../core/view';
-import { CssProperty, ShorthandProperty, makeParser, makeValidator, unsetValue } from '../../core/properties';
+import { CssProperty, ShorthandProperty, makeParser, makeValidator } from '../../core/properties';
+import { unsetValue } from '../../core/properties/property-shared';
 import { Style } from '../../styling/style';
 
 export type Basis = 'auto' | number;
diff --git a/packages/core/ui/layouts/flexbox-layout/index.android.ts b/packages/core/ui/layouts/flexbox-layout/index.android.ts
index 32d73d4f64..2289af0686 100644
--- a/packages/core/ui/layouts/flexbox-layout/index.android.ts
+++ b/packages/core/ui/layouts/flexbox-layout/index.android.ts
@@ -1,7 +1,7 @@
 import { FlexDirection, FlexWrap, JustifyContent, AlignItems, AlignContent, FlexboxLayoutBase, orderProperty, Order, flexGrowProperty, FlexGrow, flexShrinkProperty, FlexShrink, flexWrapBeforeProperty, FlexWrapBefore, alignSelfProperty, AlignSelf, flexDirectionProperty, flexWrapProperty, justifyContentProperty, alignItemsProperty, alignContentProperty } from './flexbox-layout-common';
 import { CoreTypes } from '../../../core-types';
 import { View } from '../../core/view';
-import { Length } from '../../styling/style-properties';
+import { Length } from '../../styling/length-shared';
 
 export * from './flexbox-layout-common';
 
diff --git a/packages/core/ui/layouts/flexbox-layout/index.ios.ts b/packages/core/ui/layouts/flexbox-layout/index.ios.ts
index 22b3913de8..dcb3ccd7cb 100644
--- a/packages/core/ui/layouts/flexbox-layout/index.ios.ts
+++ b/packages/core/ui/layouts/flexbox-layout/index.ios.ts
@@ -1,5 +1,6 @@
 import { FlexDirection, FlexWrap, JustifyContent, AlignItems, AlignContent, FlexboxLayoutBase, FlexBasisPercent, orderProperty, flexGrowProperty, flexShrinkProperty, flexWrapBeforeProperty, alignSelfProperty } from './flexbox-layout-common';
-import { Position, View } from '../../core/view';
+import { View } from '../../core/view';
+import { Position } from '../../core/view/view-interfaces';
 import { layout } from '../../../utils';
 
 export * from './flexbox-layout-common';
diff --git a/packages/core/ui/layouts/layout-base.android.ts b/packages/core/ui/layouts/layout-base.android.ts
index 9fa969fe86..d0516d7bbd 100644
--- a/packages/core/ui/layouts/layout-base.android.ts
+++ b/packages/core/ui/layouts/layout-base.android.ts
@@ -1,5 +1,6 @@
 import { LayoutBaseCommon, clipToBoundsProperty, isPassThroughParentEnabledProperty } from './layout-base-common';
-import { Length, paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty } from '../styling/style-properties';
+import { paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty } from '../styling/style-properties';
+import { Length } from '../styling/length-shared';
 import { CoreTypes } from '../../core-types';
 
 export * from './layout-base-common';
diff --git a/packages/core/ui/layouts/root-layout/root-layout-common.ts b/packages/core/ui/layouts/root-layout/root-layout-common.ts
index be8b54c936..c58aa0bbcf 100644
--- a/packages/core/ui/layouts/root-layout/root-layout-common.ts
+++ b/packages/core/ui/layouts/root-layout/root-layout-common.ts
@@ -4,7 +4,7 @@ import { CSSType, View } from '../../core/view';
 import { GridLayout } from '../grid-layout';
 import { RootLayout, RootLayoutOptions, ShadeCoverOptions, TransitionAnimation } from '.';
 import { Animation } from '../../animation';
-import { AnimationDefinition } from '../../animation';
+import { AnimationDefinition } from '../../animation/animation-types';
 import { isNumber } from '../../../utils/types';
 import { _findRootLayoutById, _pushIntoRootLayoutStack, _removeFromRootLayoutStack, _geRootLayoutFromStack } from './root-layout-stack';
 
diff --git a/packages/core/ui/layouts/stack-layout/index.ios.ts b/packages/core/ui/layouts/stack-layout/index.ios.ts
index 64e347d699..7c3b21594f 100644
--- a/packages/core/ui/layouts/stack-layout/index.ios.ts
+++ b/packages/core/ui/layouts/stack-layout/index.ios.ts
@@ -1,6 +1,7 @@
 import { StackLayoutBase } from './stack-layout-common';
 import { CoreTypes } from '../../../core-types';
-import { Position, View } from '../../core/view';
+import { View } from '../../core/view';
+import { Position } from '../../core/view/view-interfaces';
 import { layout } from '../../../utils';
 import { Trace } from '../../../trace';
 
diff --git a/packages/core/ui/layouts/wrap-layout/index.android.ts b/packages/core/ui/layouts/wrap-layout/index.android.ts
index 205f86332f..ab03d5c781 100644
--- a/packages/core/ui/layouts/wrap-layout/index.android.ts
+++ b/packages/core/ui/layouts/wrap-layout/index.android.ts
@@ -1,6 +1,6 @@
 import { WrapLayoutBase, orientationProperty, itemWidthProperty, itemHeightProperty } from './wrap-layout-common';
 import { CoreTypes } from '../../../core-types';
-import { Length } from '../../styling/style-properties';
+import { Length } from '../../styling/length-shared';
 
 export * from './wrap-layout-common';
 
diff --git a/packages/core/ui/layouts/wrap-layout/index.d.ts b/packages/core/ui/layouts/wrap-layout/index.d.ts
index 7d1a8b42e9..bab27ba278 100644
--- a/packages/core/ui/layouts/wrap-layout/index.d.ts
+++ b/packages/core/ui/layouts/wrap-layout/index.d.ts
@@ -1,5 +1,5 @@
 import { LayoutBase } from '../layout-base';
-import { Length } from '../../styling/style-properties';
+import { Length } from '../../styling/length-shared';
 import { Property } from '../../core/properties';
 import { CoreTypes } from '../../../core-types';
 
diff --git a/packages/core/ui/layouts/wrap-layout/wrap-layout-common.ts b/packages/core/ui/layouts/wrap-layout/wrap-layout-common.ts
index 6aeda1ebcd..203ec55aed 100644
--- a/packages/core/ui/layouts/wrap-layout/wrap-layout-common.ts
+++ b/packages/core/ui/layouts/wrap-layout/wrap-layout-common.ts
@@ -2,7 +2,7 @@
 import { LayoutBase } from '../layout-base';
 import { CSSType } from '../../core/view';
 import { Property, makeValidator, makeParser } from '../../core/properties';
-import { Length } from '../../styling/style-properties';
+import { Length } from '../../styling/length-shared';
 import { CoreTypes } from '../../../core-types';
 
 export * from '../layout-base';
diff --git a/packages/core/ui/list-view/index.android.ts b/packages/core/ui/list-view/index.android.ts
index bd48a8a7cd..7cc75c0048 100644
--- a/packages/core/ui/list-view/index.android.ts
+++ b/packages/core/ui/list-view/index.android.ts
@@ -1,7 +1,7 @@
 import { ItemEventData, ItemsSource } from '.';
 import { ListViewBase, separatorColorProperty, itemTemplatesProperty } from './list-view-common';
 import { View, KeyedTemplate } from '../core/view';
-import { unsetValue } from '../core/properties';
+import { unsetValue } from '../core/properties/property-shared';
 import { CoreTypes } from '../../core-types';
 import { Color } from '../../color';
 import { Observable } from '../../data/observable';
@@ -269,7 +269,7 @@ export class ListView extends ListViewBase {
 			| {
 					dividerHeight: number;
 					divider: android.graphics.drawable.Drawable;
-			  }
+			  },
 	) {
 		const nativeView = this.nativeViewProtected;
 		if (value instanceof Color) {
diff --git a/packages/core/ui/list-view/index.ios.ts b/packages/core/ui/list-view/index.ios.ts
index 4dce494542..f5c6c8c93c 100644
--- a/packages/core/ui/list-view/index.ios.ts
+++ b/packages/core/ui/list-view/index.ios.ts
@@ -2,7 +2,7 @@ import { ItemEventData } from '.';
 import { ListViewBase, separatorColorProperty, itemTemplatesProperty, iosEstimatedRowHeightProperty } from './list-view-common';
 import { CoreTypes } from '../../core-types';
 import { View, KeyedTemplate } from '../core/view';
-import { Length } from '../styling/style-properties';
+import { Length } from '../styling/length-shared';
 import { Observable, EventData } from '../../data/observable';
 import { Color } from '../../color';
 import { layout } from '../../utils';
diff --git a/packages/core/ui/list-view/list-view-common.ts b/packages/core/ui/list-view/list-view-common.ts
index dac45642ed..1cf71a0f3c 100644
--- a/packages/core/ui/list-view/list-view-common.ts
+++ b/packages/core/ui/list-view/list-view-common.ts
@@ -1,7 +1,7 @@
 import { ListView as ListViewDefinition, ItemsSource, ItemEventData, TemplatedItemsView } from '.';
 import { View, ContainerView, Template, KeyedTemplate, CSSType } from '../core/view';
 import { Property, CoercibleProperty, CssProperty } from '../core/properties';
-import { Length } from '../styling/style-properties';
+import { Length } from '../styling/length-shared';
 import { Style } from '../styling/style';
 import { Color } from '../../color';
 import { Builder } from '../builder';
diff --git a/packages/core/ui/page/index.android.ts b/packages/core/ui/page/index.android.ts
index 2a75f27b0b..15e19f1e61 100644
--- a/packages/core/ui/page/index.android.ts
+++ b/packages/core/ui/page/index.android.ts
@@ -1,12 +1,12 @@
+import { isAccessibilityServiceEnabled } from '../../application';
 import { PageBase, actionBarHiddenProperty, statusBarStyleProperty, androidStatusBarBackgroundProperty } from './page-common';
-import { CoreTypes } from '../../core-types';
 import { View } from '../core/view';
 import { Color } from '../../color';
 import { ActionBar } from '../action-bar';
 import { GridLayout } from '../layouts/grid-layout';
 import { SDK_VERSION } from '../../utils/constants';
 import { profile } from '../../profiling';
-import { AndroidAccessibilityEvent, getLastFocusedViewOnPage, isAccessibilityServiceEnabled } from '../../accessibility';
+import { AndroidAccessibilityEvent, getLastFocusedViewOnPage } from '../../accessibility';
 
 export * from './page-common';
 
@@ -23,7 +23,7 @@ export class Page extends PageBase {
 			JSON.stringify([
 				{ value: 1, type: 0 /* org.nativescript.widgets.GridUnitType.auto */ },
 				{ value: 1, type: 2 /* org.nativescript.widgets.GridUnitType.star */ },
-			])
+			]),
 		);
 		return layout;
 	}
diff --git a/packages/core/ui/page/index.ios.ts b/packages/core/ui/page/index.ios.ts
index a36bce5fb7..7288d9d25a 100644
--- a/packages/core/ui/page/index.ios.ts
+++ b/packages/core/ui/page/index.ios.ts
@@ -1,14 +1,12 @@
-// Definitions.
+import { isAccessibilityServiceEnabled } from '../../application';
 import { Frame, BackstackEntry, NavigationType } from '../frame';
-
-// Types.
 import { View, IOSHelper } from '../core/view';
 import { PageBase, actionBarHiddenProperty, statusBarStyleProperty } from './page-common';
 
 import { profile } from '../../profiling';
 import { layout } from '../../utils';
 import { SDK_VERSION } from '../../utils/constants';
-import { getLastFocusedViewOnPage, isAccessibilityServiceEnabled } from '../../accessibility';
+import { getLastFocusedViewOnPage } from '../../accessibility';
 import { SharedTransition } from '../transition/shared-transition';
 
 export * from './page-common';
diff --git a/packages/core/ui/page/page-common.ts b/packages/core/ui/page/page-common.ts
index 7843b4332c..5f0dd7d805 100644
--- a/packages/core/ui/page/page-common.ts
+++ b/packages/core/ui/page/page-common.ts
@@ -1,6 +1,7 @@
 import { Page as PageDefinition } from '.';
 import { ContentView } from '../content-view';
-import { View, CSSType, ShownModallyData } from '../core/view';
+import { View, CSSType } from '../core/view';
+import { ShownModallyData } from '../core/view/view-interfaces';
 import { booleanConverter } from '../core/view-base';
 import { Property, CssProperty } from '../core/properties';
 import { Style } from '../styling/style';
diff --git a/packages/core/ui/scroll-view/index.ios.ts b/packages/core/ui/scroll-view/index.ios.ts
index 9843396950..16617e7ccd 100644
--- a/packages/core/ui/scroll-view/index.ios.ts
+++ b/packages/core/ui/scroll-view/index.ios.ts
@@ -1,12 +1,11 @@
 import { ScrollEventData } from '.';
 import { ScrollViewBase, scrollBarIndicatorVisibleProperty, isScrollEnabledProperty } from './scroll-view-common';
-import { iOSNativeHelper, layout } from '../../utils';
+import { layout } from '../../utils';
+import { SDK_VERSION } from '../../utils/constants';
 import { View } from '../core/view';
 
 export * from './scroll-view-common';
 
-const majorVersion = iOSNativeHelper.MajorVersion;
-
 @NativeClass
 class UIScrollViewDelegateImpl extends NSObject implements UIScrollViewDelegate {
 	private _owner: WeakRef<ScrollView>;
@@ -174,7 +173,7 @@ export class ScrollView extends ScrollViewBase {
 		let width = right - left - insets.right - insets.left;
 		let height = bottom - top - insets.bottom - insets.top;
 
-		if (majorVersion > 10) {
+		if (SDK_VERSION > 10) {
 			// Disable automatic adjustment of scroll view insets
 			// Consider exposing this as property with all 4 modes
 			// https://developer.apple.com/documentation/uikit/uiscrollview/contentinsetadjustmentbehavior
diff --git a/packages/core/ui/search-bar/index.android.ts b/packages/core/ui/search-bar/index.android.ts
index 611889db8f..e3d3688935 100644
--- a/packages/core/ui/search-bar/index.android.ts
+++ b/packages/core/ui/search-bar/index.android.ts
@@ -234,6 +234,7 @@ export class SearchBar extends SearchBarBase {
 	[textProperty.getDefault](): string {
 		return '';
 	}
+	// @ts-expect-error
 	[textProperty.setNative](value: string) {
 		const text = value === null || value === undefined ? '' : value.toString();
 		this.nativeViewProtected.setQuery(text, false);
@@ -241,6 +242,7 @@ export class SearchBar extends SearchBarBase {
 	[hintProperty.getDefault](): string {
 		return null;
 	}
+	// @ts-expect-error
 	[hintProperty.setNative](value: string) {
 		if (value === null || value === undefined) {
 			this.nativeViewProtected.setQueryHint(null);
diff --git a/packages/core/ui/search-bar/index.ios.ts b/packages/core/ui/search-bar/index.ios.ts
index 4441315917..1cc4628884 100644
--- a/packages/core/ui/search-bar/index.ios.ts
+++ b/packages/core/ui/search-bar/index.ios.ts
@@ -3,12 +3,10 @@ import { SearchBarBase, textProperty, hintProperty, textFieldHintColorProperty,
 import { isEnabledProperty } from '../core/view';
 import { Color } from '../../color';
 import { colorProperty, backgroundColorProperty, backgroundInternalProperty, fontInternalProperty } from '../styling/style-properties';
-import { iOSNativeHelper } from '../../utils';
+import { SDK_VERSION } from '../../utils/constants';
 
 export * from './search-bar-common';
 
-const majorVersion = iOSNativeHelper.MajorVersion;
-
 @NativeClass
 class UISearchBarDelegateImpl extends NSObject implements UISearchBarDelegate {
 	public static ObjCProtocols = [UISearchBarDelegate];
@@ -62,7 +60,7 @@ class UISearchBarImpl extends UISearchBar {
 	sizeThatFits(size: CGSize): CGSize {
 		// iOS11 SDK does not support passing sizeThatFits(...) non-finite width value;
 		// iOS layout system will take care to size the element properly when passed 0
-		if (majorVersion >= 11 && size.width === Number.POSITIVE_INFINITY) {
+		if (SDK_VERSION >= 11 && size.width === Number.POSITIVE_INFINITY) {
 			size.width = 0;
 		}
 
@@ -167,6 +165,7 @@ export class SearchBar extends SearchBarBase {
 	[textProperty.getDefault](): string {
 		return '';
 	}
+	// @ts-expect-error
 	[textProperty.setNative](value: string) {
 		const text = value === null || value === undefined ? '' : value.toString();
 		this.ios.text = text;
@@ -175,6 +174,7 @@ export class SearchBar extends SearchBarBase {
 	[hintProperty.getDefault](): string {
 		return '';
 	}
+	// @ts-expect-error
 	[hintProperty.setNative](value: string) {
 		this._updateAttributedPlaceholder();
 	}
diff --git a/packages/core/ui/styling/background.ios.ts b/packages/core/ui/styling/background.ios.ts
index 01632991a5..52d9baa10e 100644
--- a/packages/core/ui/styling/background.ios.ts
+++ b/packages/core/ui/styling/background.ios.ts
@@ -1,6 +1,7 @@
 import { ScrollEventData } from '../scroll-view';
 import { Background as BackgroundDefinition } from './background';
-import { View, Point, Position } from '../core/view';
+import { View } from '../core/view';
+import { Point, Position } from '../core/view/view-interfaces';
 import { LinearGradient } from './linear-gradient';
 import { Screen } from '../../platform';
 import { isDataURI, isFileOrResourcePath, layout } from '../../utils';
@@ -9,7 +10,6 @@ import { ImageSource } from '../../image-source';
 import type { CSSValue } from '../../css-value/reworkcss-value';
 import { parse as cssParse } from '../../css-value/reworkcss-value.js';
 import { BoxShadow } from './box-shadow';
-import { Length } from './style-properties';
 import { BackgroundClearFlags } from './background-common';
 import { ClipPathFunction } from './clip-path-function';
 
diff --git a/packages/core/ui/styling/css-selector.ts b/packages/core/ui/styling/css-selector.ts
index 40c4d5ffb2..3cc4bf640b 100644
--- a/packages/core/ui/styling/css-selector.ts
+++ b/packages/core/ui/styling/css-selector.ts
@@ -1,7 +1,7 @@
 import { parse as convertToCSSWhatSelector, Selector as CSSWhatSelector, DataType as CSSWhatDataType } from 'css-what';
 import '../../globals';
 import { isCssVariable } from '../core/properties';
-import { Trace } from '../../trace';
+import { Trace, CoreTypes } from './styling-shared';
 import { isNullOrUndefined } from '../../utils/types';
 
 import * as ReworkCSS from '../../css';
diff --git a/packages/core/ui/styling/css-shadow.spec.ts b/packages/core/ui/styling/css-shadow.spec.ts
index 780696f334..49979b6545 100644
--- a/packages/core/ui/styling/css-shadow.spec.ts
+++ b/packages/core/ui/styling/css-shadow.spec.ts
@@ -1,6 +1,6 @@
 import { parseCSSShadow } from './css-shadow';
 import { CoreTypes } from '../../core-types';
-import { Length } from './style-properties';
+import { Length } from './length-shared';
 import { Color } from '../../color';
 
 describe('css-shadow', () => {
diff --git a/packages/core/ui/styling/css-shadow.ts b/packages/core/ui/styling/css-shadow.ts
index b2850b87f2..187fb743f1 100644
--- a/packages/core/ui/styling/css-shadow.ts
+++ b/packages/core/ui/styling/css-shadow.ts
@@ -1,5 +1,6 @@
 import { Color } from '../../color';
 import { CoreTypes } from '../../core-types';
+import { Length } from './length-shared';
 import { parseCSSShorthand } from './css-utils';
 
 export interface ShadowCSSValues {
diff --git a/packages/core/ui/styling/css-stroke.spec.ts b/packages/core/ui/styling/css-stroke.spec.ts
index e5646deccc..a7cbd524b2 100644
--- a/packages/core/ui/styling/css-stroke.spec.ts
+++ b/packages/core/ui/styling/css-stroke.spec.ts
@@ -1,5 +1,5 @@
 import { parseCSSStroke } from './css-stroke';
-import { Length } from './style-properties';
+import { Length } from './length-shared';
 import { Color } from '../../color';
 
 describe('css-text-stroke', () => {
diff --git a/packages/core/ui/styling/css-stroke.ts b/packages/core/ui/styling/css-stroke.ts
index be813ffddc..5df5932300 100644
--- a/packages/core/ui/styling/css-stroke.ts
+++ b/packages/core/ui/styling/css-stroke.ts
@@ -1,6 +1,7 @@
 import { CoreTypes } from '../../core-types';
 import { Color } from '../../color';
 import { parseCSSShorthand } from './css-utils';
+import { Length } from './length-shared';
 
 export interface StrokeCSSValues {
 	width: CoreTypes.LengthType;
diff --git a/packages/core/ui/styling/css-transform.ts b/packages/core/ui/styling/css-transform.ts
index 0187e6a172..5570ae068c 100644
--- a/packages/core/ui/styling/css-transform.ts
+++ b/packages/core/ui/styling/css-transform.ts
@@ -1,4 +1,4 @@
-import { Pair, Transformation, TransformationType, TransformationValue, TransformFunctionsInfo } from '../animation';
+import { Pair, Transformation, TransformationType, TransformationValue, TransformFunctionsInfo } from '../animation/animation-types';
 import { radiansToDegrees } from '../../utils/number-utils';
 import { decompose2DTransformMatrix, getTransformMatrix, matrixArrayToCssMatrix, multiplyAffine2d } from '../../matrix';
 import { hasDuplicates } from '../../utils';
diff --git a/packages/core/ui/styling/css-utils.ts b/packages/core/ui/styling/css-utils.ts
index dfd701f927..6b23cf536c 100644
--- a/packages/core/ui/styling/css-utils.ts
+++ b/packages/core/ui/styling/css-utils.ts
@@ -1,6 +1,6 @@
 import { Trace } from '../../trace';
 import { CoreTypes } from '../../core-types';
-import { Length } from './style-properties';
+import { Length } from './length-shared';
 
 export function cleanupImportantFlags(value: unknown, propertyName: string) {
 	if (typeof value !== 'string') {
diff --git a/packages/core/ui/styling/length-shared.ts b/packages/core/ui/styling/length-shared.ts
new file mode 100644
index 0000000000..003d26c547
--- /dev/null
+++ b/packages/core/ui/styling/length-shared.ts
@@ -0,0 +1,184 @@
+// Shared Length, FixedLength, and PercentLength helpers for styling modules.
+// Only put platform-agnostic logic here.
+
+import { CoreTypes } from '../../core-types';
+import { layout } from '../../utils';
+import { isCssWideKeyword } from '../core/properties/property-shared';
+
+function equalsCommon(a: CoreTypes.LengthType, b: CoreTypes.LengthType): boolean;
+function equalsCommon(a: CoreTypes.PercentLengthType, b: CoreTypes.PercentLengthType): boolean;
+function equalsCommon(a: CoreTypes.PercentLengthType, b: CoreTypes.PercentLengthType): boolean {
+	if (a == 'auto' || isCssWideKeyword(a)) {
+		return b == 'auto' || isCssWideKeyword(b);
+	}
+
+	if (b == 'auto' || isCssWideKeyword(b)) {
+		return false;
+	}
+
+	if (typeof a === 'number') {
+		if (typeof b === 'number') {
+			return a == b;
+		}
+		if (!b) {
+			return false;
+		}
+		return (b as CoreTypes.LengthDipUnit).unit == 'dip' && a == (b as CoreTypes.LengthDipUnit).value;
+	}
+
+	if (typeof b === 'number') {
+		return a ? (a as CoreTypes.LengthDipUnit).unit == 'dip' && (a as CoreTypes.LengthDipUnit).value == b : false;
+	}
+	if (!a || !b) {
+		return false;
+	}
+	return (a as CoreTypes.LengthDipUnit).value == (b as CoreTypes.LengthDipUnit).value && (a as CoreTypes.LengthDipUnit).unit == (b as CoreTypes.LengthDipUnit).unit;
+}
+
+function convertToStringCommon(length: CoreTypes.LengthType | CoreTypes.PercentLengthType): string {
+	if (length == 'auto' || isCssWideKeyword(length)) {
+		return 'auto';
+	}
+
+	if (typeof length === 'number') {
+		return length.toString();
+	}
+
+	let val = (length as CoreTypes.LengthPercentUnit).value;
+	if ((length as CoreTypes.LengthPercentUnit).unit === '%') {
+		val *= 100;
+	}
+
+	return val + (length as CoreTypes.LengthPercentUnit).unit;
+}
+
+function toDevicePixelsCommon(length: CoreTypes.PercentLengthType, auto: number = Number.NaN, parentAvailableWidth: number = Number.NaN): number {
+	if (length == 'auto' || isCssWideKeyword(length)) {
+		return auto;
+	}
+	if (typeof length === 'number') {
+		return layout.round(layout.toDevicePixels(length));
+	}
+	if (!length) {
+		return auto;
+	}
+	// @ts-ignore
+	switch (length.unit) {
+		case 'px':
+			// @ts-ignore
+			return layout.round(length.value);
+		case '%':
+			// @ts-ignore
+			return layout.round(parentAvailableWidth * length.value);
+		case 'dip':
+		default:
+			// @ts-ignore
+			return layout.round(layout.toDevicePixels(length.value));
+	}
+}
+
+export namespace PercentLength {
+	export function parse(fromValue: string | CoreTypes.LengthType): CoreTypes.PercentLengthType {
+		if (fromValue == 'auto') {
+			return 'auto';
+		}
+
+		if (typeof fromValue === 'string') {
+			let stringValue = fromValue.trim();
+			const percentIndex = stringValue.indexOf('%');
+			if (percentIndex !== -1) {
+				let value: CoreTypes.percent;
+				// if only % or % is not last we treat it as invalid value.
+				if (percentIndex !== stringValue.length - 1 || percentIndex === 0) {
+					value = Number.NaN;
+				} else {
+					// Normalize result to values between -1 and 1
+					value = parseFloat(stringValue.substring(0, stringValue.length - 1).trim()) / 100;
+				}
+
+				if (isNaN(value) || !isFinite(value)) {
+					throw new Error(`Invalid value: ${fromValue}`);
+				}
+
+				return { unit: '%', value };
+			} else if (stringValue.indexOf('px') !== -1) {
+				stringValue = stringValue.replace('px', '').trim();
+				const value: CoreTypes.px = parseFloat(stringValue);
+				if (isNaN(value) || !isFinite(value)) {
+					throw new Error(`Invalid value: ${fromValue}`);
+				}
+
+				return { unit: 'px', value };
+			} else {
+				const value: CoreTypes.dip = parseFloat(stringValue);
+				if (isNaN(value) || !isFinite(value)) {
+					throw new Error(`Invalid value: ${fromValue}`);
+				}
+
+				return value;
+			}
+		} else {
+			return fromValue;
+		}
+	}
+
+	export const equals: {
+		(a: CoreTypes.PercentLengthType, b: CoreTypes.PercentLengthType): boolean;
+	} = equalsCommon;
+	export const toDevicePixels: {
+		(length: CoreTypes.PercentLengthType, auto: number, parentAvailableWidth: number): number;
+	} = toDevicePixelsCommon;
+	export const convertToString: {
+		(length: CoreTypes.PercentLengthType): string;
+	} = convertToStringCommon;
+}
+
+export namespace FixedLength {
+	export function parse(fromValue: string | CoreTypes.FixedLengthType): CoreTypes.FixedLengthType {
+		if (typeof fromValue === 'string') {
+			let stringValue = fromValue.trim();
+			if (stringValue.indexOf('px') !== -1) {
+				stringValue = stringValue.replace('px', '').trim();
+				const value: CoreTypes.px = parseFloat(stringValue);
+				if (isNaN(value) || !isFinite(value)) {
+					throw new Error(`Invalid value: ${stringValue}`);
+				}
+
+				return { unit: 'px', value };
+			} else {
+				const value: CoreTypes.dip = parseFloat(stringValue);
+				if (isNaN(value) || !isFinite(value)) {
+					throw new Error(`Invalid value: ${stringValue}`);
+				}
+
+				return value;
+			}
+		} else {
+			return fromValue;
+		}
+	}
+	export const equals: { (a: CoreTypes.FixedLengthType, b: CoreTypes.FixedLengthType): boolean } = equalsCommon;
+	export const toDevicePixels: {
+		(length: CoreTypes.FixedLengthType): number;
+	} = toDevicePixelsCommon;
+	export const convertToString: {
+		(length: CoreTypes.FixedLengthType): string;
+	} = convertToStringCommon;
+}
+
+export namespace Length {
+	export function parse(fromValue: string | CoreTypes.LengthType): CoreTypes.LengthType {
+		if (fromValue == 'auto') {
+			return 'auto';
+		}
+
+		return FixedLength.parse(fromValue);
+	}
+	export const equals: { (a: CoreTypes.LengthType, b: CoreTypes.LengthType): boolean } = equalsCommon;
+	export const toDevicePixels: {
+		(length: CoreTypes.LengthType, auto?: number): number;
+	} = toDevicePixelsCommon;
+	export const convertToString: {
+		(length: CoreTypes.LengthType): string;
+	} = convertToStringCommon;
+}
diff --git a/packages/core/ui/styling/style-properties.ts b/packages/core/ui/styling/style-properties.ts
index 4326e41107..64ca34dc34 100644
--- a/packages/core/ui/styling/style-properties.ts
+++ b/packages/core/ui/styling/style-properties.ts
@@ -1,4 +1,5 @@
-import { unsetValue, CssProperty, CssAnimationProperty, ShorthandProperty, InheritedCssProperty, isCssWideKeyword } from '../core/properties';
+import { CssProperty, CssAnimationProperty, ShorthandProperty, InheritedCssProperty } from '../core/properties';
+import { unsetValue, isCssWideKeyword } from '../core/properties/property-shared';
 import { Style } from './style';
 
 import { Color } from '../../color';
@@ -8,6 +9,7 @@ import { layout } from '../../utils';
 
 import { Trace } from '../../trace';
 import { CoreTypes } from '../../core-types';
+import { Length, FixedLength, PercentLength } from './length-shared';
 
 import { parseBackground } from '../../css/parser';
 import { LinearGradient } from './linear-gradient';
@@ -24,7 +26,7 @@ interface ShorthandPositioning {
 
 function equalsCommon(a: CoreTypes.LengthType, b: CoreTypes.LengthType): boolean;
 function equalsCommon(a: CoreTypes.PercentLengthType, b: CoreTypes.PercentLengthType): boolean;
-function equalsCommon(a: CoreTypes.PercentLengthType, b: CoreTypes.PercentLengthType): boolean {
+function equalsCommon(a: CoreTypes.PercentLengthType, b: CoreTypes.PercentLengthType | CoreTypes.LengthDipUnit): boolean {
 	if (a == 'auto' || isCssWideKeyword(a)) {
 		return b == 'auto' || isCssWideKeyword(b);
 	}
@@ -40,16 +42,16 @@ function equalsCommon(a: CoreTypes.PercentLengthType, b: CoreTypes.PercentLength
 		if (!b) {
 			return false;
 		}
-		return b.unit == 'dip' && a == b.value;
+		return (b as CoreTypes.LengthDipUnit).unit == 'dip' && a == (b as CoreTypes.LengthDipUnit).value;
 	}
 
 	if (typeof b === 'number') {
-		return a ? a.unit == 'dip' && a.value == b : false;
+		return a ? (a as CoreTypes.LengthDipUnit).unit == 'dip' && (a as CoreTypes.LengthDipUnit).value == b : false;
 	}
 	if (!a || !b) {
 		return false;
 	}
-	return a.value == b.value && a.unit == b.unit;
+	return (a as CoreTypes.LengthDipUnit).value == (b as CoreTypes.LengthDipUnit).value && (a as CoreTypes.LengthDipUnit).unit == (b as CoreTypes.LengthDipUnit).unit;
 }
 
 function convertToStringCommon(length: CoreTypes.LengthType | CoreTypes.PercentLengthType): string {
@@ -61,12 +63,12 @@ function convertToStringCommon(length: CoreTypes.LengthType | CoreTypes.PercentL
 		return length.toString();
 	}
 
-	let val = length.value;
-	if (length.unit === '%') {
+	let val = (length as CoreTypes.LengthPercentUnit).value;
+	if ((length as CoreTypes.LengthPercentUnit).unit === '%') {
 		val *= 100;
 	}
 
-	return val + length.unit;
+	return val + (length as CoreTypes.LengthPercentUnit).unit;
 }
 
 function toDevicePixelsCommon(length: CoreTypes.PercentLengthType, auto: number = Number.NaN, parentAvailableWidth: number = Number.NaN): number {
@@ -79,123 +81,21 @@ function toDevicePixelsCommon(length: CoreTypes.PercentLengthType, auto: number
 	if (!length) {
 		return auto;
 	}
+	// @ts-ignore
 	switch (length.unit) {
 		case 'px':
+			// @ts-ignore
 			return layout.round(length.value);
 		case '%':
+			// @ts-ignore
 			return layout.round(parentAvailableWidth * length.value);
 		case 'dip':
 		default:
+			// @ts-ignore
 			return layout.round(layout.toDevicePixels(length.value));
 	}
 }
 
-export namespace PercentLength {
-	export function parse(fromValue: string | CoreTypes.LengthType): CoreTypes.PercentLengthType {
-		if (fromValue == 'auto') {
-			return 'auto';
-		}
-
-		if (typeof fromValue === 'string') {
-			let stringValue = fromValue.trim();
-			const percentIndex = stringValue.indexOf('%');
-			if (percentIndex !== -1) {
-				let value: CoreTypes.percent;
-				// if only % or % is not last we treat it as invalid value.
-				if (percentIndex !== stringValue.length - 1 || percentIndex === 0) {
-					value = Number.NaN;
-				} else {
-					// Normalize result to values between -1 and 1
-					value = parseFloat(stringValue.substring(0, stringValue.length - 1).trim()) / 100;
-				}
-
-				if (isNaN(value) || !isFinite(value)) {
-					throw new Error(`Invalid value: ${fromValue}`);
-				}
-
-				return { unit: '%', value };
-			} else if (stringValue.indexOf('px') !== -1) {
-				stringValue = stringValue.replace('px', '').trim();
-				const value: CoreTypes.px = parseFloat(stringValue);
-				if (isNaN(value) || !isFinite(value)) {
-					throw new Error(`Invalid value: ${fromValue}`);
-				}
-
-				return { unit: 'px', value };
-			} else {
-				const value: CoreTypes.dip = parseFloat(stringValue);
-				if (isNaN(value) || !isFinite(value)) {
-					throw new Error(`Invalid value: ${fromValue}`);
-				}
-
-				return value;
-			}
-		} else {
-			return fromValue;
-		}
-	}
-
-	export const equals: {
-		(a: CoreTypes.PercentLengthType, b: CoreTypes.PercentLengthType): boolean;
-	} = equalsCommon;
-	export const toDevicePixels: {
-		(length: CoreTypes.PercentLengthType, auto: number, parentAvailableWidth: number): number;
-	} = toDevicePixelsCommon;
-	export const convertToString: {
-		(length: CoreTypes.PercentLengthType): string;
-	} = convertToStringCommon;
-}
-
-export namespace FixedLength {
-	export function parse(fromValue: string | CoreTypes.FixedLengthType): CoreTypes.FixedLengthType {
-		if (typeof fromValue === 'string') {
-			let stringValue = fromValue.trim();
-			if (stringValue.indexOf('px') !== -1) {
-				stringValue = stringValue.replace('px', '').trim();
-				const value: CoreTypes.px = parseFloat(stringValue);
-				if (isNaN(value) || !isFinite(value)) {
-					throw new Error(`Invalid value: ${stringValue}`);
-				}
-
-				return { unit: 'px', value };
-			} else {
-				const value: CoreTypes.dip = parseFloat(stringValue);
-				if (isNaN(value) || !isFinite(value)) {
-					throw new Error(`Invalid value: ${stringValue}`);
-				}
-
-				return value;
-			}
-		} else {
-			return fromValue;
-		}
-	}
-	export const equals: { (a: CoreTypes.FixedLengthType, b: CoreTypes.FixedLengthType): boolean } = equalsCommon;
-	export const toDevicePixels: {
-		(length: CoreTypes.FixedLengthType): number;
-	} = toDevicePixelsCommon;
-	export const convertToString: {
-		(length: CoreTypes.FixedLengthType): string;
-	} = convertToStringCommon;
-}
-
-export namespace Length {
-	export function parse(fromValue: string | CoreTypes.LengthType): CoreTypes.LengthType {
-		if (fromValue == 'auto') {
-			return 'auto';
-		}
-
-		return FixedLength.parse(fromValue);
-	}
-	export const equals: { (a: CoreTypes.LengthType, b: CoreTypes.LengthType): boolean } = equalsCommon;
-	export const toDevicePixels: {
-		(length: CoreTypes.LengthType, auto?: number): number;
-	} = toDevicePixelsCommon;
-	export const convertToString: {
-		(length: CoreTypes.LengthType): string;
-	} = convertToStringCommon;
-}
-
 function isNonNegativeFiniteNumber(value: number): boolean {
 	return isFinite(value) && !isNaN(value) && value >= 0;
 }
diff --git a/packages/core/ui/styling/style-scope.ts b/packages/core/ui/styling/style-scope.ts
index 08eaecd397..518f41d2dd 100644
--- a/packages/core/ui/styling/style-scope.ts
+++ b/packages/core/ui/styling/style-scope.ts
@@ -1,13 +1,14 @@
 import { ViewBase } from '../core/view-base';
 import { View } from '../core/view';
-import { unsetValue, _evaluateCssVariableExpression, _evaluateCssCalcExpression, isCssVariable, isCssVariableExpression, isCssCalcExpression } from '../core/properties';
+import { _evaluateCssVariableExpression, _evaluateCssCalcExpression, isCssVariable, isCssVariableExpression, isCssCalcExpression } from '../core/properties';
+import { unsetValue } from '../core/properties/property-shared';
 import * as ReworkCSS from '../../css';
 
 import { RuleSet, StyleSheetSelectorScope, SelectorCore, SelectorsMatch, ChangeMap, fromAstNode, Node, MEDIA_QUERY_SEPARATOR, matchMediaQueryString } from './css-selector';
-import { Trace } from '../../trace';
+import { Trace, CoreTypes } from './styling-shared';
 import { File, knownFolders, path } from '../../file-system';
 import { Application, CssChangedEventData, LoadAppCSSEventData } from '../../application';
-import { profile } from '../../profiling';
+import { profile } from './styling-profile';
 
 import * as kam from '../animation/keyframe-animation';
 let keyframeAnimationModule: typeof kam;
diff --git a/packages/core/ui/styling/style/index.ts b/packages/core/ui/styling/style/index.ts
index 2090d3efe8..a9cebac744 100644
--- a/packages/core/ui/styling/style/index.ts
+++ b/packages/core/ui/styling/style/index.ts
@@ -1,4 +1,3 @@
-import { Style as StyleDefinition } from '.';
 import { Color } from '../../../color';
 import { Font, FontStyleType, FontWeightType, FontVariationSettingsType } from '../font';
 import { Background } from '../background';
@@ -9,7 +8,7 @@ import { Observable } from '../../../data/observable';
 import { FlexDirection, FlexWrap, JustifyContent, AlignItems, AlignContent, Order, FlexGrow, FlexShrink, FlexWrapBefore, AlignSelf, FlexFlow, Flex } from '../../layouts/flexbox-layout';
 import { Trace } from '../../../trace';
 import { CoreTypes } from '../../../core-types';
-import { AccessibilityLiveRegion, AccessibilityRole, AccessibilityState } from '../../../accessibility/accessibility-types';
+import { AccessibilityLiveRegion, AccessibilityRole, AccessibilityState } from '../../../accessibility';
 import { ShadowCSSValues } from '../css-shadow';
 import { StrokeCSSValues } from '../css-stroke';
 import { ClipPathFunction } from '../clip-path-function';
@@ -35,7 +34,7 @@ export interface CommonLayoutParams {
 	verticalAlignment: CoreTypes.VerticalAlignmentType;
 }
 
-export class Style extends Observable implements StyleDefinition {
+export class Style extends Observable {
 	private unscopedCssVariables = new Map<string, string>();
 	private scopedCssVariables = new Map<string, string>();
 
diff --git a/packages/core/ui/styling/styling-profile.ts b/packages/core/ui/styling/styling-profile.ts
new file mode 100644
index 0000000000..9541ec9cfd
--- /dev/null
+++ b/packages/core/ui/styling/styling-profile.ts
@@ -0,0 +1,4 @@
+// This file exists to break cycles caused by importing profiling into style-scope.ts.
+// Only put the @profile decorator and related logic here.
+
+export { profile } from '../../profiling';
diff --git a/packages/core/ui/styling/styling-shared.ts b/packages/core/ui/styling/styling-shared.ts
new file mode 100644
index 0000000000..2c83f33093
--- /dev/null
+++ b/packages/core/ui/styling/styling-shared.ts
@@ -0,0 +1,7 @@
+// Shared helpers and types for styling, used by both styling and view/dialogs/frame modules.
+// Only put platform-agnostic logic here.
+
+import { Trace } from '../../trace';
+import { CoreTypes } from '../../core-types';
+
+export { Trace, CoreTypes };
diff --git a/packages/core/ui/switch/index.ios.ts b/packages/core/ui/switch/index.ios.ts
index 242b9aabdc..c88fcb4895 100644
--- a/packages/core/ui/switch/index.ios.ts
+++ b/packages/core/ui/switch/index.ios.ts
@@ -1,12 +1,11 @@
 import { SwitchBase, checkedProperty, offBackgroundColorProperty } from './switch-common';
 import { colorProperty, backgroundColorProperty, backgroundInternalProperty } from '../styling/style-properties';
 import { Color } from '../../color';
-import { iOSNativeHelper, layout } from '../../utils';
+import { layout } from '../../utils';
+import { SDK_VERSION } from '../../utils/constants';
 
 export * from './switch-common';
 
-const majorVersion = iOSNativeHelper.MajorVersion;
-
 @NativeClass
 class SwitchChangeHandlerImpl extends NSObject {
 	private _owner: WeakRef<Switch>;
@@ -75,7 +74,7 @@ export class Switch extends SwitchBase {
 		// only add :checked pseudo handling on supported iOS versions
 		// ios <13 works but causes glitchy animations when toggling
 		// so we decided to keep the old behavior on older versions.
-		if (majorVersion >= 13) {
+		if (SDK_VERSION >= 13) {
 			super._onCheckedPropertyChanged(newValue);
 
 			if (this.offBackgroundColor) {
@@ -130,7 +129,7 @@ export class Switch extends SwitchBase {
 		return this.nativeViewProtected.onTintColor;
 	}
 	[backgroundColorProperty.setNative](value: UIColor | Color) {
-		if (majorVersion >= 13) {
+		if (SDK_VERSION >= 13) {
 			if (!this.offBackgroundColor || this.checked) {
 				this.setNativeBackgroundColor(value);
 			}
@@ -151,7 +150,7 @@ export class Switch extends SwitchBase {
 		return this.nativeViewProtected.backgroundColor;
 	}
 	[offBackgroundColorProperty.setNative](value: Color | UIColor) {
-		if (majorVersion >= 13) {
+		if (SDK_VERSION >= 13) {
 			if (!this.checked) {
 				this.setNativeBackgroundColor(value);
 			}
diff --git a/packages/core/ui/tab-view/index.android.ts b/packages/core/ui/tab-view/index.android.ts
index cc8405311a..95cef93d72 100644
--- a/packages/core/ui/tab-view/index.android.ts
+++ b/packages/core/ui/tab-view/index.android.ts
@@ -8,9 +8,9 @@ import { ImageSource } from '../../image-source';
 import { Trace } from '../../trace';
 import { Color } from '../../color';
 import { fontSizeProperty, fontInternalProperty } from '../styling/style-properties';
-import { RESOURCE_PREFIX, ad, layout } from '../../utils';
+import { RESOURCE_PREFIX, android as androidUtils, layout } from '../../utils';
 import { Frame } from '../frame';
-import { Application } from '../../application';
+import { getNativeApp } from '../../application/helpers-common';
 import { AndroidHelper } from '../core/view';
 
 export * from './tab-view-common';
@@ -284,7 +284,7 @@ function initializeNativeClasses() {
 	}
 
 	PagerAdapter = FragmentPagerAdapter;
-	appResources = Application.android.context.getResources();
+	appResources = (getNativeApp() as android.app.Application).getApplicationContext().getResources();
 }
 
 function createTabItemSpec(item: TabViewItem): org.nativescript.widgets.TabItemSpec {
@@ -293,7 +293,7 @@ function createTabItemSpec(item: TabViewItem): org.nativescript.widgets.TabItemS
 
 	if (item.iconSource) {
 		if (item.iconSource.indexOf(RESOURCE_PREFIX) === 0) {
-			result.iconId = ad.resources.getDrawableId(item.iconSource.substr(RESOURCE_PREFIX.length));
+			result.iconId = androidUtils.resources.getDrawableId(item.iconSource.substr(RESOURCE_PREFIX.length));
 			if (result.iconId === 0) {
 				traceMissingIcon(item.iconSource);
 			}
@@ -315,7 +315,7 @@ let defaultAccentColor: number = undefined;
 function getDefaultAccentColor(context: android.content.Context): number {
 	if (defaultAccentColor === undefined) {
 		//Fallback color: https://developer.android.com/samples/SlidingTabsColors/src/com.example.android.common/view/SlidingTabStrip.html
-		defaultAccentColor = ad.resources.getPaletteColor(ACCENT_COLOR, context) || 0xff33b5e5;
+		defaultAccentColor = androidUtils.resources.getPaletteColor(ACCENT_COLOR, context) || 0xff33b5e5;
 	}
 
 	return defaultAccentColor;
@@ -484,7 +484,7 @@ export class TabView extends TabViewBase {
 		const viewPager = new org.nativescript.widgets.TabViewPager(context);
 		const tabLayout = new org.nativescript.widgets.TabLayout(context);
 		const lp = new org.nativescript.widgets.CommonLayoutParams();
-		const primaryColor = ad.resources.getPaletteColor(PRIMARY_COLOR, context);
+		const primaryColor = androidUtils.resources.getPaletteColor(PRIMARY_COLOR, context);
 		let accentColor = getDefaultAccentColor(context);
 
 		lp.row = 1;
@@ -494,7 +494,7 @@ export class TabView extends TabViewBase {
 				JSON.stringify([
 					{ value: 1, type: 0 /* org.nativescript.widgets.GridUnitType.auto */ },
 					{ value: 1, type: 2 /* org.nativescript.widgets.GridUnitType.star */ },
-				])
+				]),
 			);
 			viewPager.setLayoutParams(lp);
 
@@ -506,7 +506,7 @@ export class TabView extends TabViewBase {
 				JSON.stringify([
 					{ value: 1, type: 2 /* org.nativescript.widgets.GridUnitType.star */ },
 					{ value: 1, type: 0 /* org.nativescript.widgets.GridUnitType.auto */ },
-				])
+				]),
 			);
 			tabLayout.setLayoutParams(lp);
 			viewPager.setSwipePageEnabled(false);
diff --git a/packages/core/ui/text-base/index.android.ts b/packages/core/ui/text-base/index.android.ts
index c3b5aacca4..8e04e007fa 100644
--- a/packages/core/ui/text-base/index.android.ts
+++ b/packages/core/ui/text-base/index.android.ts
@@ -1,13 +1,10 @@
-// Types
 import { getClosestPropertyValue, maxLinesProperty, textOverflowProperty } from './text-base-common';
 import { ShadowCSSValues } from '../styling/css-shadow';
-
-// Requires
 import { Font } from '../styling/font';
-import { backgroundColorProperty } from '../styling/style-properties';
 import { TextBaseCommon, formattedTextProperty, textAlignmentProperty, textDecorationProperty, textProperty, textTransformProperty, textShadowProperty, textStrokeProperty, letterSpacingProperty, whiteSpaceProperty, lineHeightProperty, resetSymbol } from './text-base-common';
 import { Color } from '../../color';
-import { colorProperty, fontSizeProperty, fontInternalProperty, paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, Length } from '../styling/style-properties';
+import { colorProperty, fontSizeProperty, fontInternalProperty, paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty } from '../styling/style-properties';
+import { Length } from '../styling/length-shared';
 import { StrokeCSSValues } from '../styling/css-stroke';
 import { FormattedString } from './formatted-string';
 import { Span } from './span';
@@ -16,7 +13,8 @@ import { layout } from '../../utils';
 import { SDK_VERSION } from '../../utils/constants';
 import { isString, isNullOrUndefined } from '../../utils/types';
 import { accessibilityIdentifierProperty } from '../../accessibility/accessibility-properties';
-import { isCssWideKeyword, testIDProperty } from '../../ui/core/view';
+import { testIDProperty } from '../core/view';
+import { isCssWideKeyword } from '../core/properties/property-shared';
 
 export * from './text-base-common';
 
@@ -423,7 +421,7 @@ export class TextBase extends TextBaseCommon {
 				if (value === 'none' || isCssWideKeyword(value)) {
 					this.nativeTextViewProtected.setPaintFlags(0);
 				} else {
-					this.nativeTextViewProtected.setPaintFlags(value);
+					this.nativeTextViewProtected.setPaintFlags(value as number);
 				}
 				break;
 		}
@@ -458,6 +456,7 @@ export class TextBase extends TextBaseCommon {
 	[paddingTopProperty.getDefault](): CoreTypes.LengthType {
 		return { value: this._defaultPaddingTop, unit: 'px' };
 	}
+	// @ts-expect-error
 	[paddingTopProperty.setNative](value: CoreTypes.LengthType) {
 		org.nativescript.widgets.ViewHelper.setPaddingTop(this.nativeTextViewProtected, Length.toDevicePixels(value, 0) + Length.toDevicePixels(this.style.borderTopWidth, 0));
 	}
@@ -465,6 +464,7 @@ export class TextBase extends TextBaseCommon {
 	[paddingRightProperty.getDefault](): CoreTypes.LengthType {
 		return { value: this._defaultPaddingRight, unit: 'px' };
 	}
+	// @ts-expect-error
 	[paddingRightProperty.setNative](value: CoreTypes.LengthType) {
 		org.nativescript.widgets.ViewHelper.setPaddingRight(this.nativeTextViewProtected, Length.toDevicePixels(value, 0) + Length.toDevicePixels(this.style.borderRightWidth, 0));
 	}
@@ -472,6 +472,7 @@ export class TextBase extends TextBaseCommon {
 	[paddingBottomProperty.getDefault](): CoreTypes.LengthType {
 		return { value: this._defaultPaddingBottom, unit: 'px' };
 	}
+	// @ts-expect-error
 	[paddingBottomProperty.setNative](value: CoreTypes.LengthType) {
 		org.nativescript.widgets.ViewHelper.setPaddingBottom(this.nativeTextViewProtected, Length.toDevicePixels(value, 0) + Length.toDevicePixels(this.style.borderBottomWidth, 0));
 	}
@@ -479,6 +480,7 @@ export class TextBase extends TextBaseCommon {
 	[paddingLeftProperty.getDefault](): CoreTypes.LengthType {
 		return { value: this._defaultPaddingLeft, unit: 'px' };
 	}
+	// @ts-expect-error
 	[paddingLeftProperty.setNative](value: CoreTypes.LengthType) {
 		org.nativescript.widgets.ViewHelper.setPaddingLeft(this.nativeTextViewProtected, Length.toDevicePixels(value, 0) + Length.toDevicePixels(this.style.borderLeftWidth, 0));
 	}
diff --git a/packages/core/ui/text-base/index.ios.ts b/packages/core/ui/text-base/index.ios.ts
index 89a3b33197..79a11c5844 100644
--- a/packages/core/ui/text-base/index.ios.ts
+++ b/packages/core/ui/text-base/index.ios.ts
@@ -9,17 +9,16 @@ import { TextBaseCommon, textProperty, formattedTextProperty, textAlignmentPrope
 import { Color } from '../../color';
 import { FormattedString } from './formatted-string';
 import { Span } from './span';
-import { colorProperty, fontInternalProperty, fontScaleInternalProperty, Length } from '../styling/style-properties';
+import { colorProperty, fontInternalProperty, fontScaleInternalProperty } from '../styling/style-properties';
+import { Length } from '../styling/length-shared';
 import { StrokeCSSValues } from '../styling/css-stroke';
 import { isString, isNullOrUndefined } from '../../utils/types';
-import { iOSNativeHelper, layout } from '../../utils';
-import { Trace } from '../../trace';
+import { layout } from '../../utils';
+import { SDK_VERSION } from '../../utils/constants';
 import { CoreTypes } from '../../core-types';
 
 export * from './text-base-common';
 
-const majorVersion = iOSNativeHelper.MajorVersion;
-
 @NativeClass
 class UILabelClickHandlerImpl extends NSObject {
 	private _owner: WeakRef<TextBase>;
@@ -350,7 +349,7 @@ export class TextBase extends TextBaseCommon {
 				const text = getTransformedText(isNullOrUndefined(this.text) ? '' : `${this.text}`, this.textTransform);
 				this.nativeTextViewProtected.nativeScriptSetTextDecorationAndTransformTextDecorationLetterSpacingLineHeight(text, this.style.textDecoration || '', letterSpacing, lineHeight);
 
-				if (!this.style?.color && majorVersion >= 13 && UIColor.labelColor) {
+				if (!this.style?.color && SDK_VERSION >= 13 && UIColor.labelColor) {
 					this._setColor(UIColor.labelColor);
 				}
 			}
diff --git a/packages/core/ui/text-view/index.ios.ts b/packages/core/ui/text-view/index.ios.ts
index d894cece54..91b6d3b049 100644
--- a/packages/core/ui/text-view/index.ios.ts
+++ b/packages/core/ui/text-view/index.ios.ts
@@ -5,7 +5,7 @@ import { editableProperty, hintProperty, placeholderColorProperty, _updateCharac
 import { CoreTypes } from '../../core-types';
 import { CSSType } from '../core/view';
 import { Color } from '../../color';
-import { colorProperty, borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty, Length } from '../styling/style-properties';
+import { colorProperty, borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty } from '../styling/style-properties';
 import { layout, isRealDevice } from '../../utils';
 import { SDK_VERSION } from '../../utils/constants';
 
diff --git a/packages/core/utils/android/index.ts b/packages/core/utils/android/index.ts
deleted file mode 100644
index fc32ddbf1f..0000000000
--- a/packages/core/utils/android/index.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-import { Application } from '../../application';
-import { Trace } from '../../trace';
-import { topmost } from '../../ui/frame/frame-stack';
-
-let application: android.app.Application;
-let applicationContext: android.content.Context;
-let contextResources: android.content.res.Resources;
-let packageName: string;
-
-export function getApplicationContext() {
-	if (!applicationContext) {
-		applicationContext = getApplication().getApplicationContext();
-	}
-
-	return applicationContext;
-}
-export function getCurrentActivity() {
-	if (!Application) {
-		return null;
-	}
-	return Application.android.foregroundActivity || Application.android.startActivity;
-}
-export function getApplication() {
-	if (!application) {
-		application = Application.android.getNativeApplication();
-	}
-
-	return application;
-}
-export function getResources() {
-	if (!contextResources) {
-		contextResources = getApplication().getResources();
-	}
-
-	return contextResources;
-}
-export function getPackageName() {
-	if (!packageName) {
-		packageName = getApplicationContext().getPackageName();
-	}
-
-	return packageName;
-}
-
-let inputMethodManager: android.view.inputmethod.InputMethodManager;
-export function getInputMethodManager(): android.view.inputmethod.InputMethodManager {
-	if (!inputMethodManager) {
-		inputMethodManager = <android.view.inputmethod.InputMethodManager>getApplicationContext().getSystemService(android.content.Context.INPUT_METHOD_SERVICE);
-	}
-
-	return inputMethodManager;
-}
-
-export function showSoftInput(nativeView: android.view.View): void {
-	const inputManager = getInputMethodManager();
-	if (inputManager && nativeView instanceof android.view.View) {
-		inputManager.showSoftInput(nativeView, android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT);
-	}
-}
-
-export function dismissSoftInput(nativeView?: android.view.View): void {
-	const inputManager = getInputMethodManager();
-	let windowToken: android.os.IBinder;
-
-	if (nativeView instanceof android.view.View) {
-		if (!nativeView.hasFocus()) {
-			return;
-		}
-		windowToken = nativeView.getWindowToken();
-	} else if (getCurrentActivity() instanceof androidx.appcompat.app.AppCompatActivity) {
-		const modalDialog = (topmost()?._modalParent ?? (topmost()?.modal as any))?._dialogFragment?.getDialog();
-		const window = (modalDialog ?? getCurrentActivity()).getWindow();
-		const decorView = window.getDecorView();
-		if (decorView) {
-			windowToken = decorView.getWindowToken();
-			decorView.requestFocus();
-		} else {
-			windowToken = null;
-		}
-	}
-
-	if (inputManager && windowToken) {
-		inputManager.hideSoftInputFromWindow(windowToken, 0);
-	}
-}
-
-export namespace collections {
-	export function stringArrayToStringSet(str: string[]): java.util.HashSet<string> {
-		const hashSet = new java.util.HashSet<string>();
-		if (str !== undefined) {
-			for (const element in str) {
-				hashSet.add('' + str[element]);
-			}
-		}
-
-		return hashSet;
-	}
-
-	export function stringSetToStringArray(stringSet: any): string[] {
-		const arr = [];
-		if (stringSet !== undefined) {
-			const it = stringSet.iterator();
-			while (it.hasNext()) {
-				const element = '' + it.next();
-				arr.push(element);
-			}
-		}
-
-		return arr;
-	}
-}
-
-export namespace resources {
-	let attr;
-	const attrCache = new Map<string, number>();
-
-	export function getDrawableId(name) {
-		return getId(':drawable/' + name);
-	}
-
-	export function getStringId(name) {
-		return getId(':string/' + name);
-	}
-
-	export function getId(name: string): number {
-		const resources = getResources();
-		const packageName = getPackageName();
-		const uri = packageName + name;
-
-		return resources.getIdentifier(uri, null, null);
-	}
-	export function getResource(name: string, type?: string): number {
-		return getResources().getIdentifier(name, type, getPackageName());
-	}
-	export function getPalleteColor(name: string, context: android.content.Context): number {
-		return getPaletteColor(name, context);
-	}
-	export function getPaletteColor(name: string, context: android.content.Context): number {
-		if (attrCache.has(name)) {
-			return attrCache.get(name);
-		}
-
-		let result = 0;
-		try {
-			if (!attr) {
-				attr = java.lang.Class.forName('androidx.appcompat.R$attr');
-			}
-
-			let colorID = 0;
-			const field = attr.getField(name);
-			if (field) {
-				colorID = field.getInt(null);
-			}
-
-			if (colorID) {
-				const typedValue = new android.util.TypedValue();
-				context.getTheme().resolveAttribute(colorID, typedValue, true);
-				result = typedValue.data;
-			}
-		} catch (ex) {
-			Trace.write('Cannot get pallete color: ' + name, Trace.categories.Error, Trace.messageType.error);
-		}
-
-		attrCache.set(name, result);
-
-		return result;
-	}
-}
-
-export function isRealDevice(): boolean {
-	const fingerprint = android.os.Build.FINGERPRINT;
-
-	return fingerprint != null && (fingerprint.indexOf('vbox') > -1 || fingerprint.indexOf('generic') > -1);
-}
diff --git a/packages/core/utils/common.ts b/packages/core/utils/common.ts
index 2f8f46379d..2b1102633e 100644
--- a/packages/core/utils/common.ts
+++ b/packages/core/utils/common.ts
@@ -101,20 +101,6 @@ export function isDataURI(uri: string): boolean {
 	return firstSegment && firstSegment.indexOf('data:') === 0 && firstSegment.indexOf('base64') >= 0;
 }
 
-/**
- * Get file extension from file path
- * @param path file path
- * @returns file extension
- */
-export function getFileExtension(path: string): string {
-	const dotIndex = path.lastIndexOf('.');
-	if (dotIndex && dotIndex >= 0 && dotIndex < path.length) {
-		return path.substring(dotIndex);
-	}
-
-	return '';
-}
-
 export function mergeSort(arr, compareFunc) {
 	if (arr.length < 2) {
 		return arr;
@@ -292,3 +278,5 @@ export function getDurationWithDampingFromSpring(springSettings?: { tension?: nu
 		damping,
 	};
 }
+
+export { getFileExtension } from './utils-shared';
diff --git a/packages/core/utils/debug-source.ts b/packages/core/utils/debug-source.ts
new file mode 100644
index 0000000000..7f3f3747c8
--- /dev/null
+++ b/packages/core/utils/debug-source.ts
@@ -0,0 +1,73 @@
+// This file exists to break cycles between debug.ts and file-system.
+// Only put logic here that depends on file-system (e.g., knownFolders).
+import { knownFolders } from '../file-system';
+
+let applicationRootPath: string;
+function ensureAppRootPath() {
+	if (!applicationRootPath) {
+		applicationRootPath = knownFolders.currentApp().path;
+		applicationRootPath = applicationRootPath.substring(0, applicationRootPath.length - 'app/'.length);
+	}
+}
+
+export class Source {
+	private _uri: string;
+	private _line: number;
+	private _column: number;
+
+	private static _source = Symbol('source');
+
+	constructor(uri: string, line: number, column: number) {
+		ensureAppRootPath();
+
+		if (uri.length > applicationRootPath.length && uri.substring(0, applicationRootPath.length) === applicationRootPath) {
+			this._uri = 'file://' + uri.substring(applicationRootPath.length);
+		} else {
+			this._uri = uri;
+		}
+		this._line = line;
+		this._column = column;
+	}
+
+	get uri(): string {
+		return this._uri;
+	}
+	get line(): number {
+		return this._line;
+	}
+	get column(): number {
+		return this._column;
+	}
+
+	public toString() {
+		return this._uri + ':' + this._line + ':' + this._column;
+	}
+
+	public static get(object: any): Source {
+		return object[Source._source];
+	}
+
+	public static set(object: any, src: Source) {
+		object[Source._source] = src;
+	}
+}
+
+export class ScopeError extends Error {
+	constructor(inner: Error, message?: string) {
+		let formattedMessage;
+		if (message && inner.message) {
+			formattedMessage = message + '\n > ' + inner.message.replace('\n', '\n  ');
+		} else {
+			formattedMessage = message || inner.message || undefined;
+		}
+		super(formattedMessage);
+		this.stack = __ANDROID__ ? 'Error: ' + this.message + '\n' + inner.stack.substr(inner.stack.indexOf('\n') + 1) : inner.stack;
+		this.message = formattedMessage;
+	}
+}
+
+export class SourceError extends ScopeError {
+	constructor(child: Error, source: Source, message?: string) {
+		super(child, message ? message + ' @' + source + '' : source + '');
+	}
+}
diff --git a/packages/core/utils/debug.ts b/packages/core/utils/debug.ts
index c830a0a673..43030b4722 100644
--- a/packages/core/utils/debug.ts
+++ b/packages/core/utils/debug.ts
@@ -1,73 +1,2 @@
-import { knownFolders } from '../file-system';
-
 export const debug = true;
-
-let applicationRootPath: string;
-function ensureAppRootPath() {
-	if (!applicationRootPath) {
-		applicationRootPath = knownFolders.currentApp().path;
-		applicationRootPath = applicationRootPath.substring(0, applicationRootPath.length - 'app/'.length);
-	}
-}
-
-export class Source {
-	private _uri: string;
-	private _line: number;
-	private _column: number;
-
-	private static _source = Symbol('source');
-
-	constructor(uri: string, line: number, column: number) {
-		ensureAppRootPath();
-
-		if (uri.length > applicationRootPath.length && uri.substring(0, applicationRootPath.length) === applicationRootPath) {
-			this._uri = 'file://' + uri.substring(applicationRootPath.length);
-		} else {
-			this._uri = uri;
-		}
-		this._line = line;
-		this._column = column;
-	}
-
-	get uri(): string {
-		return this._uri;
-	}
-	get line(): number {
-		return this._line;
-	}
-	get column(): number {
-		return this._column;
-	}
-
-	public toString() {
-		return this._uri + ':' + this._line + ':' + this._column;
-	}
-
-	public static get(object: any): Source {
-		return object[Source._source];
-	}
-
-	public static set(object: any, src: Source) {
-		object[Source._source] = src;
-	}
-}
-
-export class ScopeError extends Error {
-	constructor(inner: Error, message?: string) {
-		let formattedMessage;
-		if (message && inner.message) {
-			formattedMessage = message + '\n > ' + inner.message.replace('\n', '\n  ');
-		} else {
-			formattedMessage = message || inner.message || undefined;
-		}
-		super(formattedMessage);
-		this.stack = __ANDROID__ ? 'Error: ' + this.message + '\n' + inner.stack.substr(inner.stack.indexOf('\n') + 1) : inner.stack;
-		this.message = formattedMessage;
-	}
-}
-
-export class SourceError extends ScopeError {
-	constructor(child: Error, source: Source, message?: string) {
-		super(child, message ? message + ' @' + source + '' : source + '');
-	}
-}
+export { Source, ScopeError, SourceError } from './debug-source';
diff --git a/packages/core/utils/index.android.ts b/packages/core/utils/index.android.ts
index bb0826e443..e2e3b7100f 100644
--- a/packages/core/utils/index.android.ts
+++ b/packages/core/utils/index.android.ts
@@ -185,10 +185,6 @@ Please ensure you have your manifest correctly configured with the FileProvider.
 	}
 }
 
-export function isRealDevice(): boolean {
-	return AndroidUtils.isRealDevice();
-}
-
 export function dismissSoftInput(nativeView?: any): void {
 	AndroidUtils.dismissSoftInput(nativeView);
 }
diff --git a/packages/core/utils/index.ios.ts b/packages/core/utils/index.ios.ts
index 891247f67e..3906265366 100644
--- a/packages/core/utils/index.ios.ts
+++ b/packages/core/utils/index.ios.ts
@@ -1,5 +1,5 @@
 import { Trace } from '../trace';
-import { ios as iOSUtils } from './native-helper';
+import { ios as iOSUtils, isRealDevice } from './native-helper';
 
 export { clearInterval, clearTimeout, setInterval, setTimeout } from '../timer';
 export * from './common';
@@ -8,13 +8,14 @@ export * from './debug';
 export * from './layout-helper';
 export * from './macrotask-scheduler';
 export * from './mainthread-helper';
-export * from './native-helper';
+export * from './native-helper'; // do not re-export getWindow here, use ios-helper.ts for that
 export * from './types';
+export * from './native-helper';
 
 export function openFile(filePath: string): boolean {
 	try {
 		const appPath = iOSUtils.getCurrentAppPath();
-		const path = iOSUtils.isRealDevice() ? filePath.replace('~', appPath) : filePath;
+		const path = isRealDevice() ? filePath.replace('~', appPath) : filePath;
 
 		const controller = UIDocumentInteractionController.interactionControllerWithURL(NSURL.fileURLWithPath(path));
 		controller.delegate = iOSUtils.createUIDocumentInteractionControllerDelegate();
@@ -69,10 +70,6 @@ export function openUrlAsync(location: string): Promise<boolean> {
 	});
 }
 
-export function isRealDevice(): boolean {
-	return iOSUtils.isRealDevice();
-}
-
 export const ad = 0;
 
 export function dismissSoftInput(nativeView?: UIView): void {
diff --git a/packages/core/utils/ios-helper.ts b/packages/core/utils/ios-helper.ts
new file mode 100644
index 0000000000..2073d41c79
--- /dev/null
+++ b/packages/core/utils/ios-helper.ts
@@ -0,0 +1 @@
+export { getWindow } from './native-helper';
diff --git a/packages/core/utils/ios/index.ts b/packages/core/utils/ios/index.ts
deleted file mode 100644
index df13b1ea9f..0000000000
--- a/packages/core/utils/ios/index.ts
+++ /dev/null
@@ -1,264 +0,0 @@
-import { Color } from '../../color';
-import { Trace } from '../../trace';
-import { CORE_ANIMATION_DEFAULTS, getDurationWithDampingFromSpring } from '../common';
-import { SDK_VERSION } from '../constants';
-
-declare let UIImagePickerControllerSourceType: any;
-
-const radToDeg = Math.PI / 180;
-
-function isOrientationLandscape(orientation: number) {
-	return orientation === UIDeviceOrientation.LandscapeLeft /* 3 */ || orientation === UIDeviceOrientation.LandscapeRight /* 4 */;
-}
-
-function openFileAtRootModule(filePath: string): boolean {
-	try {
-		const appPath = getCurrentAppPath();
-		const path = isRealDevice() ? filePath.replace('~', appPath) : filePath;
-
-		const controller = UIDocumentInteractionController.interactionControllerWithURL(NSURL.fileURLWithPath(path));
-		controller.delegate = createUIDocumentInteractionControllerDelegate();
-
-		return controller.presentPreviewAnimated(true);
-	} catch (e) {
-		Trace.write('Error in openFile', Trace.categories.Error, Trace.messageType.error);
-	}
-
-	return false;
-}
-// TODO: remove for NativeScript 9.0
-export function getter<T>(_this: any, property: T | { (): T }): T {
-	console.log('utils.ios.getter() is deprecated; use the respective native property instead');
-	if (typeof property === 'function') {
-		return (<{ (): T }>property).call(_this);
-	} else {
-		return <T>property;
-	}
-}
-
-export namespace collections {
-	export function jsArrayToNSArray<T>(str: T[]): NSArray<T> {
-		return NSArray.arrayWithArray(str);
-	}
-
-	export function nsArrayToJSArray<T>(a: NSArray<T>): Array<T> {
-		const arr = [];
-		if (a !== undefined) {
-			const count = a.count;
-			for (let i = 0; i < count; i++) {
-				arr.push(a.objectAtIndex(i));
-			}
-		}
-
-		return arr;
-	}
-}
-
-export function getRootViewController(): UIViewController {
-	const win = getWindow();
-	let vc = win && win.rootViewController;
-	while (vc && vc.presentedViewController) {
-		vc = vc.presentedViewController;
-	}
-	return vc;
-}
-
-export function getWindow(): UIWindow {
-	let window: UIWindow;
-	if (SDK_VERSION >= 15 && typeof NativeScriptViewFactory !== 'undefined') {
-		// UIWindowScene.keyWindow is only available 15+
-		window = NativeScriptViewFactory.getKeyWindow();
-	}
-	if (window) {
-		return window;
-	}
-	const app = UIApplication.sharedApplication;
-	if (!app) {
-		return;
-	}
-	return app.keyWindow || (app.windows && app.windows.count > 0 && app.windows.objectAtIndex(0));
-}
-
-export function getMainScreen(): UIScreen {
-	const window = getWindow();
-	return window ? window.screen : UIScreen.mainScreen;
-}
-
-export function setWindowBackgroundColor(value: string) {
-	const win = getWindow();
-	if (win) {
-		const bgColor = new Color(value);
-		win.backgroundColor = bgColor.ios;
-		const rootVc = getRootViewController();
-		if (rootVc?.view) {
-			rootVc.view.backgroundColor = bgColor.ios;
-		}
-	}
-}
-
-export function isLandscape(): boolean {
-	console.log('utils.ios.isLandscape() is deprecated; use application.orientation instead');
-
-	const deviceOrientation = UIDevice.currentDevice.orientation;
-	const statusBarOrientation = UIApplication.sharedApplication.statusBarOrientation;
-
-	const isDeviceOrientationLandscape = isOrientationLandscape(deviceOrientation);
-	const isStatusBarOrientationLandscape = isOrientationLandscape(statusBarOrientation);
-
-	return isDeviceOrientationLandscape || isStatusBarOrientationLandscape;
-}
-
-/**
- * @deprecated use Utils.SDK_VERSION instead which is a float of the {major}.{minor} verison
- */
-export const MajorVersion = NSString.stringWithString(UIDevice.currentDevice.systemVersion).intValue;
-
-export function openFile(filePath: string): boolean {
-	console.log('utils.ios.openFile() is deprecated; use utils.openFile() instead');
-
-	return openFileAtRootModule(filePath);
-}
-
-export function getCurrentAppPath(): string {
-	const currentDir = __dirname;
-	const tnsModulesIndex = currentDir.indexOf('/tns_modules');
-
-	// Module not hosted in ~/tns_modules when bundled. Use current dir.
-	let appPath = currentDir;
-	if (tnsModulesIndex !== -1) {
-		// Strip part after tns_modules to obtain app root
-		appPath = currentDir.substring(0, tnsModulesIndex);
-	}
-
-	return appPath;
-}
-
-export function joinPaths(...paths: string[]): string {
-	if (!paths || paths.length === 0) {
-		return '';
-	}
-
-	return NSString.stringWithString(NSString.pathWithComponents(<any>paths)).stringByStandardizingPath;
-}
-
-export function getVisibleViewController(rootViewController: UIViewController): UIViewController {
-	let viewController = rootViewController;
-
-	while (viewController && viewController.presentedViewController) {
-		viewController = viewController.presentedViewController;
-	}
-	return viewController;
-}
-
-export function applyRotateTransform(transform: CATransform3D, x: number, y: number, z: number): CATransform3D {
-	if (x) {
-		transform = CATransform3DRotate(transform, x * radToDeg, 1, 0, 0);
-	}
-
-	if (y) {
-		transform = CATransform3DRotate(transform, y * radToDeg, 0, 1, 0);
-	}
-
-	if (z) {
-		transform = CATransform3DRotate(transform, z * radToDeg, 0, 0, 1);
-	}
-
-	return transform;
-}
-
-export function createUIDocumentInteractionControllerDelegate(): NSObject {
-	@NativeClass
-	class UIDocumentInteractionControllerDelegateImpl extends NSObject implements UIDocumentInteractionControllerDelegate {
-		public static ObjCProtocols = [UIDocumentInteractionControllerDelegate];
-
-		public getViewController(): UIViewController {
-			return getWindow().rootViewController;
-		}
-
-		public documentInteractionControllerViewControllerForPreview(controller: UIDocumentInteractionController) {
-			return this.getViewController();
-		}
-
-		public documentInteractionControllerViewForPreview(controller: UIDocumentInteractionController) {
-			return this.getViewController().view;
-		}
-
-		public documentInteractionControllerRectForPreview(controller: UIDocumentInteractionController): CGRect {
-			return this.getViewController().view.frame;
-		}
-	}
-	return new UIDocumentInteractionControllerDelegateImpl();
-}
-
-export function isRealDevice() {
-	try {
-		if (NSProcessInfo.processInfo.environment.valueForKey('SIMULATOR_DEVICE_NAME')) {
-			return false;
-		}
-		return true;
-	} catch (e) {
-		return true;
-	}
-}
-
-export function printCGRect(rect: CGRect) {
-	if (rect) {
-		return `CGRect(${rect.origin.x} ${rect.origin.y} ${rect.size.width} ${rect.size.height})`;
-	}
-}
-
-export function snapshotView(view: UIView, scale: number): UIImage {
-	if (view instanceof UIImageView) {
-		return view.image;
-	}
-	// console.log('snapshotView view.frame:', printRect(view.frame));
-	const originalOpacity = view.layer.opacity;
-	view.layer.opacity = originalOpacity > 0 ? originalOpacity : 1;
-	UIGraphicsBeginImageContextWithOptions(CGSizeMake(view.frame.size.width, view.frame.size.height), false, scale);
-	view.layer.renderInContext(UIGraphicsGetCurrentContext());
-	const image = UIGraphicsGetImageFromCurrentImageContext();
-	UIGraphicsEndImageContext();
-	setTimeout(() => {
-		// ensure set back properly on next tick
-		view.layer.opacity = originalOpacity;
-	});
-	return image;
-}
-
-export function copyLayerProperties(view: UIView, toView: UIView, customProperties?: { view?: Array<keyof UIView>; layer?: Array<keyof CALayer> }) {
-	const viewPropertiesToMatch: Array<keyof UIView> = customProperties?.view || ['backgroundColor'];
-	const layerPropertiesToMatch: Array<keyof CALayer> = customProperties?.layer || ['cornerRadius', 'borderWidth', 'borderColor'];
-
-	viewPropertiesToMatch.forEach((property) => {
-		if (view[property] !== toView[property]) {
-			// console.log('|    -- matching view property:', property);
-			view[property as any] = toView[property];
-		}
-	});
-
-	layerPropertiesToMatch.forEach((property) => {
-		if (view.layer[property] !== toView.layer[property]) {
-			// console.log('|    -- matching layer property:', property);
-			view.layer[property as any] = toView.layer[property];
-		}
-	});
-}
-
-export function animateWithSpring(options?: { tension?: number; friction?: number; mass?: number; delay?: number; velocity?: number; animateOptions?: UIViewAnimationOptions; animations?: () => void; completion?: (finished?: boolean) => void }) {
-	// for convenience, default spring settings are provided
-	const opt = {
-		...CORE_ANIMATION_DEFAULTS.spring,
-		delay: 0,
-		animateOptions: null,
-		animations: null,
-		completion: null,
-		...(options || {}),
-	};
-	const { duration, damping } = getDurationWithDampingFromSpring(opt);
-
-	if (duration === 0) {
-		UIView.animateWithDurationAnimationsCompletion(0, opt.animations, opt.completion);
-		return;
-	}
-	UIView.animateWithDurationDelayUsingSpringWithDampingInitialSpringVelocityOptionsAnimationsCompletion(duration, opt.delay, damping, opt.velocity, opt.animateOptions, opt.animations, opt.completion);
-}
diff --git a/packages/core/utils/layout-helper/index.android.ts b/packages/core/utils/layout-helper/index.android.ts
index 825858729a..f80e692bfc 100644
--- a/packages/core/utils/layout-helper/index.android.ts
+++ b/packages/core/utils/layout-helper/index.android.ts
@@ -46,7 +46,7 @@ export namespace layout {
 			return size + mode;
 		}
 
-		return (size & ~layoutCommon.MODE_MASK) | (mode & layoutCommon.MODE_MASK);
+		return (size & ~MODE_MASK) | (mode & MODE_MASK);
 	}
 
 	export function getDisplayDensity(): number {
diff --git a/packages/core/utils/layout-helper/index.d.ts b/packages/core/utils/layout-helper/index.d.ts
index a0cf473cd4..1121e73268 100644
--- a/packages/core/utils/layout-helper/index.d.ts
+++ b/packages/core/utils/layout-helper/index.d.ts
@@ -7,13 +7,15 @@ export namespace layout {
 	/**
 	 * Bits that provide the actual measured size.
 	 */
-	export const MEASURED_HEIGHT_STATE_SHIFT: number;
-	export const MEASURED_SIZE_MASK: number;
-	export const MEASURED_STATE_MASK: number;
-	export const MEASURED_STATE_TOO_SMALL: number;
+	export const MODE_SHIFT: number;
+	export const MODE_MASK: number;
 	export const UNSPECIFIED: number;
 	export const EXACTLY: number;
 	export const AT_MOST: number;
+	export const MEASURED_HEIGHT_STATE_SHIFT: number;
+	export const MEASURED_STATE_TOO_SMALL: number;
+	export const MEASURED_STATE_MASK: number;
+	export const MEASURED_SIZE_MASK: number;
 
 	/**
 	 * Gets layout mode from a given specification as string.
diff --git a/packages/core/utils/layout-helper/index.ios.ts b/packages/core/utils/layout-helper/index.ios.ts
index ea39616e08..ada03c295e 100644
--- a/packages/core/utils/layout-helper/index.ios.ts
+++ b/packages/core/utils/layout-helper/index.ios.ts
@@ -1,5 +1,5 @@
 import * as layoutCommon from './layout-helper-common';
-import { getMainScreen } from '../ios';
+import { ios as iosUtils } from '../native-helper';
 
 export namespace layout {
 	// cache the MeasureSpec constants here, to prevent extensive marshaling calls to and from Objective C
@@ -29,19 +29,19 @@ export namespace layout {
 	}
 
 	export function makeMeasureSpec(size: number, mode: number): number {
-		return (Math.round(Math.max(0, size)) & ~layoutCommon.MODE_MASK) | (mode & layoutCommon.MODE_MASK);
+		return (Math.round(Math.max(0, size)) & ~MODE_MASK) | (mode & MODE_MASK);
 	}
 
 	export function getDisplayDensity(): number {
-		return getMainScreen().scale;
+		return iosUtils.getMainScreen().scale;
 	}
 
 	export function toDevicePixels(value: number): number {
-		return value * getMainScreen().scale;
+		return value * iosUtils.getMainScreen().scale;
 	}
 
 	export function toDeviceIndependentPixels(value: number): number {
-		return value / getMainScreen().scale;
+		return value / iosUtils.getMainScreen().scale;
 	}
 
 	export function round(value: number) {
diff --git a/packages/core/utils/layout-helper/layout-helper-common.ts b/packages/core/utils/layout-helper/layout-helper-common.ts
index bbebccfd5b..ef53a5569b 100644
--- a/packages/core/utils/layout-helper/layout-helper-common.ts
+++ b/packages/core/utils/layout-helper/layout-helper-common.ts
@@ -1,16 +1,6 @@
 // cache the MeasureSpec constants here, to prevent extensive marshaling calls to and from Java
 // TODO: While this boosts the performance it is error-prone in case Google changes these constants
-export const MODE_SHIFT = 30;
-export const MODE_MASK = 0x3 << MODE_SHIFT;
-
-export const UNSPECIFIED = 0 << MODE_SHIFT;
-export const EXACTLY = 1 << MODE_SHIFT;
-export const AT_MOST = 2 << MODE_SHIFT;
-
-export const MEASURED_HEIGHT_STATE_SHIFT = 0x00000010; /* 16 */
-export const MEASURED_STATE_TOO_SMALL = 0x01000000;
-export const MEASURED_STATE_MASK = 0xff000000;
-export const MEASURED_SIZE_MASK = 0x00ffffff;
+import { MODE_MASK, UNSPECIFIED, EXACTLY, AT_MOST } from './layout-helper-shared';
 
 export function getMode(mode: number): string {
 	switch (mode) {
diff --git a/packages/core/utils/layout-helper/layout-helper-shared.ts b/packages/core/utils/layout-helper/layout-helper-shared.ts
new file mode 100644
index 0000000000..6d941784b4
--- /dev/null
+++ b/packages/core/utils/layout-helper/layout-helper-shared.ts
@@ -0,0 +1,13 @@
+// Shared layout constants and helpers for layout-helper, used by both common and platform-specific files.
+// Only put platform-agnostic logic here.
+
+export const MODE_SHIFT = 30;
+export const MODE_MASK = 0x3 << MODE_SHIFT;
+export const UNSPECIFIED = 0 << MODE_SHIFT;
+export const EXACTLY = 1 << MODE_SHIFT;
+export const AT_MOST = 2 << MODE_SHIFT;
+export const MEASURED_HEIGHT_STATE_SHIFT = 0x00000010;
+export const MEASURED_STATE_TOO_SMALL = 0x01000000;
+export const MEASURED_STATE_MASK = 0xff000000;
+export const MEASURED_SIZE_MASK = 0x00ffffff;
+// Add more shared constants/helpers as needed.
diff --git a/packages/core/utils/native-helper.android.ts b/packages/core/utils/native-helper.android.ts
index de702cb1d6..648e1c7738 100644
--- a/packages/core/utils/native-helper.android.ts
+++ b/packages/core/utils/native-helper.android.ts
@@ -1,6 +1,9 @@
-import * as AndroidUtils from './android';
 import { platformCheck } from './platform-check';
 import { numberHasDecimals, numberIs64Bit } from './types';
+import { getNativeApp } from '../application/helpers-common';
+import { androidGetCurrentActivity } from '../application/helpers';
+import { Trace } from '../trace';
+import { topmost } from '../ui/frame/frame-stack';
 
 export function dataDeserialize(nativeData?: any) {
 	if (nativeData === null || typeof nativeData !== 'object') {
@@ -140,12 +143,176 @@ export function dataSerialize(data?: any, wrapPrimitives?: boolean) {
 	}
 }
 
-export import android = AndroidUtils;
+function getApplicationContext() {
+	return getApplication().getApplicationContext();
+}
+function getCurrentActivity() {
+	return androidGetCurrentActivity();
+}
+function getApplication() {
+	return getNativeApp() as android.app.Application;
+}
+function getResources() {
+	return getApplication().getResources();
+}
+let packageName: string;
+function getPackageName() {
+	if (!packageName) {
+		packageName = getApplicationContext().getPackageName();
+	}
+
+	return packageName;
+}
+
+let inputMethodManager: android.view.inputmethod.InputMethodManager;
+function getInputMethodManager(): android.view.inputmethod.InputMethodManager {
+	if (!inputMethodManager) {
+		inputMethodManager = <android.view.inputmethod.InputMethodManager>getApplicationContext().getSystemService(android.content.Context.INPUT_METHOD_SERVICE);
+	}
+
+	return inputMethodManager;
+}
+
+export function getWindow() {
+	return getCurrentActivity()?.getWindow();
+}
+
+function showSoftInput(nativeView: android.view.View): void {
+	const inputManager = getInputMethodManager();
+	if (inputManager && nativeView instanceof android.view.View) {
+		inputManager.showSoftInput(nativeView, android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT);
+	}
+}
+
+function dismissSoftInput(nativeView?: android.view.View): void {
+	const inputManager = getInputMethodManager();
+	let windowToken: android.os.IBinder;
+
+	if (nativeView instanceof android.view.View) {
+		if (!nativeView.hasFocus()) {
+			return;
+		}
+		windowToken = nativeView.getWindowToken();
+	} else if (getCurrentActivity() instanceof androidx.appcompat.app.AppCompatActivity) {
+		const modalDialog = (topmost()?._modalParent ?? (topmost()?.modal as any))?._dialogFragment?.getDialog();
+		const window = (modalDialog ?? getCurrentActivity()).getWindow();
+		const decorView = window.getDecorView();
+		if (decorView) {
+			windowToken = decorView.getWindowToken();
+			decorView.requestFocus();
+		} else {
+			windowToken = null;
+		}
+	}
+
+	if (inputManager && windowToken) {
+		inputManager.hideSoftInputFromWindow(windowToken, 0);
+	}
+}
+
+namespace collections {
+	export function stringArrayToStringSet(str: string[]): java.util.HashSet<string> {
+		const hashSet = new java.util.HashSet<string>();
+		if (str !== undefined) {
+			for (const element in str) {
+				hashSet.add('' + str[element]);
+			}
+		}
+
+		return hashSet;
+	}
+
+	export function stringSetToStringArray(stringSet: any): string[] {
+		const arr = [];
+		if (stringSet !== undefined) {
+			const it = stringSet.iterator();
+			while (it.hasNext()) {
+				const element = '' + it.next();
+				arr.push(element);
+			}
+		}
+
+		return arr;
+	}
+}
+
+namespace resources {
+	let attr;
+	const attrCache = new Map<string, number>();
+
+	export function getDrawableId(name) {
+		return getId(':drawable/' + name);
+	}
+
+	export function getStringId(name) {
+		return getId(':string/' + name);
+	}
+
+	export function getId(name: string): number {
+		const resources = getResources();
+		const packageName = getPackageName();
+		const uri = packageName + name;
+
+		return resources.getIdentifier(uri, null, null);
+	}
+	export function getResource(name: string, type?: string): number {
+		return getResources().getIdentifier(name, type, getPackageName());
+	}
+	export function getPaletteColor(name: string, context: android.content.Context): number {
+		if (attrCache.has(name)) {
+			return attrCache.get(name);
+		}
+
+		let result = 0;
+		try {
+			if (!attr) {
+				attr = java.lang.Class.forName('androidx.appcompat.R$attr');
+			}
+
+			let colorID = 0;
+			const field = attr.getField(name);
+			if (field) {
+				colorID = field.getInt(null);
+			}
+
+			if (colorID) {
+				const typedValue = new android.util.TypedValue();
+				context.getTheme().resolveAttribute(colorID, typedValue, true);
+				result = typedValue.data;
+			}
+		} catch (ex) {
+			Trace.write('Cannot get pallete color: ' + name, Trace.categories.Error, Trace.messageType.error);
+		}
+
+		attrCache.set(name, result);
+
+		return result;
+	}
+}
+
+export function isRealDevice(): boolean {
+	const fingerprint = android.os.Build.FINGERPRINT;
+
+	return fingerprint != null && (fingerprint.indexOf('vbox') > -1 || fingerprint.indexOf('generic') > -1);
+}
+
+export const androidUtils = {
+	resources,
+	getApplication,
+	getCurrentActivity,
+	getApplicationContext,
+	getWindow,
+	getResources,
+	getPackageName,
+	getInputMethodManager,
+	showSoftInput,
+	dismissSoftInput,
+};
 
 /**
  * @deprecated Use `Utils.android` instead.
  */
-export import ad = AndroidUtils;
+export const ad = androidUtils;
 
 // these don't exist on Android.Stub them to empty functions.
 export const iOSNativeHelper = platformCheck('Utils.iOSNativeHelper');
diff --git a/packages/core/utils/native-helper.d.ts b/packages/core/utils/native-helper.d.ts
index c89d7d26c6..52433fb186 100644
--- a/packages/core/utils/native-helper.d.ts
+++ b/packages/core/utils/native-helper.d.ts
@@ -9,6 +9,13 @@ export function dataSerialize(data?: any, wrapPrimitives?: boolean): any;
  */
 export function dataDeserialize(nativeData?: any): any;
 
+/**
+ * Checks whether the application is running on real device and not on emulator.
+ */
+export function isRealDevice(): boolean;
+
+export function getWindow(): UIWindow | android.view.Window;
+
 // /**
 //  * Module with android specific utilities.
 //  */
@@ -94,24 +101,8 @@ export function dataDeserialize(nativeData?: any): any;
 // 		 * @param type - (Optional) type
 // 		 */
 // 		export function getResource(name: string, type?: string): number;
-
-// 		/**
-// 		 * [Obsolete - please use getPaletteColor] Gets a color from current theme.
-// 		 * @param name - Name of the color
-// 		 */
-// 		export function getPalleteColor();
-
-// 		/**
-// 		 * Gets a color from the current theme.
-// 		 * @param name - Name of the color resource.
-// 		 */
-// 		export function getPaletteColor(name: string, context: any /* android.content.Context */): number;
 // 	}
 
-// 	/**
-// 	 * Checks whether the application is running on real device and not on emulator.
-// 	 */
-// 	export function isRealDevice(): boolean;
 // }
 
 // /**
@@ -187,19 +178,6 @@ export function dataDeserialize(nativeData?: any): any;
 // 	 */
 // 	export function openFile(filePath: string): boolean;
 
-// 	/**
-// 	 * Joins an array of file paths.
-// 	 * @param paths An array of paths.
-// 	 * Returns the joined path.
-// 	 */
-// 	export function joinPaths(...paths: string[]): string;
-
-// 	/**
-// 	 * Gets the root folder for the current application. This Folder is private for the application and not accessible from Users/External apps.
-// 	 * iOS - this folder is read-only and contains the app and all its resources.
-// 	 */
-// 	export function getCurrentAppPath(): string;
-
 // 	/**
 // 	 * Gets the currently visible(topmost) UIViewController.
 // 	 * @param rootViewController The root UIViewController instance to start searching from (normally window.rootViewController).
@@ -207,20 +185,6 @@ export function dataDeserialize(nativeData?: any): any;
 // 	 */
 // 	export function getVisibleViewController(rootViewController: any /* UIViewController*/): any; /* UIViewController*/
 
-// 	/**
-// 	 *
-// 	 * @param transform Applies a rotation transform over X,Y and Z axis
-// 	 * @param x Rotation over X axis in degrees
-// 	 * @param y Rotation over Y axis in degrees
-// 	 * @param z Rotation over Z axis in degrees
-// 	 */
-// 	export function applyRotateTransform(transform: any /* CATransform3D*/, x: number, y: number, z: number): any; /* CATransform3D*/
-
-// 	/**
-// 	 * Create a UIDocumentInteractionControllerDelegate implementation for use with UIDocumentInteractionController
-// 	 */
-// 	export function createUIDocumentInteractionControllerDelegate(): any;
-
 // 	/**
 // 	 * Checks whether the application is running on real device and not on simulator.
 // 	 */
@@ -248,33 +212,94 @@ export function dataDeserialize(nativeData?: any): any;
 // 	 */
 // 	export function copyLayerProperties(view: UIView, toView: UIView, customProperties?: { view?: Array<string> /* Array<keyof UIView> */; layer?: Array<string> /* Array<keyof CALayer> */ }): void;
 
-// 	/**
-// 	 * Animate views with a configurable spring effect
-// 	 * @param options various animation settings for the spring
-// 	 * - tension: number
-// 	 * - friction: number
-// 	 * - mass: number
-// 	 * - delay: number
-// 	 * - velocity: number
-// 	 * - animateOptions: UIViewAnimationOptions
-// 	 * - animations: () => void, Callback containing the property changes you want animated
-// 	 * - completion: (finished: boolean) => void, Callback when animation is finished
-// 	 */
-// 	export function animateWithSpring(options?: { tension?: number; friction?: number; mass?: number; delay?: number; velocity?: number; animateOptions?: UIViewAnimationOptions; animations?: () => void; completion?: (finished?: boolean) => void });
 // }
 
-import * as AndroidUtils from './android';
-export import android = AndroidUtils;
+export const android: {
+	resources: {
+		getDrawableId: (name) => number;
+		getStringId: (name) => number;
+		getId: (name: string) => number;
+		getResource: (name: string, type?: string) => number;
+		/**
+		 * Gets a color from the current theme.
+		 * @param name - Name of the color resource.
+		 * @param context - Context to resolve the color.
+		 */
+		getPaletteColor: (name: string, context: android.content.Context) => number;
+	};
+	getApplication: () => android.app.Application;
+	getCurrentActivity: () => androidx.appcompat.app.AppCompatActivity | android.app.Activity | null;
+	getApplicationContext: () => android.content.Context;
+	getWindow: () => android.view.Window;
+	getResources: () => android.content.res.Resources;
+	getPackageName: () => string;
+	getInputMethodManager: () => android.view.inputmethod.InputMethodManager;
+	showSoftInput: (nativeView: android.view.View) => void;
+	dismissSoftInput: (nativeView?: android.view.View) => void;
+};
 
 /**
  * @deprecated use Utils.android instead.
  */
-export import ad = AndroidUtils;
-
-import * as iOSUtils from './ios';
-export import ios = iOSUtils;
+export const ad = android;
+
+export const ios: {
+	collections: {
+		jsArrayToNSArray<T>(str: T[]): NSArray<T>;
+		nsArrayToJSArray<T>(a: NSArray<T>): Array<T>;
+	};
+	/**
+	 * Create a UIDocumentInteractionControllerDelegate implementation for use with UIDocumentInteractionController
+	 */
+	createUIDocumentInteractionControllerDelegate: () => NSObject;
+	/**
+	 * Gets the root folder for the current application. This Folder is private for the application and not accessible from Users/External apps.
+	 * iOS - this folder is read-only and contains the app and all its resources.
+	 */
+	getCurrentAppPath: () => string;
+	getRootViewController: () => UIViewController;
+	getVisibleViewController: (rootViewController: UIViewController) => UIViewController;
+	getWindow: () => UIWindow;
+	getMainScreen: () => UIScreen;
+	setWindowBackgroundColor: (value: string) => void;
+	isLandscape: () => boolean;
+	snapshotView: (view: UIView, scale: number) => UIImage;
+	/**
+	 * Applies a rotation transform over X,Y and Z axis
+	 * @param transform Applies a rotation transform over X,Y and Z axis
+	 * @param x Rotation over X axis in degrees
+	 * @param y Rotation over Y axis in degrees
+	 * @param z Rotation over Z axis in degrees
+	 */
+	applyRotateTransform: (transform: CATransform3D, x: number, y: number, z: number) => CATransform3D;
+	printCGRect: (rect: CGRect) => void;
+	copyLayerProperties: (view: UIView, toView: UIView, customProperties?: { view?: Array<keyof UIView>; layer?: Array<keyof CALayer> }) => void;
+	/**
+	 * Animate views with a configurable spring effect
+	 * @param options various animation settings for the spring
+	 * - tension: number
+	 * - friction: number
+	 * - mass: number
+	 * - delay: number
+	 * - velocity: number
+	 * - animateOptions: UIViewAnimationOptions
+	 * - animations: () => void, Callback containing the property changes you want animated
+	 * - completion: (finished: boolean) => void, Callback when animation is finished
+	 */
+	animateWithSpring: (options?: { tension?: number; friction?: number; mass?: number; delay?: number; velocity?: number; animateOptions?: UIViewAnimationOptions; animations?: () => void; completion?: (finished?: boolean) => void }) => void;
+	/**
+	 * Joins an array of file paths.
+	 * @param paths An array of paths.
+	 * Returns the joined path.
+	 */
+	joinPaths: (...paths: string[]) => string;
+	/**
+	 * @deprecated use Utils.SDK_VERSION instead which is a float of the {major}.{minor} verison
+	 */
+	MajorVersion: number;
+};
 
 /**
  * @deprecated use Utils.ios instead.
  */
-export import iOSNativeHelper = iOSUtils;
+export const iOSNativeHelper = ios;
diff --git a/packages/core/utils/native-helper.ios.ts b/packages/core/utils/native-helper.ios.ts
index 6bc9255528..ee396a4cd3 100644
--- a/packages/core/utils/native-helper.ios.ts
+++ b/packages/core/utils/native-helper.ios.ts
@@ -1,6 +1,9 @@
-import * as iOSUtils from './ios';
 import { platformCheck } from './platform-check';
 import { getClass, isNullOrUndefined, numberHasDecimals, numberIs64Bit } from './types';
+import { Color } from '../color';
+import { Trace } from '../trace';
+import { CORE_ANIMATION_DEFAULTS, getDurationWithDampingFromSpring } from './common';
+import { SDK_VERSION } from './constants';
 
 export function dataDeserialize(nativeData?: any) {
 	if (isNullOrUndefined(nativeData)) {
@@ -88,13 +91,290 @@ export function dataSerialize(data: any, wrapPrimitives: boolean = false) {
 	}
 }
 
+function getCurrentAppPath(): string {
+	const currentDir = __dirname;
+	const tnsModulesIndex = currentDir.indexOf('/tns_modules');
+
+	// Module not hosted in ~/tns_modules when bundled. Use current dir.
+	let appPath = currentDir;
+	if (tnsModulesIndex !== -1) {
+		// Strip part after tns_modules to obtain app root
+		appPath = currentDir.substring(0, tnsModulesIndex);
+	}
+
+	return appPath;
+}
+
+function joinPaths(...paths: string[]): string {
+	if (!paths || paths.length === 0) {
+		return '';
+	}
+
+	return NSString.stringWithString(NSString.pathWithComponents(<any>paths)).stringByStandardizingPath;
+}
+
+declare let UIImagePickerControllerSourceType: any;
+
+const radToDeg = Math.PI / 180;
+
+function isOrientationLandscape(orientation: number) {
+	return orientation === UIDeviceOrientation.LandscapeLeft /* 3 */ || orientation === UIDeviceOrientation.LandscapeRight /* 4 */;
+}
+
+function openFileAtRootModule(filePath: string): boolean {
+	try {
+		const appPath = getCurrentAppPath();
+		const path = isRealDevice() ? filePath.replace('~', appPath) : filePath;
+
+		const controller = UIDocumentInteractionController.interactionControllerWithURL(NSURL.fileURLWithPath(path));
+		controller.delegate = createUIDocumentInteractionControllerDelegate();
+
+		return controller.presentPreviewAnimated(true);
+	} catch (e) {
+		Trace.write('Error in openFile', Trace.categories.Error, Trace.messageType.error);
+	}
+
+	return false;
+}
+// TODO: remove for NativeScript 9.0
+export function getter<T>(_this: any, property: T | { (): T }): T {
+	console.log('utils.ios.getter() is deprecated; use the respective native property instead');
+	if (typeof property === 'function') {
+		return (<{ (): T }>property).call(_this);
+	} else {
+		return <T>property;
+	}
+}
+
+namespace collections {
+	export function jsArrayToNSArray<T>(str: T[]): NSArray<T> {
+		return NSArray.arrayWithArray(str);
+	}
+
+	export function nsArrayToJSArray<T>(a: NSArray<T>): Array<T> {
+		const arr = [];
+		if (a !== undefined) {
+			const count = a.count;
+			for (let i = 0; i < count; i++) {
+				arr.push(a.objectAtIndex(i));
+			}
+		}
+
+		return arr;
+	}
+}
+
+function getRootViewController(): UIViewController {
+	const win = getWindow();
+	let vc = win && win.rootViewController;
+	while (vc && vc.presentedViewController) {
+		vc = vc.presentedViewController;
+	}
+	return vc;
+}
+
+export function getWindow(): UIWindow {
+	let window: UIWindow;
+	if (SDK_VERSION >= 15 && typeof NativeScriptViewFactory !== 'undefined') {
+		// UIWindowScene.keyWindow is only available 15+
+		window = NativeScriptViewFactory.getKeyWindow();
+	}
+	if (window) {
+		return window;
+	}
+	const app = UIApplication.sharedApplication;
+	if (!app) {
+		return;
+	}
+	return app.keyWindow || (app.windows && app.windows.count > 0 && app.windows.objectAtIndex(0));
+}
+
+function getMainScreen(): UIScreen {
+	const window = getWindow();
+	return window ? window.screen : UIScreen.mainScreen;
+}
+
+function setWindowBackgroundColor(value: string) {
+	const win = getWindow();
+	if (win) {
+		const bgColor = new Color(value);
+		win.backgroundColor = bgColor.ios;
+		const rootVc = getRootViewController();
+		if (rootVc?.view) {
+			rootVc.view.backgroundColor = bgColor.ios;
+		}
+	}
+}
+
+function isLandscape(): boolean {
+	console.log('utils.ios.isLandscape() is deprecated; use application.orientation instead');
+
+	const deviceOrientation = UIDevice.currentDevice.orientation;
+	const statusBarOrientation = UIApplication.sharedApplication.statusBarOrientation;
+
+	const isDeviceOrientationLandscape = isOrientationLandscape(deviceOrientation);
+	const isStatusBarOrientationLandscape = isOrientationLandscape(statusBarOrientation);
+
+	return isDeviceOrientationLandscape || isStatusBarOrientationLandscape;
+}
+
+/**
+ * @deprecated use Utils.SDK_VERSION instead which is a float of the {major}.{minor} verison
+ */
+const MajorVersion = NSString.stringWithString(UIDevice.currentDevice.systemVersion).intValue;
+
+export function openFile(filePath: string): boolean {
+	console.log('utils.ios.openFile() is deprecated; use utils.openFile() instead');
+
+	return openFileAtRootModule(filePath);
+}
+
+function getVisibleViewController(rootViewController: UIViewController): UIViewController {
+	let viewController = rootViewController;
+
+	while (viewController && viewController.presentedViewController) {
+		viewController = viewController.presentedViewController;
+	}
+	return viewController;
+}
+
+function applyRotateTransform(transform: CATransform3D, x: number, y: number, z: number): CATransform3D {
+	if (x) {
+		transform = CATransform3DRotate(transform, x * radToDeg, 1, 0, 0);
+	}
+
+	if (y) {
+		transform = CATransform3DRotate(transform, y * radToDeg, 0, 1, 0);
+	}
+
+	if (z) {
+		transform = CATransform3DRotate(transform, z * radToDeg, 0, 0, 1);
+	}
+
+	return transform;
+}
+
+function createUIDocumentInteractionControllerDelegate(): NSObject {
+	@NativeClass
+	class UIDocumentInteractionControllerDelegateImpl extends NSObject implements UIDocumentInteractionControllerDelegate {
+		public static ObjCProtocols = [UIDocumentInteractionControllerDelegate];
+
+		public getViewController(): UIViewController {
+			return getWindow().rootViewController;
+		}
+
+		public documentInteractionControllerViewControllerForPreview(controller: UIDocumentInteractionController) {
+			return this.getViewController();
+		}
+
+		public documentInteractionControllerViewForPreview(controller: UIDocumentInteractionController) {
+			return this.getViewController().view;
+		}
+
+		public documentInteractionControllerRectForPreview(controller: UIDocumentInteractionController): CGRect {
+			return this.getViewController().view.frame;
+		}
+	}
+	return new UIDocumentInteractionControllerDelegateImpl();
+}
+
+export function isRealDevice() {
+	try {
+		if (NSProcessInfo.processInfo.environment.valueForKey('SIMULATOR_DEVICE_NAME')) {
+			return false;
+		}
+		return true;
+	} catch (e) {
+		return true;
+	}
+}
+
+function printCGRect(rect: CGRect) {
+	if (rect) {
+		return `CGRect(${rect.origin.x} ${rect.origin.y} ${rect.size.width} ${rect.size.height})`;
+	}
+}
+
+function snapshotView(view: UIView, scale: number): UIImage {
+	if (view instanceof UIImageView) {
+		return view.image;
+	}
+	// console.log('snapshotView view.frame:', printRect(view.frame));
+	const originalOpacity = view.layer.opacity;
+	view.layer.opacity = originalOpacity > 0 ? originalOpacity : 1;
+	UIGraphicsBeginImageContextWithOptions(CGSizeMake(view.frame.size.width, view.frame.size.height), false, scale);
+	view.layer.renderInContext(UIGraphicsGetCurrentContext());
+	const image = UIGraphicsGetImageFromCurrentImageContext();
+	UIGraphicsEndImageContext();
+	setTimeout(() => {
+		// ensure set back properly on next tick
+		view.layer.opacity = originalOpacity;
+	});
+	return image;
+}
+
+function copyLayerProperties(view: UIView, toView: UIView, customProperties?: { view?: Array<keyof UIView>; layer?: Array<keyof CALayer> }) {
+	const viewPropertiesToMatch: Array<keyof UIView> = customProperties?.view || ['backgroundColor'];
+	const layerPropertiesToMatch: Array<keyof CALayer> = customProperties?.layer || ['cornerRadius', 'borderWidth', 'borderColor'];
+
+	viewPropertiesToMatch.forEach((property) => {
+		if (view[property] !== toView[property]) {
+			// console.log('|    -- matching view property:', property);
+			view[property as any] = toView[property];
+		}
+	});
+
+	layerPropertiesToMatch.forEach((property) => {
+		if (view.layer[property] !== toView.layer[property]) {
+			// console.log('|    -- matching layer property:', property);
+			view.layer[property as any] = toView.layer[property];
+		}
+	});
+}
+
+function animateWithSpring(options?: { tension?: number; friction?: number; mass?: number; delay?: number; velocity?: number; animateOptions?: UIViewAnimationOptions; animations?: () => void; completion?: (finished?: boolean) => void }) {
+	// for convenience, default spring settings are provided
+	const opt = {
+		...CORE_ANIMATION_DEFAULTS.spring,
+		delay: 0,
+		animateOptions: null,
+		animations: null,
+		completion: null,
+		...(options || {}),
+	};
+	const { duration, damping } = getDurationWithDampingFromSpring(opt);
+
+	if (duration === 0) {
+		UIView.animateWithDurationAnimationsCompletion(0, opt.animations, opt.completion);
+		return;
+	}
+	UIView.animateWithDurationDelayUsingSpringWithDampingInitialSpringVelocityOptionsAnimationsCompletion(duration, opt.delay, damping, opt.velocity, opt.animateOptions, opt.animations, opt.completion);
+}
+
 // these don't exist on iOS. Stub them to empty functions.
 export const ad = platformCheck('Utils.ad');
 export const android = platformCheck('Utils.android');
 
-export import ios = iOSUtils;
+export const ios = {
+	collections,
+	createUIDocumentInteractionControllerDelegate,
+	getCurrentAppPath,
+	getRootViewController,
+	getVisibleViewController,
+	getWindow,
+	getMainScreen,
+	setWindowBackgroundColor,
+	isLandscape,
+	applyRotateTransform,
+	snapshotView,
+	joinPaths,
+	printCGRect,
+	copyLayerProperties,
+	animateWithSpring,
+	MajorVersion,
+};
 
 /**
  * @deprecated Use `Utils.ios` instead.
  */
-export import iOSNativeHelper = iOSUtils;
+export const iOSNativeHelper = ios;
diff --git a/packages/core/utils/utils-shared.ts b/packages/core/utils/utils-shared.ts
new file mode 100644
index 0000000000..35bec09061
--- /dev/null
+++ b/packages/core/utils/utils-shared.ts
@@ -0,0 +1,12 @@
+// Shared helpers and types for utils, used by both native-helper and common.
+// Only put platform-agnostic logic here.
+
+export function getFileExtension(path: string): string {
+	if (!path) {
+		return '';
+	}
+	const index = path.lastIndexOf('.');
+	return index !== -1 ? path.substring(index + 1) : '';
+}
+
+// Add more shared helpers/types/constants as needed.
diff --git a/packages/core/vitest.setup.ts b/packages/core/vitest.setup.ts
index c08256d220..b9e95a540b 100644
--- a/packages/core/vitest.setup.ts
+++ b/packages/core/vitest.setup.ts
@@ -19,6 +19,7 @@ global.NSObject = class NSObject {
 		return new NSObject();
 	}
 };
+global.NSNumber = {};
 global.NSString = {
 	stringWithString() {
 		return {
@@ -106,6 +107,15 @@ global.NativeScriptUtils = {
 		return {};
 	},
 };
+global.NSURLSessionConfiguration = {
+	defaultSessionConfiguration: function () {
+		return {};
+	},
+	ephemeralSessionConfiguration: function () {
+		return {};
+	},
+};
+global.NSURLSessionTaskDelegate = function () {};
 global.NSOperationQueue = {
 	mainQueue: {
 		addOperationWithBlock(fn: Function) {
@@ -148,6 +158,15 @@ global.UIResponder = function () {};
 global.UIResponder.extend = function () {};
 global.UIViewController = function () {};
 global.UIViewControllerTransitioningDelegate = function () {};
+global.UINavigationControllerDelegate = function () {};
+global.UINavigationController = function () {};
+global.UIUserInterfaceIdiom = {
+	Phone: 0,
+	Pad: 1,
+	TV: 2,
+	CarPlay: 3,
+	Mac: 4,
+};
 global.UIGestureRecognizer = function () {};
 global.UIGestureRecognizerDelegate = function () {};
 global.UIAdaptivePresentationControllerDelegate = function () {};
@@ -164,6 +183,7 @@ global.UIContentSizeCategoryAccessibilityLarge = 2.5;
 global.UIContentSizeCategoryAccessibilityExtraLarge = 3;
 global.UIContentSizeCategoryAccessibilityExtraExtraLarge = 3.5;
 global.UIContentSizeCategoryAccessibilityExtraExtraExtraLarge = 4;
+global.UIViewControllerAnimatedTransitioning = function () {};
 // global.UIDocumentInteractionController = {
 // 	interactionControllerWithURL(url: any) {
 // 		return null;
diff --git a/packages/core/xhr/index.ts b/packages/core/xhr/index.ts
index 848409703d..32df8072a3 100644
--- a/packages/core/xhr/index.ts
+++ b/packages/core/xhr/index.ts
@@ -432,7 +432,7 @@ export class Blob {
 		}
 	}
 
-	public arrayBuffer(): Promise<ArrayBuffer> {
+	public arrayBuffer() {
 		return Promise.resolve(this._buffer);
 	}
 
@@ -497,7 +497,7 @@ export class FileReader {
 	public onprogress: (...args: any[]) => void;
 
 	private _readyState: number;
-	private _result: string | ArrayBuffer | null;
+	private _result: string | ArrayBuffer | SharedArrayBuffer | null;
 
 	private _listeners: Map<string, Array<Function>> = new Map<string, Array<Function>>();
 
@@ -505,7 +505,7 @@ export class FileReader {
 		return this._readyState;
 	}
 
-	public get result(): string | ArrayBuffer | null {
+	public get result(): string | ArrayBuffer | SharedArrayBuffer | null {
 		return this._result;
 	}
 
diff --git a/packages/devtools/tsconfig.json b/packages/devtools/tsconfig.json
index 709f194cf6..fbc8383a07 100644
--- a/packages/devtools/tsconfig.json
+++ b/packages/devtools/tsconfig.json
@@ -4,7 +4,7 @@
 		"baseUrl": ".",
 		"target": "ES2020",
 		"module": "esnext",
-		"moduleResolution": "node",
+		"moduleResolution": "bundler",
 		"outDir": "./dist",
 		"declaration": true,
 		"emitDecoratorMetadata": true,
diff --git a/packages/webpack5/package.json b/packages/webpack5/package.json
index 636ac22a48..bbd9f507f0 100644
--- a/packages/webpack5/package.json
+++ b/packages/webpack5/package.json
@@ -17,58 +17,58 @@
 	},
 	"dependencies": {
 		"@babel/core": "^7.0.0",
-		"@pmmmwh/react-refresh-webpack-plugin": "~0.5.7",
+		"@pmmmwh/react-refresh-webpack-plugin": "~0.6.1",
 		"acorn": "^8.0.0",
 		"acorn-stage3": "^4.0.0",
 		"ansi-colors": "^4.1.3",
-		"babel-loader": "^8.0.0",
+		"babel-loader": "^10.0.0",
 		"cli-highlight": "^2.0.0",
-		"commander": "^8.0.0",
-		"copy-webpack-plugin": "^9.0.0",
+		"commander": "^14.0.0",
+		"copy-webpack-plugin": "^13.0.0",
 		"css": "^3.0.0",
-		"css-loader": "^6.0.0",
-		"dotenv-webpack": "^7.0.0",
-		"fork-ts-checker-webpack-plugin": "^7.0.0",
+		"css-loader": "^7.0.0",
+		"dotenv-webpack": "^8.0.0",
+		"fork-ts-checker-webpack-plugin": "^9.0.0",
 		"loader-utils": "^2.0.0 || ^3.0.0",
 		"lodash.get": "^4.0.0",
 		"micromatch": "^4.0.0",
 		"postcss": "^8.0.0",
-		"postcss-import": "^14.0.0",
-		"postcss-loader": "^7.0.0",
+		"postcss-import": "^16.0.0",
+		"postcss-loader": "^8.0.0",
 		"raw-loader": "^4.0.0",
-		"react-refresh": "~0.14.0",
+		"react-refresh": "~0.17.0",
 		"sass": "^1.0.0",
-		"sass-loader": "^13.0.0",
+		"sass-loader": "^16.0.0",
 		"sax": "^1.0.0",
 		"semver": "^7.0.0 || ^6.0.0",
 		"source-map": "^0.7.0",
 		"terser-webpack-plugin": "^5.0.0",
 		"ts-dedent": "^2.0.0",
 		"ts-loader": "^9.0.0",
-		"vue-loader": "^15.0.0 <= 15.9.8",
+		"vue-loader": "^17.0.0",
 		"webpack": "^5.30.0 <= 5.50.0 || ^5.51.2",
 		"webpack-bundle-analyzer": "^4.0.0",
 		"webpack-chain": "^6.0.0",
-		"webpack-cli": "^4.0.0",
-		"webpack-merge": "^5.0.0",
+		"webpack-cli": "^6.0.0",
+		"webpack-merge": "^6.0.0",
 		"webpack-virtual-modules": "^0.4.0"
 	},
 	"devDependencies": {
-		"@angular/compiler-cli": "^19.0.0",
-		"@angular-devkit/build-angular": "^19.0.0",
-		"@types/css": "0.0.33",
+		"@angular/compiler-cli": "^20.0.0",
+		"@angular-devkit/build-angular": "^20.0.0",
+		"@types/css": "0.0.38",
 		"@types/jest": "29.5.4",
-		"@types/loader-utils": "2.0.3",
-		"@types/lodash.get": "4.4.7",
-		"@types/micromatch": "4.0.2",
-		"@types/sax": "1.2.4",
+		"@types/loader-utils": "2.0.6",
+		"@types/lodash.get": "4.4.9",
+		"@types/micromatch": "4.0.9",
+		"@types/sax": "1.2.7",
 		"@types/terser-webpack-plugin": "5.2.0",
-		"@types/webpack-virtual-modules": "0.1.1",
+		"@types/webpack-virtual-modules": "0.4.2",
 		"jest": "~29.7.0",
 		"jest-matcher-utils": "~29.7.0",
 		"nativescript-vue-template-compiler": "2.9.3",
-		"ts-jest": "29.2.5",
-		"typescript": "~5.6.0"
+		"ts-jest": "29.4.0",
+		"typescript": "~5.8.0"
 	},
 	"peerDependencies": {
 		"nativescript-vue-template-compiler": "^2.8.1"
diff --git a/packages/webpack5/src/configuration/base.ts b/packages/webpack5/src/configuration/base.ts
index 1345be3473..2f762aeb7e 100644
--- a/packages/webpack5/src/configuration/base.ts
+++ b/packages/webpack5/src/configuration/base.ts
@@ -124,11 +124,19 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
 			.add('@nativescript/core/inspector_modules');
 	});
 
+	config.merge({
+		experiments: {
+			// enable ES module syntax (import/exports)
+			outputModule: true,
+		},
+	});
+
 	config.output
 		.path(outputPath)
 		.pathinfo(false)
 		.publicPath('')
-		.libraryTarget('commonjs')
+		.set('module', true)
+		.libraryTarget('module')
 		.globalObject('global')
 		.set('clean', true);
 
diff --git a/tools/scripts/build-finish.ts b/tools/scripts/build-finish.ts
index 9f29754682..316de82c22 100644
--- a/tools/scripts/build-finish.ts
+++ b/tools/scripts/build-finish.ts
@@ -13,18 +13,18 @@ const packageJson = JSON.parse(fs.readFileSync(packagePath));
 const npmPackageName = packageJson.name;
 console.log(`Building ${npmPackageName}...${publish ? 'and publishing.' : ''}`);
 
-function cleanPackage() {
-	// helps remove unwanted properties which may be added by other tooling
-	const packageJsonPath = path.resolve(rootDir, 'dist', 'packages', packageName, 'package.json');
-	let packageJson = fs.readFileSync(packageJsonPath, { encoding: 'utf-8' });
-	if (packageJson) {
-		packageJson = parseJson(packageJson);
-		// we don't need module or type properties at the moment
-		delete packageJson['module'];
-		delete packageJson['type'];
-		fs.writeFileSync(packageJsonPath, serializeJson(packageJson));
-	}
-}
+// function cleanPackage() {
+// 	// helps remove unwanted properties which may be added by other tooling
+// 	const packageJsonPath = path.resolve(rootDir, 'dist', 'packages', packageName, 'package.json');
+// 	let packageJson = fs.readFileSync(packageJsonPath, { encoding: 'utf-8' });
+// 	if (packageJson) {
+// 		packageJson = parseJson(packageJson);
+// 		// we don't need module or type properties at the moment
+// 		delete packageJson['module'];
+// 		delete packageJson['type'];
+// 		fs.writeFileSync(packageJsonPath, serializeJson(packageJson));
+// 	}
+// }
 
-cleanPackage();
+// cleanPackage();
 console.log(`${npmPackageName} ready to publish.`);
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 3a360c50d7..56ecf4a96d 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -6,7 +6,7 @@
 		"module": "esnext",
 		"sourceMap": true,
 		"declaration": true,
-		"moduleResolution": "node",
+		"moduleResolution": "bundler",
 		"emitDecoratorMetadata": true,
 		"experimentalDecorators": true,
 		"noEmitOnError": true,

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/NativeScript/NativeScript/compare/main...refactor/circular-deps.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/NativeScript/NativeScript/compare/main...refactor/circular-deps.diff" target="_blank">pFad Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/NativeScript/NativeScript/compare/main...refactor/circular-deps.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/NativeScript/NativeScript/compare/main...refactor/circular-deps.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>