create-octane-xplat 0.13.0 → 0.15.0

package/library-template/tests/packed-consumer.mjs

@@ -0,0 +1,155 @@
+import assert from 'node:assert/strict'
+import { spawnSync } from 'node:child_process'
+import {
+	cpSync,
+	mkdirSync,
+	mkdtempSync,
+	readdirSync,
+	readFileSync,
+	rmSync,
+	symlinkSync,
+	writeFileSync,
+} from 'node:fs'
+
+import { tmpdir } from 'node:os'
+import { dirname, join, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const packageRoot = resolve(dirname(fileURLToPath(import.meta.url)), '..')
+const sourceManifest = JSON.parse(readFileSync(join(packageRoot, 'package.json'), 'utf8'))
+const temporary = mkdtempSync(join(tmpdir(), 'octane-library-consumer-'))
+
+function run(command, args, cwd) {
+	const result = spawnSync(command, args, { cwd, encoding: 'utf8', maxBuffer: 16 * 1024 * 1024 })
+	if (result.stdout) {
+		process.stdout.write(result.stdout)
+	}
+
+	if (result.stderr) {
+		process.stderr.write(result.stderr)
+	}
+
+	if (result.error) {
+		throw result.error
+	}
+
+	assert.equal(result.status, 0, `${command} ${args.join(' ')} failed`)
+}
+
+function installDirectory(root, name, destination) {
+	const segments = name.split('/')
+	const path = join(destination, 'node_modules', ...segments)
+	mkdirSync(dirname(path), { recursive: true })
+	cpSync(root, path, { recursive: true })
+}
+
+try {
+	const pack = join(temporary, 'pack')
+	const extracted = join(temporary, 'extracted')
+	mkdirSync(pack)
+	mkdirSync(extracted)
+	run('pnpm', ['pack', '--pack-destination', pack], packageRoot)
+	const tarball = readdirSync(pack).find((name) => name.endsWith('.tgz'))
+	assert.ok(tarball)
+	run('tar', ['-xzf', join(pack, tarball), '-C', extracted], temporary)
+	const packed = join(extracted, 'package')
+	const manifest = JSON.parse(readFileSync(join(packed, 'package.json'), 'utf8'))
+	assert.ok(manifest.exports['.'].web.default.startsWith('./src/'))
+	assert.ok(manifest.exports['.'].native.default.startsWith('./src/'))
+	assert.ok(manifest.exports['.'].web.types)
+	assert.ok(manifest.exports['.'].native.types)
+
+	for (const target of ['web', 'native']) {
+		for (const mode of ['bundler', 'nodenext']) {
+			const consumer = join(temporary, `${target}-${mode}`)
+			mkdirSync(consumer)
+			mkdirSync(join(consumer, 'node_modules'), { recursive: true })
+			installDirectory(packed, sourceManifest.name, consumer)
+			for (const dependency of [
+				'octane',
+				'@octane-xplat/ui',
+				...(target === 'native'
+					? ['@nativescript-community/octane', '@nativescript/core', '@nativescript/types']
+					: []),
+			]) {
+				const source = join(packageRoot, 'node_modules', ...dependency.split('/'))
+				const destination = join(consumer, 'node_modules', ...dependency.split('/'))
+				mkdirSync(dirname(destination), { recursive: true })
+				symlinkSync(source, destination, 'dir')
+			}
+
+			writeFileSync(join(consumer, 'package.json'), '{"type":"module"}')
+			writeFileSync(
+				join(consumer, 'consumer.tsx'),
+				`import { Badge, type BadgeProps } from '${sourceManifest.name}'
+const props: BadgeProps = { label: 'Ready' }
+const element = <Badge {...props} />
+// @ts-expect-error label is required
+const missing = <Badge />
+// @ts-expect-error label must be a string
+const invalid = <Badge label={1} />
+void element; void missing; void invalid
+`,
+			)
+
+			writeFileSync(
+				join(consumer, 'tsconfig.json'),
+				JSON.stringify(
+					{
+						compilerOptions: {
+							strict: true,
+							noEmit: true,
+							skipLibCheck: true,
+							target: 'esnext',
+							types: [],
+							module: mode === 'bundler' ? 'esnext' : 'nodenext',
+							moduleResolution: mode,
+							jsx: 'react-jsx',
+							jsxImportSource: target === 'native' ? '@nativescript-community/octane' : 'octane',
+							customConditions: [target],
+							moduleSuffixes: target === 'web' ? ['.web', ''] : ['.mobile', ''],
+						},
+						files: ['consumer.tsx'],
+					},
+					null,
+					'\t',
+				),
+			)
+
+			run(
+				process.execPath,
+				[join(packageRoot, 'node_modules/typescript/bin/tsc'), '-p', 'tsconfig.json'],
+				consumer,
+			)
+
+			const listed = spawnSync(
+				process.execPath,
+				[
+					join(packageRoot, 'node_modules/typescript/bin/tsc'),
+					'-p',
+					'tsconfig.json',
+					'--listFilesOnly',
+				],
+				{ cwd: consumer, encoding: 'utf8' },
+			)
+
+			assert.equal(listed.status, 0, listed.stderr)
+			const implementation = listed.stdout
+				.split('\n')
+				.filter(
+					(file) =>
+						file.includes(`/node_modules/${sourceManifest.name}/src/`) && !file.endsWith('.d.ts'),
+				)
+
+			assert.deepEqual(
+				implementation,
+				[],
+				'consumer types use declarations without package implementation',
+			)
+		}
+	}
+
+	console.log('packed consumer: web/native declarations pass Bundler and NodeNext')
+} finally {
+	rmSync(temporary, { recursive: true, force: true })
+}

package/library-template/tsconfig.envs.json

@@ -0,0 +1,14 @@
+{
+	"extends": "./tsconfig.json",
+	"environments": {
+		"web": {
+			"include": ["src/**/*.{ts,tsx,tsrx}"]
+		},
+		"native": {
+			"include": ["src/**/*.{ts,tsx,tsrx}"],
+			"compilerOptions": {
+				"types": ["@nativescript/types"]
+			}
+		}
+	}
+}

package/library-template/tsconfig.json

@@ -0,0 +1,27 @@
+{
+	"compilerOptions": {
+		"strict": true,
+		"target": "es2022",
+		"module": "esnext",
+		"moduleResolution": "bundler",
+		"jsx": "react-jsx",
+		"jsxImportSource": "octane",
+		"moduleSuffixes": [
+			"",
+			".web",
+			".ios",
+			".android",
+			".mobile",
+			".native",
+			".macos",
+			".linux",
+			".windows"
+		],
+		"lib": ["ESNext", "DOM", "DOM.Iterable"],
+		"types": ["@nativescript/types"],
+		"noEmit": true,
+		"skipLibCheck": true
+	},
+	"include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.tsrx"],
+	"exclude": ["dist", "types", "node_modules"]
+}

package/library-template/tsconfig.types.json

@@ -0,0 +1,11 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"declaration": true,
+		"emitDeclarationOnly": true,
+		"noEmit": false,
+		"noEmitOnError": true,
+		"rootDir": "src",
+		"outDir": "types"
+	}
+}

package/library-template/tsrx-typegen.json

@@ -0,0 +1,16 @@
+{
+	"targets": {
+		"octane": {
+			"renderer": "octane",
+			"project": "tsconfig.types.json",
+			"outDir": "types",
+			"entrypoints": {
+				".": {
+					"source": "src/index.ts",
+					"runtime": ["./src/index.ts", "./src/index.web.ts"],
+					"types": ["./types/index.d.ts", "./types/index.web.d.ts"]
+				}
+			}
+		}
+	}
+}

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "create-octane-xplat",
-  "version": "0.13.0",
-  "description": "Scaffold a minimal @octane-xplat/ui app — one Octane codebase for web + iOS + Android",
+  "version": "0.15.0",
+  "description": "Scaffold Octane Xplat apps and cross-platform libraries",
   "keywords": [
+    "component-library",
     "create",
     "cross-platform",
     "init",
@@ -25,7 +26,8 @@
   "files": [
     "index.mjs",
     "scaffold.mjs",
-    "template"
+    "template",
+    "library-template"
   ],
   "type": "module",
   "exports": {

package/scaffold.mjs

@@ -1,9 +1,7 @@
 // Scaffold manifest + compose/apply shared by create-octane-xplat and the
-// CLI's `xplat add`. template/package.json is the canonical store for dep
-// versions and script bodies — targets name which keys they own; unclaimed
-// files, deps, and scripts are part of the base scaffold. Keeping versions in
-// template/package.json means scripts/bump-versions.mjs keeps working
-// unchanged at release time.
+// CLI's `xplat add`. template/package.json is the canonical store for app dep
+// versions and script bodies; library-template/package.json owns the library
+// starter. The release bump script updates both manifests.
 import {
 	cpSync,
 	existsSync,
@@ -14,10 +12,14 @@ import {
 	writeFileSync,
 } from 'node:fs'
 
-import { dirname, join } from 'node:path'
+import { basename, dirname, join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 export const TEMPLATE_DIR = join(dirname(fileURLToPath(import.meta.url)), 'template')
+export const LIBRARY_TEMPLATE_DIR = join(
+	dirname(fileURLToPath(import.meta.url)),
+	'library-template',
+)
 
 /** Scaffoldable targets. `files` entries are template-relative paths —
  *  directories copy recursively. `deps`/`devDeps`/`scripts` name keys whose
@@ -64,7 +66,6 @@ export const targets = {
 		files: [
 			'nativescript.config.ts',
 			'vite.config.native.mts',
-			'tsconfig.native.json',
 			'references.d.ts',
 			'src/main.ts',
 			// On-device Vitest lane — `ns test` builds src/test.ts under
@@ -72,6 +73,8 @@ export const targets = {
 			// simulator/emulator through the upstream runner.
 			'src/test.ts',
 			'src/app.spec.tsrx',
+			'src/native-runtime.spec.ts',
+			'src/failure-reporting.spec.ts',
 			'vitest.config.mts',
 		],
 		deps: [
@@ -91,7 +94,7 @@ export const targets = {
 			'nativescript',
 			'vitest',
 		],
-		typecheck: 'tsrx-tsc --noEmit -p tsconfig.native.json',
+		typecheck: 'xplat typecheck',
 	},
 }
 
@@ -100,11 +103,11 @@ export const selectableTargets = Object.keys(targets).filter((id) => !targets[id
 /** `pnpm create` without --targets and `xplat add`'s prompt default. */
 export const defaultTargets = ['web', 'ios', 'android']
 
-const BASE_TYPECHECK = 'tsrx-tsc --noEmit'
+const BASE_TYPECHECK = 'xplat typecheck'
 
 // package.json keys every scaffolded app keeps regardless of target set —
 // the targets' `scripts` lists own the rest.
-const BASE_SCRIPTS = ['xplat', 'lint', 'lint:fix']
+const BASE_SCRIPTS = ['xplat', 'lint', 'lint:fix', 'format']
 
 /** Expand `requires` edges, dependencies first. Throws on unknown ids. */
 export function resolveTargets(ids) {
@@ -223,7 +226,7 @@ export function composeManifest(ids) {
 		}
 	}
 
-	scripts.typecheck = typecheck.join(' && ')
+	scripts.typecheck = [...new Set(typecheck)].join(' && ')
 	// Keep the template's key order: scripts sit where they were.
 	manifest.scripts = {}
 	for (const name of Object.keys(tpl.scripts ?? {})) {
@@ -384,13 +387,33 @@ function ensurePatchEntries(appRoot, enabledIds) {
 	return true
 }
 
+/**
+ * The tsconfig.json a given target set produces. One program covers every
+ * platform suffix (moduleSuffixes is the fixed precedence order); a web-only
+ * scaffold just drops the native ambient root and entrypoint.
+ */
+export function composeTsconfig(ids) {
+	const resolved = new Set(resolveTargets(ids))
+	const config = JSON.parse(readFileSync(join(TEMPLATE_DIR, 'tsconfig.json'), 'utf8'))
+	if (!resolved.has('native-shared')) {
+		delete config.files
+		config.compilerOptions.types = (config.compilerOptions.types ?? []).filter(
+			(t) => t !== '@nativescript/types',
+		)
+
+		config.exclude = [...new Set([...(config.exclude ?? []), 'src/main.ts'])]
+	}
+
+	return JSON.stringify(config, null, '\t') + '\n'
+}
+
 /** Write a scaffold for `ids` into `dir` (must not exist or be empty). */
 export function composeTargets(ids, dir) {
 	const resolved = new Set(resolveTargets(ids))
 	mkdirSync(dir, { recursive: true })
 
 	for (const rel of walk(TEMPLATE_DIR)) {
-		if (rel === 'package.json' || rel === 'pnpm-workspace.yaml') {
+		if (rel === 'package.json' || rel === 'pnpm-workspace.yaml' || rel === 'tsconfig.json') {
 			continue // generated below
 		}
 
@@ -406,9 +429,43 @@ export function composeTargets(ids, dir) {
 
 	writeFileSync(join(dir, 'package.json'), JSON.stringify(composeManifest(ids), null, '\t') + '\n')
 	writeFileSync(join(dir, 'pnpm-workspace.yaml'), composeWorkspaceYaml(ids))
+	writeFileSync(join(dir, 'tsconfig.json'), composeTsconfig(ids))
 	return [...resolved]
 }
 
+/** Write the cross-platform library starter into `dir`. */
+export function composeLibrary(dir, packageName = basename(resolve(dir))) {
+	if (
+		packageName.length > 214 ||
+		!/^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/.test(packageName)
+	) {
+		throw new Error(
+			`invalid npm package name "${packageName}" — use lowercase letters, numbers, dots, underscores, or hyphens`,
+		)
+	}
+
+	mkdirSync(dir, { recursive: true })
+	for (const rel of walk(LIBRARY_TEMPLATE_DIR)) {
+		if (rel === 'package.json') {
+			continue
+		}
+
+		const dest = join(dir, rel === 'gitignore' ? '.gitignore' : rel)
+		mkdirSync(dirname(dest), { recursive: true })
+		const source = join(LIBRARY_TEMPLATE_DIR, rel)
+		if (/\.(?:md|ts|tsx|mjs|json)$/.test(rel)) {
+			const content = readFileSync(source, 'utf8').replaceAll('octane-xplat-library', packageName)
+			writeFileSync(dest, content)
+		} else {
+			cpSync(source, dest, { recursive: true })
+		}
+	}
+
+	const manifest = JSON.parse(readFileSync(join(LIBRARY_TEMPLATE_DIR, 'package.json'), 'utf8'))
+	manifest.name = packageName
+	writeFileSync(join(dir, 'package.json'), JSON.stringify(manifest, null, '\t') + '\n')
+}
+
 const readJson = (file) => {
 	try {
 		return JSON.parse(readFileSync(file, 'utf8'))
@@ -451,6 +508,33 @@ function copyMissing(rel, appRoot, report) {
 	report.copied.push(rel)
 }
 
+/**
+ * Fold a native-capable app's sources into the one tsconfig program: the
+ * manifest (tsconfig.envs.json) is gone — one program covers every platform
+ * suffix — so enabling native means wiring the ambient declaration file and
+ * the entrypoint into the app's own config.
+ */
+function enableNativeInTsconfig(appRoot) {
+	const path = join(appRoot, 'tsconfig.json')
+	const text = existsSync(path) ? readFileSync(path, 'utf8') : ''
+	const config = readJson(path)
+	if (!config || typeof config !== 'object') {
+		return false
+	}
+
+	const indent = text.match(/\n(\s+)"/)?.[1] ?? '\t'
+	config.files = [...new Set(['references.d.ts', ...(config.files ?? [])])]
+	config.exclude = (config.exclude ?? []).filter((e) => e !== 'src/main.ts')
+
+	const types = config.compilerOptions?.types
+	if (config.compilerOptions && Array.isArray(types) && !types.includes('@nativescript/types')) {
+		config.compilerOptions.types = [...types, '@nativescript/types']
+	}
+
+	writeFileSync(path, JSON.stringify(config, null, indent) + '\n')
+	return true
+}
+
 /**
  * Enable `id` (plus unmet `requires`) inside an existing app at `appRoot`.
  * Additive only: existing files, scripts, and dep entries are skipped, never
@@ -515,8 +599,15 @@ export function applyTarget(appRoot, id) {
 			}
 		}
 
-		if (tid === 'native-shared' && manifest.main === undefined) {
-			manifest.main = tpl.main
+		if (tid === 'native-shared') {
+			if (manifest.main === undefined) {
+				manifest.main = tpl.main
+			}
+
+			// Native sources join the app's single typecheck program — pull the
+			// ambient declaration entry into the roots and un-exclude the
+			// NativeScript entry that a web-only scaffold skips.
+			report.tsconfigUpdated = enableNativeInTsconfig(appRoot)
 		}
 
 		touched = true

package/template/.agents/skills/xplat/SKILL.md

@@ -134,7 +134,7 @@ export function NativeGreeting() { return <Text>Hello</Text> }
 | Command                             | Catches                                                                  |
 | ----------------------------------- | ------------------------------------------------------------------------ |
 | `pnpm lint`                         | vocabulary / DOM-global / style violations — its output is authoritative |
-| `pnpm typecheck`                    | both web and native TS configs                                           |
+| `pnpm typecheck`                    | `tsconfig.json` + every environment declared in `tsconfig.envs.json`     |
 | `pnpm dev`                          | web behavior                                                             |
 | `pnpm dev:ios` / `pnpm dev:android` | the platform where behavior actually differs                             |
 

package/template/.agents/skills/xplat/references/navigation.md

@@ -5,7 +5,8 @@ web turns it into a URL, while native presents the screen in the app's navigatio
 Put components in `.tsrx` files.
 
 ```tsrx
-import { defineRoutes, registerRoutes, Text } from '@octane-xplat/ui'
+import { Text } from '@octane-xplat/ui'
+import { defineRoutes, registerRoutes } from '@octane-xplat/ui/routing'
 
 function Home() { return <Text>Home</Text> }
 function Settings() { return <Text>Settings</Text> }
@@ -20,7 +21,8 @@ After registering `settings`, use `NavLink` for a screen link or `pushRoute`
 in an event handler. `Link` accepts a URL, including an external website.
 
 ```tsrx
-import { HStack, Link, NavLink, Pressable, Text, pushRoute } from '@octane-xplat/ui'
+import { HStack, Link, NavLink, Pressable, Text } from '@octane-xplat/ui'
+import { pushRoute } from '@octane-xplat/ui/routing'
 
 export function SettingsLinks() {
   const settings = { stack: 'root', name: 'settings', params: {} }
@@ -36,7 +38,8 @@ Use `useRoute` to read the current screen and `useCanGoBack` to decide whether
 to offer a back button. Pass the same stack name to `popRoute`.
 
 ```tsrx
-import { Pressable, Text, useRoute, useCanGoBack, popRoute } from '@octane-xplat/ui'
+import { Pressable, Text } from '@octane-xplat/ui'
+import { useRoute, useCanGoBack, popRoute } from '@octane-xplat/ui/routing'
 
 export function NavigationStatus() {
   const route = useRoute('root')
@@ -56,7 +59,7 @@ on web with a warning; do not rely on it to carry application state. With a
 registered `/projects/:id` screen, navigate using the project ID:
 
 ```ts
-import { pushRoute } from '@octane-xplat/ui'
+import { pushRoute } from '@octane-xplat/ui/routing'
 
 pushRoute({ stack: 'root', name: 'projects/:id', params: { id: '42' } })
 ```
@@ -66,7 +69,8 @@ initial content; pushing a route into that stack opens it inside the tab pane.
 The screen below assumes `settings` is already registered.
 
 ```tsrx
-import { Tabs, Text, Pressable, pushRoute } from '@octane-xplat/ui'
+import { Tabs, Text, Pressable } from '@octane-xplat/ui'
+import { pushRoute } from '@octane-xplat/ui/routing'
 
 export function AppTabs() {
   return <Tabs tabs={[

package/template/.oxlintrc.json

@@ -2,7 +2,6 @@
 	"jsPlugins": ["@octane-xplat/lint/oxlint-plugin"],
 	"rules": {
 		"curly": "error",
-		"xplat/spacing": "error",
 		"xplat/no-dom-globals": "error",
 		"xplat/no-web-only-api": "error",
 		"xplat/element-vocabulary": "error",

package/template/package.json

@@ -15,37 +15,38 @@
 		"build:android": "ns build android",
 		"lint": "xplat-lint",
 		"lint:fix": "xplat-lint --fix",
-		"typecheck": "tsrx-tsc --noEmit && tsrx-tsc --noEmit -p tsconfig.native.json"
+		"typecheck": "xplat typecheck",
+		"format": "xplat fmt"
 	},
 	"dependencies": {
 		"@nativescript-community/gesturehandler": "2.0.45",
-		"@nativescript-community/octane": "0.2.4",
+		"@nativescript-community/octane": "catalog:",
 		"@nativescript-community/ui-drawer": "0.1.32",
-		"@nativescript/core": "9.1.3",
-		"@octane-xplat/effects": "^0.13.0",
-		"@octane-xplat/image": "^0.13.0",
-		"@octane-xplat/platform": "^0.13.0",
-		"@octane-xplat/ui": "^0.13.0",
+		"@nativescript/core": "catalog:",
+		"@octane-xplat/effects": "^0.15.0",
+		"@octane-xplat/image": "^0.15.0",
+		"@octane-xplat/platform": "^0.15.0",
+		"@octane-xplat/ui": "^0.15.0",
 		"@valor/nativescript-websockets": "2.0.3",
-		"octane": "0.11.0"
+		"octane": "catalog:"
 	},
 	"devDependencies": {
-		"@nativescript-community/vite-octane": "0.2.1",
+		"@nativescript-community/vite-octane": "catalog:",
 		"@nativescript/android": "9.1.1",
 		"@nativescript/ios": "9.1.0",
-		"@nativescript/types": "9.1.4",
-		"@nativescript/unit-test-runner": "5.0.0",
+		"@nativescript/types": "catalog:",
+		"@nativescript/unit-test-runner": "catalog:",
 		"@nativescript/vite": "8.0.17",
-		"@octane-xplat/cli": "^0.13.0",
-		"@octane-xplat/lint": "^0.13.0",
-		"@octanejs/vite-plugin": "0.1.61",
+		"@octane-xplat/cli": "^0.15.0",
+		"@octane-xplat/lint": "^0.15.0",
+		"@octanejs/vite-plugin": "catalog:",
 		"@tsrx/oxc": "0.20.0",
-		"@tsrx/typescript-plugin": "0.4.11",
+		"@tsrx/typescript-plugin": "catalog:",
 		"nativescript": "9.1.1",
 		"oxlint": "^1.74.0",
-		"typescript": "5.9.3",
-		"vite": "8.3.0",
-		"vitest": "4.1.11"
+		"typescript": "catalog:",
+		"vite": "catalog:",
+		"vitest": "catalog:"
 	},
 	"packageManager": "pnpm@11.24.0"
 }

package/template/pnpm-workspace.yaml

@@ -14,6 +14,19 @@ allowBuilds:
   '@parcel/watcher': true
   nativescript: true
   '@nativescript/core': false
+# Shared version pins — bump these here, every dependency field reads them.
+catalog:
+  octane: 0.11.0
+  '@nativescript-community/octane': 0.2.4
+  '@nativescript-community/vite-octane': 0.2.1
+  '@nativescript/core': 9.1.3
+  '@nativescript/types': 9.1.4
+  '@nativescript/unit-test-runner': 5.0.0
+  typescript: 5.9.3
+  vite: 8.3.0
+  '@octanejs/vite-plugin': 0.1.61
+  '@tsrx/typescript-plugin': 0.4.11
+  vitest: 4.1.11
 # The patch set covers optional leaf deps (tiptap, linkifyjs, …) the starter
 # doesn't install — tolerate entries that apply to nothing.
 allowUnusedPatches: true
@@ -29,7 +42,8 @@ patchedDependencies:
   # complete universal imperative-ref lifecycle, the Descriptor declaring-owner reader
   # fallback, and the signal-owner/enclosingOwner chain so child reads reuse instance
   # declarations. Verified against the registry 0.11.0 tarball; all hunks re-anchored to the
-  # rewritten compile.js and document-owner call sites.
+  # rewritten compile.js and document-owner call sites. Disposes DOM provider descendants
+  # when children become null or undefined, releasing their refs and effects.
   octane@0.11.0: node_modules/.pnpm-config/@octane-xplat/patches/patches/octane@0.11.0.patch
   # Published 9.1.3 ships the #11446 nested-tab-frame lifecycle fix and iOS explicit-size
   # flex alignment, so those hunks are removed. Retains the unshipped parent-padding
@@ -66,12 +80,25 @@ patchedDependencies:
   # device verbatim and the HTTP loader throws `Cannot find module`, deadlocking dev boot
   # before any boot recording can bundle the dep.
   "@nativescript/vite@8.0.17": node_modules/.pnpm-config/@octane-xplat/patches/patches/@nativescript__vite@8.0.17.patch
-  # Driver setProp skips `undefined` writes — NativeScript native setters coerce it (e.g.
-  # editable → ios.userInteractionEnabled = NO), leaving dead UI that still has its JS
-  # listeners. Aligns intrinsic ref types with Octane callback cleanup and nested arrays
-  # with optional entries. Advertises the implemented visibility capability so committed
-  # suspense bodies can be retained while pending.
+  # Driver treats a prop dropped from an update's complete prop bag — or set to
+  # `undefined`/`null` — as a removal and restores the documented default:
+  # Property/CssProperty setters get `unsetValue`, plain fields restore the captured
+  # pre-prop value, and applied `style` keys diff per key. A never-applied `undefined` still
+  # skips the write since NativeScript native setters coerce it (e.g. editable →
+  # ios.userInteractionEnabled = NO). Aligns intrinsic ref types with Octane callback
+  # cleanup and nested arrays with optional entries. Advertises the implemented visibility
+  # capability so committed suspense bodies can be retained while pending. Preserves
+  # authored Grid row/col/span metadata independently of NativeScript defaults and computed
+  # auto-placement, notifying Grid when placement props change.
   "@nativescript-community/octane@0.2.4": node_modules/.pnpm-config/@octane-xplat/patches/patches/@nativescript-community__octane@0.2.4.patch
+  # Retains the workspace's NativeScript driver fixes when upgrading to 0.2.5 for portal
+  # support: a prop dropped from an update's complete prop bag — or set to
+  # `undefined`/`null` — is a removal that restores the documented default
+  # (Property/CssProperty setters get `unsetValue`, plain fields the captured pre-prop
+  # value, `style` keys diff per key); a never-applied `undefined` still skips the write.
+  # Also advertises the implemented visibility capability, carries Octane callback ref
+  # types, and preserves authored Grid row/col/span metadata.
+  "@nativescript-community/octane@0.2.5": node_modules/.pnpm-config/@octane-xplat/patches/patches/@nativescript-community__octane@0.2.5.patch
   # octaneServerStrategy's SCRIPT_FILE_RE only covers [jt]sx? — .tsrx edits never emit the
   # deferred ns:hmr-delta broadcast, so component HMR silently never reaches the device.
   # Also counts open /ns-hmr sockets so the update summary stops reporting recipients=0 for
@@ -112,4 +139,4 @@ patchedDependencies:
   # bytes to disk.
   "@nativescript-community/ui-image@5.0.17": node_modules/.pnpm-config/@octane-xplat/patches/patches/@nativescript-community__ui-image@5.0.17.patch
 configDependencies:
-  "@octane-xplat/patches": 0.13.0
+  "@octane-xplat/patches": 0.15.0