Merge origin/main and resolve dialog conflict

Author: Copilot

.eslintrc.json

@@ -12,18 +12,13 @@
       "files": ["*.ts", "*.tsx"],
       "extends": ["plugin:@nx/typescript"],
       "rules": {
-        "@typescript-eslint/no-inferrable-types": "off",
-        "@typescript-eslint/no-extra-semi": "error",
-        "no-extra-semi": "off"
+        "@typescript-eslint/no-inferrable-types": "off"
       }
     },
     {
       "files": ["*.js", "*.jsx"],
       "extends": ["plugin:@nx/javascript"],
-      "rules": {
-        "@typescript-eslint/no-extra-semi": "error",
-        "no-extra-semi": "off"
-      }
+      "rules": {}
     }
   ]
 }

.github/workflows/build.yml

@@ -6,9 +6,9 @@ env:
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 jobs:
   build:
@@ -17,17 +17,15 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v6
         with:
           node-version: lts/*
-          cache: 'yarn'
-      - uses: nrwl/nx-set-shas@v3
-      - name: Setup global dependencies
-        run: npm i -g yarn
-      - name: yarn install
-        run: yarn
+          cache: npm
+      - uses: nrwl/nx-set-shas@v5
+      - name: npm install
+        run: npm install --force
       - name: Build.all affected
-        run: yarn nx affected --target=build --exclude nativescript-demo-ng
+        run: npx nx affected --target=build,test --exclude nativescript-demo-ng

.gitignore

@@ -8,8 +8,8 @@
 # dependencies
 /node_modules
 /packages/*/node_modules
-package-lock.json
 .npmrc
+yarn.lock
 
 # IDEs and editors
 /.idea
@@ -48,4 +48,10 @@ Thumbs.db
 /.env
 
 .nx/cache
-.nx/workspace-data
+.nx/workspace-data
+.cursor/rules/nx-rules.mdc
+.github/instructions/nx.instructions.md
+
+.claude/worktrees
+.nx/polygraph
+.nx/self-healing

.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx lint-staged --allow-empty --relative

.prettierignore

@@ -2,6 +2,7 @@
 
 /dist
 /coverage
+packages/angular/dist
 
 **/xplat/*/.xplatframework
 
@@ -19,4 +20,5 @@
 **/xplat/nativescript/scss/fonticons/*.css
 **/xplat/nativescript*/plugins/**/*
 /.nx/cache
-/.nx/workspace-data
+/.nx/workspace-data
+.nx/self-healing

.prettierrc

@@ -1,6 +1,6 @@
 {
   "useTabs": false,
-  "printWidth": 600,
+  "printWidth": 120,
   "tabWidth": 2,
   "singleQuote": true
 }

.vscode/extensions.json

@@ -1,3 +1,3 @@
 {
-  "recommendations": ["ms-vscode.vscode-typescript-tslint-plugin", "esbenp.prettier-vscode", "firsttris.vscode-jest-runner"]
+  "recommendations": ["esbenp.prettier-vscode", "firsttris.vscode-jest-runner"]
 }

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "typescript.tsdk": "node_modules/typescript/lib"
+}

CHANGELOG.md

@@ -1,3 +1,63 @@
+# [21.0.0](https://github.com/NativeScript/angular/compare/20.1.1...21.0.0) (2026-01-04)
+
+
+### Features
+
+* Angular 21 ([#157](https://github.com/NativeScript/angular/issues/157)) ([1cc0a89](https://github.com/NativeScript/angular/commit/1cc0a89dcf5f3239fac566a20ee865baf38129bf))
+
+
+
+## [20.1.1](https://github.com/NativeScript/angular/compare/20.1.0...20.1.1) (2026-01-04)
+
+
+### Features
+
+* SplitView support ([#160](https://github.com/NativeScript/angular/issues/160)) ([280b388](https://github.com/NativeScript/angular/commit/280b388feb30c80411afcc03684bb0f567b5d8af))
+
+
+
+# [20.1.0](https://github.com/NativeScript/angular/compare/20.0.0...20.1.0) (2025-12-02)
+
+
+### Features
+
+* **ListView:** sticky headers, search bar and sectioned data support with v9 ([5ad8a89](https://github.com/NativeScript/angular/commit/5ad8a897a05014d0c737f7f8580f156574938df0))
+  * **Note**: Requires NativeScript Core v9+
+
+
+
+# [20.0.0](https://github.com/NativeScript/angular/compare/19.0.1...20.0.0) (2025-06-01)
+
+
+### Features
+
+* Angular 20  ([#151](https://github.com/NativeScript/angular/issues/151)) ([62d9fb5](https://github.com/NativeScript/angular/commit/62d9fb5329efb28b5d595f11bf8732ae56a878f7))
+
+
+
+## [19.0.1](https://github.com/NativeScript/angular/compare/19.0.0...19.0.1) (2025-01-29)
+
+
+### Features
+
+* apple view filter to cover ios and visionos together ([#148](https://github.com/NativeScript/angular/issues/148)) ([f5431bd](https://github.com/NativeScript/angular/commit/f5431bd2564f389480a14cb7862dd772c3b6af57))
+
+
+
+# [19.0.0](https://github.com/NativeScript/angular/compare/18.1.3...19.0.0) (2025-01-02)
+
+
+### Features
+
+* Angular 19 support ([#143](https://github.com/NativeScript/angular/issues/143)) ([00802d2](https://github.com/NativeScript/angular/commit/00802d219fe9839b30c4e1c66daeafce96b990a4))
+  
+### Bug Fixes
+
+* only polyfill queueMicrotask if needed ([b9cd642](https://github.com/NativeScript/angular/commit/b9cd642c44d33756a675dd4864161fe8c8e620e6))
+* re-enable ngDevMode tree shaking ([6244afb](https://github.com/NativeScript/angular/commit/6244afbd76faaa5ec06494fcff014d8061ffa3d1))
+
+
+
 ## [18.1.3](https://github.com/NativeScript/angular/compare/18.1.1...18.1.3) (2024-09-18)
 
 

DevelopmentWorkflow.md

@@ -33,7 +33,7 @@ $ cd angular
 
 ```
 $ cd angular
-$ yarn clean.all
+$ npm run clean.all
 ```
 
 ### Run some of the e2e applications e.g. router-tab-view
@@ -43,7 +43,7 @@ $ yarn clean.all
 Install NPM packages (use the local copy of `@nativescript/angular`):
 ```
 $ cd e2e/router-tab-view
-$ yarn install
+$ npm install
 ```
 
 Start the app: