diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae2d98d..75925e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,6 @@ jobs: node-version: lts/* - uses: nrwl/nx-set-shas@v3 - name: npm install - run: npm install + run: npm install --legacy-peer-deps - name: Build.all affected run: npx nx affected --target=build --exclude nativescript-demo-ng diff --git a/.prettierignore b/.prettierignore index 4ccb9a2..50732da 100644 --- a/.prettierignore +++ b/.prettierignore @@ -2,6 +2,7 @@ /dist /coverage +packages/angular/dist **/xplat/*/.xplatframework diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..55712c1 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "typescript.tsdk": "node_modules/typescript/lib" +} \ No newline at end of file diff --git a/apps/nativescript-demo-ng/project.json b/apps/nativescript-demo-ng/project.json index 1cb7f99..3149158 100644 --- a/apps/nativescript-demo-ng/project.json +++ b/apps/nativescript-demo-ng/project.json @@ -38,10 +38,11 @@ "uglify": false, "release": false, "forDevice": false, - "prepare": false, - "flags": "--env.commonjs" + "prepare": false }, - "dependsOn": ["^build"] + "dependsOn": [ + "^build" + ] }, "clean": { "executor": "@nativescript/nx:clean", @@ -52,12 +53,16 @@ }, "test": { "executor": "@nativescript/nx:test", - "outputs": ["{workspaceRoot}/coverage/apps/nativescript-demo-ng"], + "outputs": [ + "{workspaceRoot}/coverage/apps/nativescript-demo-ng" + ], "options": { - "coverage": false, - "flags": "--env.commonjs" + "coverage": false }, + "dependsOn": [ + "^build" + ], "configurations": {} } } -} +} \ No newline at end of file diff --git a/apps/nativescript-demo-ng/src/app/home/home.component.html b/apps/nativescript-demo-ng/src/app/home/home.component.html index e5e865c..68cc8e7 100644 --- a/apps/nativescript-demo-ng/src/app/home/home.component.html +++ b/apps/nativescript-demo-ng/src/app/home/home.component.html @@ -1,5 +1,5 @@ - + @@ -13,3 +13,46 @@ + + + + \ No newline at end of file diff --git a/apps/nativescript-demo-ng/src/app/home/home.component.ts b/apps/nativescript-demo-ng/src/app/home/home.component.ts index 2511733..4455a8b 100644 --- a/apps/nativescript-demo-ng/src/app/home/home.component.ts +++ b/apps/nativescript-demo-ng/src/app/home/home.component.ts @@ -1,7 +1,7 @@ import { Component, inject, NgZone, NO_ERRORS_SCHEMA, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { RouterExtensions, NativeScriptCommonModule } from '@nativescript/angular'; -import { Page, TabView } from '@nativescript/core'; +import { EventData, Page, TabView } from '@nativescript/core'; @Component({ selector: 'demo-home', @@ -35,8 +35,8 @@ export class HomeComponent implements OnInit { } } - loadedTabView(args) { - // + loadedTabView() { + } private _viewTab(index: number) { @@ -61,7 +61,7 @@ export class HomeComponent implements OnInit { }); } - private _initMenu(profilePic?: string) { + private _initMenu() { for (let i = 0; i < this._tabs.length; i++) { const tab = this._tabs[i]; // console.log('================') diff --git a/apps/nativescript-demo-ng/src/app/item/item-detail.component.ts b/apps/nativescript-demo-ng/src/app/item/item-detail.component.ts index 9960fab..961475c 100644 --- a/apps/nativescript-demo-ng/src/app/item/item-detail.component.ts +++ b/apps/nativescript-demo-ng/src/app/item/item-detail.component.ts @@ -12,7 +12,7 @@ import { NativeScriptCommonModule } from '@nativescript/angular'; schemas: [NO_ERRORS_SCHEMA], }) export class ItemDetailComponent implements OnInit { - item: Item; + item: Item | null = null; private itemService = inject(ItemService); private route = inject(ActivatedRoute); diff --git a/apps/nativescript-demo-ng/src/app/item/items.component.ts b/apps/nativescript-demo-ng/src/app/item/items.component.ts index ee7c530..00fdd82 100644 --- a/apps/nativescript-demo-ng/src/app/item/items.component.ts +++ b/apps/nativescript-demo-ng/src/app/item/items.component.ts @@ -13,8 +13,8 @@ import { ModalDialogService, NativeDialogService, NativeScriptCommonModule } fro schemas: [NO_ERRORS_SCHEMA], }) export class ItemsComponent implements OnInit, OnDestroy { - message = 'Hello Angular 20.0.0!'; - items: Array; + message = 'Hello Angular 21.0.0!'; + items: Array = []; private itemService = inject(ItemService); private nativeDialog = inject(NativeDialogService); private modalDialog = inject(ModalDialogService); diff --git a/apps/nativescript-demo-ng/src/app/item2/item-detail2.component.html b/apps/nativescript-demo-ng/src/app/item2/item-detail2.component.html index 1346c48..616a490 100644 --- a/apps/nativescript-demo-ng/src/app/item2/item-detail2.component.html +++ b/apps/nativescript-demo-ng/src/app/item2/item-detail2.component.html @@ -14,7 +14,7 @@