create-octane-xplat 0.15.0 → 0.16.0

package/template/package.json

@@ -8,45 +8,47 @@
 		"dev": "vite",
 		"dev:ios": "ns run ios",
 		"dev:android": "ns run android",
-		"test:ios": "ns test ios",
-		"test:android": "ns test android",
 		"build": "vite build",
 		"build:ios": "ns build ios",
 		"build:android": "ns build android",
-		"lint": "xplat-lint",
-		"lint:fix": "xplat-lint --fix",
+		"test": "vitest run --config vitest.web.config.mts",
+		"test:web": "vitest run --config vitest.web.config.mts",
+		"test:ios": "ns test ios",
+		"test:android": "ns test android",
+		"lint": "xplat lint",
+		"lint:fix": "xplat lint --fix",
 		"typecheck": "xplat typecheck",
 		"format": "xplat fmt"
 	},
 	"dependencies": {
-		"@nativescript-community/gesturehandler": "2.0.45",
-		"@nativescript-community/octane": "catalog:",
-		"@nativescript-community/ui-drawer": "0.1.32",
-		"@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": "catalog:"
+		"@nativescript-community/octane": "catalog:xplat",
+		"@nativescript/core": "catalog:xplat",
+		"@octane-xplat/jsx": "catalog:xplat",
+		"@octane-xplat/platform": "catalog:xplat",
+		"@octane-xplat/ui": "catalog:xplat",
+		"@triniwiz/nativescript-masonkit": "catalog:xplat",
+		"@valor/nativescript-websockets": "catalog:xplat",
+		"octane": "catalog:xplat"
 	},
 	"devDependencies": {
-		"@nativescript-community/vite-octane": "catalog:",
-		"@nativescript/android": "9.1.1",
-		"@nativescript/ios": "9.1.0",
-		"@nativescript/types": "catalog:",
-		"@nativescript/unit-test-runner": "catalog:",
-		"@nativescript/vite": "8.0.17",
-		"@octane-xplat/cli": "^0.15.0",
-		"@octane-xplat/lint": "^0.15.0",
-		"@octanejs/vite-plugin": "catalog:",
-		"@tsrx/oxc": "0.20.0",
-		"@tsrx/typescript-plugin": "catalog:",
-		"nativescript": "9.1.1",
-		"oxlint": "^1.74.0",
-		"typescript": "catalog:",
-		"vite": "catalog:",
-		"vitest": "catalog:"
+		"@nativescript-community/vite-octane": "catalog:xplat",
+		"@nativescript/android": "catalog:xplat",
+		"@nativescript/ios": "catalog:xplat",
+		"@nativescript/types": "catalog:xplat",
+		"@nativescript/unit-test-runner": "catalog:xplat",
+		"@nativescript/vite": "catalog:xplat",
+		"@octane-xplat/cli": "catalog:xplat",
+		"@octanejs/vite-plugin": "catalog:xplat",
+		"@tsrx/oxc": "catalog:xplat",
+		"@tsrx/typescript-plugin": "catalog:xplat",
+		"jsdom": "catalog:xplat",
+		"nativescript": "catalog:xplat",
+		"typescript": "catalog:xplat",
+		"vite": "catalog:xplat",
+		"vitest": "catalog:xplat"
 	},
-	"packageManager": "pnpm@11.24.0"
+	"packageManager": "pnpm@11.24.0",
+	"engines": {
+		"node": ">=22.18.0"
+	}
 }

package/template/pnpm-workspace.yaml

@@ -14,19 +14,6 @@ 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
@@ -74,30 +61,37 @@ patchedDependencies:
   # turbo.json as a workspace root — Turborepo's per-package task configs marked apps/* as
   # roots, masking the real pnpm root so served `/node_modules/` tails never reached the
   # `.pnpm` store scan and non-hoisted transitive deps like source-map-js 404'd dev boot.
-  # The /ns/m import rewriter now resolves `#`-prefixed package `imports` specifiers through
-  # the importer's own package.json — raw-read node_modules files (e.g. octane's
+  # Linked dependency fallbacks also discover each linked package's enclosing workspace and
+  # reuse the cached, bounded workspace node_modules scan so transitive workspace siblings
+  # (auth to secure-storage to a private native plugin) resolve without the consumer
+  # supplying that workspace root. Transform candidates now keep root-relative URLs only
+  # when they identify the discovered file; nested linked-dependency and pnpm-store matches
+  # inside the app root use their actual filesystem paths, preserving query suffixes. The
+  # /ns/m import rewriter now resolves `#`-prefixed package `imports` specifiers through the
+  # importer's own package.json — raw-read node_modules files (e.g. octane's
   # dist/signals/graph.js importing `#octane/dist/signal-actions/graph`) otherwise reach the
   # device verbatim and the HTTP loader throws `Cannot find module`, deadlocking dev boot
-  # before any boot recording can bundle the dep.
+  # before any boot recording can bundle the dep. NativeScript#11551: preserve user virtual
+  # stylesheet imports while retaining browser-helper filtering, route virtual CSS through
+  # the native inline compiler/registration path before the generic virtual-module shortcut,
+  # and relay Vite virtual stylesheet updates as tagged native CSS updates through the same
+  # adapted-text endpoint. Empty sheets clear previous rules; CSS compilation failures
+  # return HTTP 500 instead of raw CSS.
   "@nativescript/vite@8.0.17": node_modules/.pnpm-config/@octane-xplat/patches/patches/@nativescript__vite@8.0.17.patch
-  # 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.
+  # types, and preserves authored Grid row/col/span metadata. Hosts custom-layout containers
+  # (e.g. MasonKit ViewBase) that own child lists via
+  # insertChild/removeChild/getChildrenCount without subclassing LayoutBase. Additionally,
+  # the masonry cutover: masonview resolves to MasonKit View and scrollview to MasonKit
+  # Scroll as the only layout containers, with zero layout props — every former prop name
+  # warns-and-drops and all CSS semantics arrive through the style bag; style keys on a
+  # mason child route to its leaf (stashed pre-attach, replayed at attach) via
+  # Style.fromView.
   "@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.
@@ -138,5 +132,46 @@ patchedDependencies:
   # SDWebImageContextOriginalStoreCacheType so a memory prefetch does not spill original
   # 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
+  # @nativescript/doctor's Android runtime check reads the app's raw devDependencies
+  # specifier and npm dist-tag resolves anything that isn't a semver range — a pnpm
+  # `catalog:` pin throws 'The determined Android runtime version ... is not valid' and
+  # kills `ns build android` before toolchain checks. Resolve catalog specifiers through the
+  # installed package's manifest, reusing the existing tgz-branch mechanism.
+  "@nativescript/doctor@2.0.18": node_modules/.pnpm-config/@octane-xplat/patches/patches/@nativescript__doctor@2.0.18.patch
+  # list/index.ios.js assigns `ObjCProtocols = [MasonListDelegate]` at module scope.
+  # MasonListDelegate is declared in Mason-Swift.h, which the app's metadata generation does
+  # not surface as a runtime global — importing masonkit on iOS throws `MasonListDelegate is
+  # not defined` during bundle eval and kills the app at boot. Guard the binding; actual
+  # List delegate conformance when the protocol is absent is a separate gap.
+  "@triniwiz/nativescript-masonkit@1.0.0-beta.110": node_modules/.pnpm-config/@octane-xplat/patches/patches/@triniwiz__nativescript-masonkit@1.0.0-beta.110.patch
 configDependencies:
-  "@octane-xplat/patches": 0.15.0
+  "@octane-xplat/patches": 0.16.0
+catalogs:
+  xplat:
+    "@nativescript-community/octane": 0.2.5
+    "@nativescript-community/vite-octane": 0.2.1
+    "@nativescript/android": 9.1.1
+    "@nativescript/core": 9.1.3
+    "@nativescript/ios": 9.1.0
+    "@nativescript/types": 9.1.4
+    "@nativescript/unit-test-runner": 5.0.0
+    "@nativescript/vite": 8.0.17
+    "@octane-xplat/cli": 0.16.0
+    "@octane-xplat/jsx": 0.16.0
+    "@octane-xplat/platform": 0.16.0
+    "@octane-xplat/ui": 0.16.0
+    "@octanejs/vite-plugin": 0.1.61
+    "@triniwiz/nativescript-masonkit": 1.0.0-beta.110
+    "@tsrx/oxc": 0.20.0
+    "@tsrx/typescript-plugin": 0.4.11
+    "@valor/nativescript-websockets": 2.0.3
+    jsdom: 30.1.1
+    nativescript: 9.1.1
+    octane: 0.11.0
+    typescript: 5.9.3
+    vite: 8.3.0
+    vitest: 4.1.11
+overrides:
+  "@nativescript/vite>esbuild": 0.27.7
+  "@nativescript-community/vite-octane>esbuild": 0.27.7
+  vite>esbuild: 0.27.7

package/template/src/app.web.test.tsx

@@ -0,0 +1,20 @@
+/** @jsxImportSource @octane-xplat/jsx/dom */
+import { expect, it, vi } from 'vitest'
+import { createRoot } from 'octane'
+import { App } from './App.tsrx'
+
+it('updates the counter when its button is pressed', async () => {
+	const container = document.createElement('div')
+	document.body.append(container)
+	const root = createRoot(container)
+	try {
+		root.render(<App />)
+		const value = () => container.querySelector('[data-testid="counter.value"]')?.textContent
+		await vi.waitFor(() => expect(value()).toBe('0'))
+		container.querySelector<HTMLElement>('[data-testid="counter.increment"]')!.click()
+		await vi.waitFor(() => expect(value()).toBe('1'))
+	} finally {
+		root.unmount()
+		container.remove()
+	}
+})

package/template/src/main.web.tsrx

@@ -1,3 +1,4 @@
+/** @jsxImportSource @octane-xplat/jsx/dom */
 import { createRoot } from 'octane';
 import { App } from './App.tsrx';
 import '@octane-xplat/ui/theme/tokens.css';

package/template/src/test-setup.web.ts

@@ -0,0 +1,17 @@
+import { vi } from 'vitest'
+
+// jsdom has no system color-scheme producer. Keep component tests in light mode.
+globalThis.matchMedia ??= (query: string) => ({
+	media: query,
+	matches: false,
+	onchange: null,
+	addListener() {},
+	removeListener() {},
+	addEventListener() {},
+	removeEventListener() {},
+	dispatchEvent: () => true,
+})
+
+// Node 26 also exposes a host localStorage getter. Use jsdom's window storage.
+declare const jsdom: { window: Window }
+vi.stubGlobal('localStorage', jsdom.window.localStorage)

package/template/tsconfig.json

@@ -5,7 +5,7 @@
 		"module": "ESNext",
 		"moduleResolution": "bundler",
 		"jsx": "preserve",
-		"jsxImportSource": "octane",
+		"jsxImportSource": "@octane-xplat/jsx",
 		"moduleSuffixes": [
 			"",
 			".web",

package/template/vite.config.ts

@@ -1,13 +1,13 @@
 import { defineConfig } from 'vite'
 import { octane } from '@octanejs/vite-plugin'
-import { xplatBoundary, xplatDevBridge, xplatNodeEnvDefine } from '@octane-xplat/cli/vite'
+import { xplatCss, xplatBoundary, xplatDevBridge, xplatNodeEnvDefine } from '@octane-xplat/cli/vite'
 
 // The web build. For native (iOS/Android), the same source runs through
 // @nativescript-community/vite-octane with `conditions: ['native']`, the
 // .ios/.android/.mobile suffix chain, and the unsuffixed native default — see
 // the octane-xplat repo's apps/mobile/vite.config.mts.
 export default defineConfig(({ mode }) => ({
-	plugins: [...octane(), xplatBoundary('web'), xplatDevBridge()],
+	plugins: [xplatCss('web'), ...octane(), xplatBoundary('web'), xplatDevBridge()],
 	define: xplatNodeEnvDefine(mode),
 	server: { port: 5200 },
 	resolve: {

package/template/vitest.web.config.mts

@@ -0,0 +1,13 @@
+import { defineConfig, mergeConfig } from 'vitest/config'
+import appConfig from './vite.config.ts'
+
+// Reuse the app's compiler, web platform resolution and aliases.
+export default defineConfig(async (env) =>
+	mergeConfig(await (typeof appConfig === 'function' ? appConfig(env) : appConfig), {
+		test: {
+			environment: 'jsdom',
+			include: ['src/**/*.web.test.{ts,tsx,tsrx}'],
+			setupFiles: ['src/test-setup.web.ts'],
+		},
+	}),
+)

package/library-template/.oxlintrc.json

@@ -1,24 +0,0 @@
-{
-	"jsPlugins": ["@octane-xplat/lint/oxlint-plugin"],
-	"rules": {
-		"curly": "error",
-		"xplat/no-dom-globals": "error",
-		"xplat/no-web-only-api": "error",
-		"xplat/element-vocabulary": "error",
-		"xplat/no-nativescript-import": "error",
-		"xplat/no-ns-deep-import": "error",
-		"xplat/no-native-dead-style": "error",
-		"xplat/no-line-height-unitless": "error",
-		"xplat/no-style-string": "error",
-		"xplat/no-unknown-class": "warn",
-		"xplat/no-ts-imports-tsrx": "error",
-		"xplat/signal-dollar-suffix": "error",
-		"xplat/require-signals-runtime": "warn",
-		"xplat/no-view-onpress": "error",
-		"xplat/no-console-debug": "error",
-		"xplat/hooks-in-plain-ts": "warn",
-		"xplat/native-pragma-first-line": "error",
-		"xplat/no-jsx-text-breakers": "error",
-		"xplat/no-root-logical-render": "error"
-	}
-}

package/template/.oxlintrc.json

@@ -1,24 +0,0 @@
-{
-	"jsPlugins": ["@octane-xplat/lint/oxlint-plugin"],
-	"rules": {
-		"curly": "error",
-		"xplat/no-dom-globals": "error",
-		"xplat/no-web-only-api": "error",
-		"xplat/element-vocabulary": "error",
-		"xplat/no-nativescript-import": "error",
-		"xplat/no-ns-deep-import": "error",
-		"xplat/no-native-dead-style": "error",
-		"xplat/no-line-height-unitless": "error",
-		"xplat/no-style-string": "error",
-		"xplat/no-unknown-class": "warn",
-		"xplat/no-ts-imports-tsrx": "error",
-		"xplat/signal-dollar-suffix": "error",
-		"xplat/require-signals-runtime": "warn",
-		"xplat/no-view-onpress": "error",
-		"xplat/no-console-debug": "error",
-		"xplat/hooks-in-plain-ts": "warn",
-		"xplat/native-pragma-first-line": "error",
-		"xplat/no-jsx-text-breakers": "error",
-		"xplat/no-root-logical-render": "error"
-	}
-}