one 1.10.0 → 1.10.1

package/dist/esm/vite/plugins/devtoolsPlugin.native.js

@@ -1,4 +1,5 @@
 import { readFileSync } from "fs";
+import path from "path";
 import { resolvePath } from "@vxrn/resolve";
 var DEVTOOLS_VIRTUAL_ID = "/@one/dev.js";
 function createDevtoolsPlugin() {
@@ -21,8 +22,10 @@ function createDevtoolsPlugin() {
               var devtoolsPath = resolvePath("one/devtools/devtools.mjs"),
                 sourceInspectorPath = resolvePath("one/devtools/source-inspector.mjs"),
                 devtools = readFileSync(devtoolsPath, "utf-8"),
-                sourceInspector = readFileSync(sourceInspectorPath, "utf-8");
-              code = `${code}
+                sourceInspector = readFileSync(sourceInspectorPath, "utf-8"),
+                projectName = path.basename(process.cwd());
+              code = `window.__oneProjectRoot="${projectName}";
+${code}
 ${devtools}
 ${sourceInspector}`;
             }

package/dist/esm/vite/plugins/devtoolsPlugin.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["readFileSync","resolvePath","DEVTOOLS_VIRTUAL_ID","createDevtoolsPlugin","options","arguments","length","includeUI","name","apply","configureServer","server","middlewares","use","req","res","next","url","devEntryPath","devEntry","code","replace","devtoolsPath","sourceInspectorPath","devtools","sourceInspector","setHeader","end","e","console","error"],"sources":["../../../../src/vite/plugins/devtoolsPlugin.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,YAAA,QAAoB;AAC7B,SAASC,WAAA,QAAmB;AAE5B,IAAAC,mBAAM,iBAAsB;AAOrB,SAASC,qBAAA,EAAqB;EACnC,IAAAC,OAAQ,GAAAC,SAAiB,CAAAC,MAAI,QAAAD,SAAA,iBAAAA,SAAA;IAAA;MAAAE,SAAA;IAAA,IAAAH,OAAA;EAE7B,OAAO;IACLI,IAAA,EAAM;IACNC,KAAA,EAAO;IAAA;IAEPC,gBAAgBC,MAAA,EAAQ;MAEtBA,MAAA,CAAOC,WAAA,CAAYC,GAAA,CAAI,gBAAYC,GAAK,EAAAC,GAAA,EAAAC,IAAS;QAC/C,IAAIF,GAAA,CAAIG,GAAA,KAAQf,mBAAA,EAAqB;UACnC,IAAI;YAEF,IAAAgB,YAAM,GAAAjB,WAAe,uBAAY;cAAsBkB,QAAA,GAAAnB,YAAA,CAAAkB,YAAA;cAAAE,IAAA,GAAAD,QAAA,CAAAE,OAAA,gCAAAA,OAAA;YAIvD,IAAId,SAHa;cAQjB,IAAIe,YAAW,GAAArB,WAAA;gBAAAsB,mBAAA,GAAAtB,WAAA;gBAAAuB,QAAA,GAAAxB,YAAA,CAAAsB,YAAA;gBAAAG,eAAA,GAAAzB,YAAA,CAAAuB,mBAAA;cACbH,IAAA,GAAM,GAAAA,IAAA;AAIN,EAAAI,QAAA;AAAc,EAAKC,eAAQ;YAAK;YAClCV,GAAA,CAAAW,SAAA,4CAAAX,GAAA,CAAAW,SAAA,+BAAAX,GAAA,CAAAY,GAAA,CAAAP,IAAA;YAEA;UAGA,SAAAQ,CAAA;YACFC,OAAS,CAAAC,KAAG,0CAAAF,CAAA;UACV;UACFb,GAAA,CAAAW,SAAA,4CAAAX,GAAA,CAAAY,GAAA;UAEA;QAEA;QACFX,IAAA;MACA;IAAK;EACN;AACH;AAEJ,S","ignoreList":[]}
+{"version":3,"names":["readFileSync","path","resolvePath","DEVTOOLS_VIRTUAL_ID","createDevtoolsPlugin","options","arguments","length","includeUI","name","apply","configureServer","server","middlewares","use","req","res","next","url","devEntryPath","devEntry","code","replace","devtoolsPath","sourceInspectorPath","devtools","sourceInspector","projectName","basename","process","cwd","setHeader","end","e","console","error"],"sources":["../../../../src/vite/plugins/devtoolsPlugin.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,YAAA,QAAoB;AAC7B,OAAOC,IAAA,MAAU;AACjB,SAASC,WAAA,QAAmB;AAE5B,IAAAC,mBAAM,iBAAsB;AAOrB,SAASC,qBAAA,EAAqB;EACnC,IAAAC,OAAQ,GAAAC,SAAiB,CAAAC,MAAI,QAAAD,SAAA,iBAAAA,SAAA;IAAA;MAAAE,SAAA;IAAA,IAAAH,OAAA;EAE7B,OAAO;IACLI,IAAA,EAAM;IACNC,KAAA,EAAO;IAAA;IAEPC,gBAAgBC,MAAA,EAAQ;MAEtBA,MAAA,CAAOC,WAAA,CAAYC,GAAA,CAAI,gBAAYC,GAAK,EAAAC,GAAA,EAAAC,IAAS;QAC/C,IAAIF,GAAA,CAAIG,GAAA,KAAQf,mBAAA,EAAqB;UACnC,IAAI;YAEF,IAAAgB,YAAM,GAAAjB,WAAe,uBAAY;cAAsBkB,QAAA,GAAApB,YAAA,CAAAmB,YAAA;cAAAE,IAAA,GAAAD,QAAA,CAAAE,OAAA,gCAAAA,OAAA;YAIvD,IAAId,SAHa;cAQjB,IAAIe,YAAW,GAAArB,WAAA;gBAAAsB,mBAAA,GAAAtB,WAAA;gBAAAuB,QAAA,GAAAzB,YAAA,CAAAuB,YAAA;gBAAAG,eAAA,GAAA1B,YAAA,CAAAwB,mBAAA;gBAAAG,WAAA,GAAA1B,IAAA,CAAA2B,QAAA,CAAAC,OAAA,CAAAC,GAAA;cACbT,IAAA,GAAM,4BAA2BM,WAAA;AAKjC,EAAAN,IAAA;AAA8C,EAAOI,QAAI;AAAA,EAAKC,eAAQ;YAAK;YAC7EV,GAAA,CAAAe,SAAA,4CAAAf,GAAA,CAAAe,SAAA,+BAAAf,GAAA,CAAAgB,GAAA,CAAAX,IAAA;YAEA;UAGA,SAAAY,CAAA;YACFC,OAAS,CAAAC,KAAG,0CAAAF,CAAA;UACV;UACFjB,GAAA,CAAAe,SAAA,4CAAAf,GAAA,CAAAgB,GAAA;UAEA;QAEA;QACFf,IAAA;MACA;IAAK;EACN;AACH;AAEJ,S","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -154,17 +154,17 @@
     "@react-navigation/routers": "~7.5.1",
     "@swc/core": "^1.14.0",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/color-scheme": "1.10.0",
-    "@vxrn/compiler": "1.10.0",
-    "@vxrn/resolve": "1.10.0",
-    "@vxrn/tslib-lite": "1.10.0",
-    "@vxrn/use-isomorphic-layout-effect": "1.10.0",
-    "@vxrn/vite-plugin-metro": "1.10.0",
+    "@vxrn/color-scheme": "1.10.1",
+    "@vxrn/compiler": "1.10.1",
+    "@vxrn/resolve": "1.10.1",
+    "@vxrn/tslib-lite": "1.10.1",
+    "@vxrn/use-isomorphic-layout-effect": "1.10.1",
+    "@vxrn/vite-plugin-metro": "1.10.1",
     "babel-dead-code-elimination": "1.0.10",
     "babel-plugin-module-resolver": "^5.0.2",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.10.0",
+    "create-vxrn": "1.10.1",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~8.0.8",
     "expo-modules-core": "~3.0.24",
@@ -189,7 +189,7 @@
     "use-latest-callback": "^0.2.3",
     "vite": "^7.1.12",
     "vite-tsconfig-paths": "^6.0.5",
-    "vxrn": "1.10.0",
+    "vxrn": "1.10.1",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },

package/src/router/interceptRoutes.ts

@@ -89,6 +89,7 @@ function getLayoutPath(node: RouteNode): string {
 /**
  * Check if a layout path is an ancestor of (or equal to) the current path.
  * A layout at /settings/account is an ancestor of /settings/account/foo
+ * Handles dynamic segments: /[serverId]/[channelId] matches /tamagui/tamagui-apps
  */
 function isLayoutAncestorOfPath(layoutPath: string, currentPath: string): boolean {
   // Normalize paths
@@ -98,11 +99,39 @@ function isLayoutAncestorOfPath(layoutPath: string, currentPath: string): boolea
   // Root layout is ancestor of everything
   if (normalizedLayout === '/') return true
 
-  // Check if current path starts with layout path
-  return (
-    normalizedCurrent === normalizedLayout ||
-    normalizedCurrent.startsWith(normalizedLayout + '/')
-  )
+  // Split into segments for dynamic matching
+  const layoutParts = normalizedLayout.split('/').filter(Boolean)
+  const currentParts = normalizedCurrent.split('/').filter(Boolean)
+
+  // Layout can't be ancestor if it has more segments than current path
+  if (layoutParts.length > currentParts.length) return false
+
+  // Check each layout segment matches the corresponding current segment
+  // Dynamic segments like [id] match any value
+  for (let i = 0; i < layoutParts.length; i++) {
+    const layoutPart = layoutParts[i]
+    const currentPart = currentParts[i]
+
+    // Check if this is a dynamic segment
+    const dynamicMatch = matchDynamicName(layoutPart)
+    if (dynamicMatch) {
+      // Dynamic segment - matches any value (including catch-all)
+      if (dynamicMatch.deep) {
+        // Catch-all matches rest of path, so layout is definitely an ancestor
+        return true
+      }
+      // Single dynamic segment - matches this position, continue checking
+      continue
+    }
+
+    // Static segment - must match exactly
+    if (layoutPart !== currentPart) {
+      return false
+    }
+  }
+
+  // All layout segments matched
+  return true
 }
 
 /**

package/src/vite/plugins/devtoolsPlugin.ts

@@ -1,5 +1,6 @@
 import type { Plugin } from 'vite'
 import { readFileSync } from 'node:fs'
+import path from 'node:path'
 import { resolvePath } from '@vxrn/resolve'
 
 const DEVTOOLS_VIRTUAL_ID = '/@one/dev.js'
@@ -36,7 +37,8 @@ export function createDevtoolsPlugin(options: DevtoolsPluginOptions = {}): Plugi
               const sourceInspectorPath = resolvePath('one/devtools/source-inspector.mjs')
               const devtools = readFileSync(devtoolsPath, 'utf-8')
               const sourceInspector = readFileSync(sourceInspectorPath, 'utf-8')
-              code = `${code}\n${devtools}\n${sourceInspector}`
+              const projectName = path.basename(process.cwd())
+              code = `window.__oneProjectRoot="${projectName}";\n${code}\n${devtools}\n${sourceInspector}`
             }
 
             res.setHeader('Content-Type', 'application/javascript')

package/types/router/interceptRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interceptRoutes.d.ts","sourceRoot":"","sources":["../../src/router/interceptRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAc,MAAM,SAAS,CAAA;AAiBpD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,QAEtD;AAED,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAED,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAMD,MAAM,WAAW,eAAe;IAC9B,uCAAuC;IACvC,cAAc,EAAE,SAAS,CAAA;IACzB,8CAA8C;IAC9C,QAAQ,EAAE,MAAM,CAAA;IAChB,qEAAqE;IACrE,gBAAgB,EAAE,MAAM,CAAA;IACxB,4CAA4C;IAC5C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC/B;AA0FD;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,SAAS,GAAG,IAAI,EAC1B,WAAW,EAAE,MAAM,GAClB,eAAe,GAAG,IAAI,CAsCxB;AA+JD;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,QAetD;AAKD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,IAAI,QAE3D;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,OAAO,CAmBxC;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,OAAO,CAGjD;AAED;;GAEG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,GAAG,IAAI,CAGxD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,GAAG,IAAI,CAGlD;AAQD,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,QAEvD;AAED,wBAAgB,wBAAwB,IAAI,OAAO,CAElD;AAUD,QAAA,IAAI,oBAAoB,EACpB,CAAC,CACC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE;IACL,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,eAAe,CAAC,EAAE,GAAG,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,aAAa,EAAE,OAAO,CAAA;CACvB,GAAG,IAAI,KACL,IAAI,CAAC,GACV,IAAW,CAAA;AAEf,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,oBAAoB,QAEzE;AAOD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,GAAG,EACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAK/B;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,IAAI,OAAO,CAoBrD"}
+{"version":3,"file":"interceptRoutes.d.ts","sourceRoot":"","sources":["../../src/router/interceptRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAc,MAAM,SAAS,CAAA;AAiBpD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,QAEtD;AAED,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAED,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAMD,MAAM,WAAW,eAAe;IAC9B,uCAAuC;IACvC,cAAc,EAAE,SAAS,CAAA;IACzB,8CAA8C;IAC9C,QAAQ,EAAE,MAAM,CAAA;IAChB,qEAAqE;IACrE,gBAAgB,EAAE,MAAM,CAAA;IACxB,4CAA4C;IAC5C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC/B;AAuHD;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,SAAS,GAAG,IAAI,EAC1B,WAAW,EAAE,MAAM,GAClB,eAAe,GAAG,IAAI,CAsCxB;AA+JD;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,QAetD;AAKD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,IAAI,QAE3D;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,OAAO,CAmBxC;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,OAAO,CAGjD;AAED;;GAEG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,GAAG,IAAI,CAGxD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,GAAG,IAAI,CAGlD;AAQD,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,QAEvD;AAED,wBAAgB,wBAAwB,IAAI,OAAO,CAElD;AAUD,QAAA,IAAI,oBAAoB,EACpB,CAAC,CACC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE;IACL,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,eAAe,CAAC,EAAE,GAAG,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,aAAa,EAAE,OAAO,CAAA;CACvB,GAAG,IAAI,KACL,IAAI,CAAC,GACV,IAAW,CAAA;AAEf,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,oBAAoB,QAEzE;AAOD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,GAAG,EACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAK/B;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,IAAI,OAAO,CAoBrD"}

package/types/vite/plugins/devtoolsPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devtoolsPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/devtoolsPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAIlC,QAAA,MAAM,mBAAmB,iBAAiB,CAAA;AAE1C,MAAM,MAAM,qBAAqB,GAAG;IAClC,8DAA8D;IAC9D,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,qBAA0B,GAAG,MAAM,CA8ChF;AAED,OAAO,EAAE,mBAAmB,EAAE,CAAA"}
+{"version":3,"file":"devtoolsPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/devtoolsPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC,QAAA,MAAM,mBAAmB,iBAAiB,CAAA;AAE1C,MAAM,MAAM,qBAAqB,GAAG;IAClC,8DAA8D;IAC9D,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,qBAA0B,GAAG,MAAM,CA+ChF;AAED,OAAO,EAAE,mBAAmB,EAAE,CAAA"}