Skip to content

merge: upstream/main into fork (NativeWindow, napi runtimes for test apps) - #15

Merged
farfromrefug merged 281 commits into
mainfrom
merge/upstream-2026-11
Nov 9, 2026
Merged

farfromrefug merged 281 commits into
mainfrom
merge/upstream-2026-11

Conversation

@farfromrefug

Copy link
Copy Markdown

Summary

Merges upstream/main (NativeScript/NativeScript) into the fork without reintroducing features the fork deliberately removed (Android edge-to-edge, aar/xcframework widget builds, nx/package-lock tooling).

  • NativeWindow adopted (multi-window/scenes) on top of the fork's ContentView / subRootView root-view design (application.ios.ts, frame/index.android.ts, application-common.ts, native-window/*).
  • Fork systems kept: property system, __CSS_USE_CSS_TOOLS__ lazy csstools, async CSS parser, accessibility refactor, cancellable systemAppearanceChanged, extra Android events.
  • Test apps run out of the box: toolbox/automated/ui now use @nativescript/android-quickjs-ng via the fork CLI's runtimePackageName (fixes the Invalid version... Got type "object" doctor crash from "@nativescript/android": "*"). iOS stays on the default runtime for now.
  • Dev workflow: core:build.watch now also syncs packages/core/platforms, js-libs, cli-hooks etc. to dist (tools/scripts/watch-core-assets.js); extra entries in Android native-api-usage.json; toolbox webpack tweaks; apps/ui in workspaces.
  • Shared element transitions: iOS/Android improvements and a shared-photo toolbox demo.
  • Docs: docs/fork-divergences.md lists where the fork diverges from upstream and what to port rather than merge.

Testing

  • npx tsc --noEmit -p packages/core/tsconfig.lib.json is clean.
  • Toolbox on Android emulator: the app builds and syncs, but still hit Cannot read properties of undefined (reading 'LayoutParams'). Likely a stale platforms/android/whitelist.mdg, needs a clean native rebuild to confirm.
  • Not tested: NativeWindow on real devices/simulators, webpack5 snapshots (deps missing).

Known TODOs (TODO(merge))

  • Secondary windows are not hosted in a ContentView on iOS; window.rootView is the host.
  • a11y / font-scale classes may not reach secondary windows.
  • Android orientation degrees ordering risk.
  • Pre-existing: dialogOnCreateViewEvent / configurationChangeEvent equal activityRequestPermissionsEvent.

🤖 Generated with Claude Code

github-actions Bot and others added 30 commits July 18, 2026 01:20
- project: webpack5 5.0.37-next.4

- project: core 9.0.21-next.18
- project: webpack5 5.0.37-next.5

- project: core 9.0.21-next.19
- project: webpack5 5.0.37
- project: webpack5 5.0.38
…er transformers (NativeScript#11314)

The NativeClass transformer's visitNode bailed out on any node flagged
NodeFlags.Synthesized before checking for the SourceFile itself. A source
file rebuilt by a preceding transformer (e.g. Angular's Ivy transform on
files containing Angular-decorated classes) is itself flagged Synthesized,
so the transformer skipped the entire file and @nativeclass decorators
survived into the emitted bundle, crashing at runtime with
'ReferenceError: NativeClass is not defined'.

Handle the SourceFile before the Synthesized bail-out; the per-statement
Synthesized check in transformStatements still protects statements
generated by earlier transformers and the transformer's own helper output.
… with pre-26 SDKs (NativeScript#11313)

interactiveContentPopGestureRecognizer only exists in the iOS 26 SDK. When
an app is built with an older Xcode/SDK (e.g. Xcode 16 / iOS 18 SDK) but run
on iOS 26+, the property is absent from the generated ObjC metadata (metadata
comes from the build SDK headers), so accessing it returns undefined and the
runtime SDK_VERSION >= 26 check throws:

  TypeError: Cannot set properties of undefined (setting 'enabled')

crashing the app on first page navigation. Guard the property access with an
existence check, matching the pattern already used in
_updateEnableSwipeBackNavigation.
- project: webpack5 5.0.39-next.0

- project: core 9.0.21-next.20
- project: webpack5 5.0.39-next.1

- project: core 9.0.21-next.21
- project: webpack5 5.0.39-next.2

- project: core 9.0.21-next.22
…ript#11315)

Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.4.3 to 2.4.4.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](ossf/scorecard-action@4eaacf0...2d11466)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-version: 2.4.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[skip ci]
…to 2.38.0 (NativeScript#11316)

chore(deps): bump reactivecircus/android-emulator-runner

Bumps [reactivecircus/android-emulator-runner](https://github.com/reactivecircus/android-emulator-runner) from 2.37.0 to 2.38.0.
- [Release notes](https://github.com/reactivecircus/android-emulator-runner/releases)
- [Changelog](https://github.com/ReactiveCircus/android-emulator-runner/blob/main/CHANGELOG.md)
- [Commits](ReactiveCircus/android-emulator-runner@e89f39f...a421e43)

---
updated-dependencies:
- dependency-name: reactivecircus/android-emulator-runner
  dependency-version: 2.38.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[skip ci]
…37.3 (NativeScript#11317)

chore(deps): bump github/codeql-action/upload-sarif

Bumps [github/codeql-action/upload-sarif](https://github.com/github/codeql-action) from 4.36.2 to 4.37.3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@8aad20d...e4fba86)

---
updated-dependencies:
- dependency-name: github/codeql-action/upload-sarif
  dependency-version: 4.37.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[skip ci]
…11318)

Bumps [actions/checkout](https://github.com/actions/checkout) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Commits](actions/checkout@v7...v7.0.1)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 7.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[skip ci]
…t#11319)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 5.4.0 to 5.6.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@1bcf9fb...03ad4de)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-version: 5.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[skip ci]
@angular-devkit/core@20.3.9 declares an optional peer dependency on
chokidar ^4.0.0, which current npm includes in its ideal tree. The
lockfile regeneration in da12301 dropped the nested chokidar@4.0.3
and readdirp@4.1.2 entries under @angular-devkit/architect, causing
'npm ci' to fail lockfile sync validation in the Native artifacts
check workflow on every PR since.
- project: webpack5 5.0.39-next.3

- project: core 9.0.21-next.23
- project: webpack5 5.0.39-next.4

- project: core 9.0.21-next.24
…sing

The recorded hash was computed from a working tree whose image sources
directory carried stale Image/ casing from an old checkout; git tracks
the directory as image/, so case-sensitive checkouts hashed differently
and the Native artifacts check failed with a false android drift.
- project: webpack5 5.0.39-next.5

- project: core 9.0.21-next.25
ZainnQureshii and others added 28 commits October 28, 2026 09:29
- project: webpack5 5.0.40-next.1

- project: core 9.1.4-next.2
- project: webpack5 5.0.40-next.2

- project: core 9.1.4-next.3
…parsed (NativeScript#11553)

A shorthand registered after the app CSS was parsed stayed unexpanded, so every
view re-ran its converter on each apply and the cascade mixed it with longhands.
Rules now expand it once, on first use.

[skip ci]
Core's length and font-size converters read `1.5rem` with parseFloat,
as 1.5 device-independent pixels, so text styled `font-size: 1rem`
(every CSS framework's body text) came out 1 dip tall and rem margins
and paddings collapsed.

A rem length is now a multiple of the root font size, 16 by default as
on the web, in lengths, percent lengths, `font-size` and the `font`
shorthand. `Length.setRootFontSize()` changes it for values parsed
afterwards, so a layout library with its own root font size can keep
the two in step.

[skip ci]
…o the view's own values (NativeScript#11528)

Core played the first keyframe as a jump and held the last one, so
keyframes that leave out an end did not animate as in CSS:
`to { transform: rotate(360deg) }` jumped to 360deg on every iteration
and a spinner never turned, and keyframes that stop at 50% never came
back.

A missing 0% or 100% keyframe is now added when the animation is built,
and filled with the view's own values for the animated properties when
it plays. An auto width or height, which cannot be animated from, is
left out.

[skip ci]
Color reads `oklch()`, `oklab()`, `lab()`, `lch()`, `hwb()`,
`color()` and relative colors (`oklch(from var(--x) calc(l * .9) c h)`)
with @csstools/css-color-parser, which core already uses for
`color-mix()`. Tailwind v4 and Bootstrap 6 define their whole palettes in
oklch, which threw "Invalid color".

The modern `rgb()`/`hsl()` syntax the fast path misread now goes the
same way: a `/` alpha given as a percentage (`rgb(0 0 0 / 15%)` came
out opaque), rgb percentages, and `none`. The legacy syntax keeps the
fast path.

The value parser behind `background` and gradients recognises the new
functions too, and nested ones such as `color-mix(in srgb, rgb(0 0 0), red)`.
`Color.isValid()` accepts them.
- project: webpack5 5.0.40-next.3

- project: core 9.1.4-next.4
…t#11596)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 6.0.1 to 6.1.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@de7274f...b843ebf)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[skip ci]
…39.1 (NativeScript#11597)

chore(deps): bump github/codeql-action/upload-sarif

Bumps [github/codeql-action/upload-sarif](https://github.com/github/codeql-action) from 4.38.2 to 4.39.1.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@2892aa5...9b32540)

---
updated-dependencies:
- dependency-name: github/codeql-action/upload-sarif
  dependency-version: 4.39.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[skip ci]
…ativeScript#11598)

Bumps [step-security/harden-runner](https://github.com/step-security/harden-runner) from 2.21.1 to 2.22.3.
- [Release notes](https://github.com/step-security/harden-runner/releases)
- [Commits](step-security/harden-runner@e14015d...46b06ce)

---
updated-dependencies:
- dependency-name: step-security/harden-runner
  dependency-version: 2.22.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[skip ci]
…eScript#11599)

Bumps [futureware-tech/simulator-action](https://github.com/futureware-tech/simulator-action) from 5 to 6.
- [Release notes](https://github.com/futureware-tech/simulator-action/releases)
- [Changelog](https://github.com/futureware-tech/simulator-action/blob/main/CHANGELOG.md)
- [Commits](futureware-tech/simulator-action@e89aa8f...c768f52)

---
updated-dependencies:
- dependency-name: futureware-tech/simulator-action
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[skip ci]
…ript#11600)

Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.4.4 to 2.5.0.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](ossf/scorecard-action@2d11466...fa7117d)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-version: 2.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[skip ci]
Merge NativeScript/NativeScript main (07e84ec, 271 commits since aa92b47).

Kept from the fork:
- Android edge-to-edge stays removed (native helpers, LayoutBase insets,
  overflow edges, upstream ete toolbox pages).
- Widgets are packaged as source: prebuilt aar/xcframework, nx.json,
  package-lock.json and the tns_core release workflow stay deleted.
- ContentView host + subRootView root view architecture, ported on top of
  upstream's NativeWindow on Android and iOS.
- Fork property system, style wrappers and lazy css-tools handling.

Taken from upstream: NativeWindow (scenes/multi-window), rem lengths, gutters,
max-width/height, corner-shape, CSS Color 4/5, var() fixes, css matching perf,
iOS scroll edge effect and shared transition improvements, many fixes.

Also: apps use @nativescript/android-quickjs-ng via runtimePackageName (the
"*" runtime range broke ns doctor), and docs/fork-divergences.md documents
where the fork differs from upstream.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
# Conflicts:
#	packages/core/ui/styling/background.ios.ts
#	packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/CustomTransition.java
Rework shared transition handling on iOS and Android (page transitions,
shared transition helper, frame) and add a shared-photo demo page to
the toolbox app.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Add WindowManager, ContentValues, ClipDrawable, GradientDrawable,
MediaStore, LinkMovementMethod, ViewOutlineProvider, AbsListView,
SearchView and UUID so metadata filtering keeps them.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Add tools/scripts/watch-core-assets.js to sync platforms/js-libs/cli-hooks
and non-ts assets to dist while tsc watches, add apps/ui to workspaces,
adjust toolbox webpack config for the fork's core and refresh yarn.lock.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
The fork has no nx dependency/nx.json and installs with yarn. Switch the
automated app workflows to corepack + `yarn install --immutable`, build
core with `yarn core:build` and run `tools/scripts/run-automated.js`
directly. Remove the nx-based native_artifacts_check and preview-release
workflows, drop the npm-only `vite` override that conflicted with the
pinned devDependency (EOVERRIDE), and document it.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
dist is not committed, so on a clean checkout the dist/packages/core
workspace is missing and yarn resolves @akylas/nativescript from npm,
making `yarn install --immutable` fail with YN0028. Copy the core
package.json there first.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
The dist/packages/core workspace has a postinstall running
cli-hooks/postinstall.mjs, which does not exist until core is built, so
the link step failed. Install with --mode=skip-build; core:build runs
ts-patch install itself.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Keep the workflow but only run it manually.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@farfromrefug
farfromrefug merged commit 3f54c12 into main Nov 9, 2026
1 of 2 checks passed
@farfromrefug
farfromrefug deleted the merge/upstream-2026-11 branch November 9, 2026 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.