Merge branch 'master' into chore-v2-refactor

NativeScript · Nov 4, 2023 · d1b7313 · d1b7313
2 parents 9570d3e + cc723b4
commit d1b7313
Show file tree

Hide file tree

Showing 64 changed files with 1,798 additions and 866 deletions.
diff --git a/apps/demo-vue/src/_app-common.scss → apps/demo-vue/app/_app-common.scss b/apps/demo-vue/src/_app-common.scss → apps/demo-vue/app/_app-common.scss
diff --git a/apps/demo-vue/src/_app-variables.scss → apps/demo-vue/app/_app-variables.scss b/apps/demo-vue/src/_app-variables.scss → apps/demo-vue/app/_app-variables.scss
diff --git a/apps/demo-vue/src/app.js → apps/demo-vue/app/app.js b/apps/demo-vue/src/app.js → apps/demo-vue/app/app.js
diff --git a/apps/demo-vue/src/app.scss → apps/demo-vue/app/app.scss b/apps/demo-vue/src/app.scss → apps/demo-vue/app/app.scss
diff --git a/apps/demo-vue/src/components/Home.vue → apps/demo-vue/app/components/Home.vue b/apps/demo-vue/src/components/Home.vue → apps/demo-vue/app/components/Home.vue
diff --git a/apps/demo-vue/src/fonts/FontAwesome.ttf → apps/demo-vue/app/fonts/FontAwesome.ttf b/apps/demo-vue/src/fonts/FontAwesome.ttf → apps/demo-vue/app/fonts/FontAwesome.ttf
diff --git a/apps/demo-vue/src/package.json → apps/demo-vue/app/package.json b/apps/demo-vue/src/package.json → apps/demo-vue/app/package.json
diff --git a/apps/demo-vue/nativescript.config.ts b/apps/demo-vue/nativescript.config.ts
@@ -7,5 +7,5 @@ export default {
 		v8Flags: '--expose_gc',
 		markingMode: 'none',
 	},
-	appPath: 'src',
+	appPath: 'app',
 } as NativeScriptConfig;
diff --git a/apps/demo-vue/src/plugin-demos/.gitkeep b/apps/demo-vue/src/plugin-demos/.gitkeep
diff --git a/apps/demo/src/app.ts b/apps/demo/src/app.ts
@@ -63,5 +63,4 @@ Application.on('launch', (args) => {
 		monitor.deviceVersionHidden = true;
 	}
 });
-
 Application.run({ moduleName: 'app-root' });
diff --git a/apps/demo/tsconfig.json b/apps/demo/tsconfig.json
@@ -16,5 +16,6 @@
 			"@nativescript/canvas-three": ["../../packages/canvas-three/index.ts"],
 			"@nativescript/canvas-media": ["../../packages/canvas-media/index.ts"]
 		}
-	}
+	},
+	"include": ["../../packages/**/*.ios.ts", "../../packages/**/*.android.ts"]
 }
diff --git a/packages/canvas-phaser/game.ts b/packages/canvas-phaser/game.ts
@@ -45,7 +45,7 @@ export const Game = (options) => {
 		width,
 		height,
 		//canvas,
-		 context,
+		context,
 		title,
 		type,
 		scene,

diff --git a/packages/canvas-polyfill/platforms/android/async-release.aar b/packages/canvas-polyfill/platforms/android/async-release.aar
diff --git a/packages/canvas-polyfill/src-native/AsyncDemo/.idea/gradle.xml b/packages/canvas-polyfill/src-native/AsyncDemo/.idea/gradle.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,5 +63,4 @@ Application.on('launch', (args) => { @@
     		monitor.deviceVersionHidden = true;
     	}
     });
     Application.run({ moduleName: 'app-root' });