@nativescript/vite 8.0.0-alpha.15 → 8.0.0-alpha.17

package/hmr/server/websocket.js

@@ -18,6 +18,7 @@ import * as path from 'path';
 import { createHash } from 'crypto';
 import * as PAT from './constants.js';
 import { getVendorManifest, resolveVendorSpecifier } from '../shared/vendor/registry.js';
+import { buildNsRtBridgeModule, discoverNsvBridgeExports } from './ns-rt-bridge.js';
 import { getMonorepoWorkspaceRoot, getPackageJson, getProjectFilePath, getProjectRootPath } from '../../helpers/project.js';
 import { loadPrebuiltVendorManifest } from '../shared/vendor/manifest-loader.js';
 import '../vendor-bootstrap.js';
@@ -43,13 +44,13 @@ import { classifyBootRoute, classifyHmrUpdateKind, createColdBootRequestCounter,
 import { createHmrPendingMessage } from './websocket-hmr-pending.js';
 import { extractVitePrebundleId, filterExistingNodeModulesTransformCandidates, getBlockedDeviceNodeModulesReason, getFlattenedManifestMap, isCoreGlobalsReference, isEsmFrameworkPackageSpecifier, isLikelyNativeScriptPluginSpecifier, isLikelyNativeScriptRuntimePluginSpecifier, isNativeScriptCoreModule, isNativeScriptPluginModule, normalizeNativeScriptCoreSpecifier, normalizeNodeModulesSpecifier, resolveCandidateFilePath, resolveInternalRuntimePluginBareSpecifier, resolveNodeModulesPackageBoundary, resolveVendorFromCandidate, resolveVendorRouting, rewriteFsAbsoluteToNsM, shouldPreserveBareRuntimePluginSubpathImport, stripDecoratedServePrefixes, tryReadRawExplicitJavaScriptModule, viteDepsPathToBareSpecifier, } from './websocket-module-specifiers.js';
 import { ensureNativeScriptModuleBindings, getProcessCodeResolvedSpecifierOverrides } from './websocket-module-bindings.js';
-import { collectStaticExportNamesFromFile, collectStaticExportOriginsFromFile, ensureVersionedCoreImports, extractDirectExportedNames, normalizeCoreExportOriginsForRuntime, parseCoreBridgeRequest, resolveRuntimeCoreModulePath } from './websocket-core-bridge.js';
+import { collectStaticExportNamesFromFile, collectStaticExportOriginsFromFile, extractDirectExportedNames, normalizeCoreExportOriginsForRuntime, parseCoreBridgeRequest, resolveRuntimeCoreModulePath } from './websocket-core-bridge.js';
 import { createSharedTransformRequestRunner } from './shared-transform-request.js';
 import { formatNsMHmrServeTag, getNumericServeVersionTag, rewriteNsMImportPathForHmr } from './websocket-ns-m-paths.js';
 import { ensureDynamicHmrImportHelper } from './websocket-served-module-helpers.js';
 export { ensureNativeScriptModuleBindings, getProcessCodeResolvedSpecifierOverrides } from './websocket-module-bindings.js';
 export { stripDecoratedServePrefixes, tryReadRawExplicitJavaScriptModule } from './websocket-module-specifiers.js';
-export { collectStaticExportNamesFromFile, collectStaticExportOriginsFromFile, ensureVersionedCoreImports, normalizeCoreExportOriginsForRuntime, parseCoreBridgeRequest } from './websocket-core-bridge.js';
+export { collectStaticExportNamesFromFile, collectStaticExportOriginsFromFile, normalizeCoreExportOriginsForRuntime, parseCoreBridgeRequest } from './websocket-core-bridge.js';
 export { rewriteAngularEntryRegisterOnly } from './websocket-angular-entry.js';
 // Re-export the canonical URL rewriter from `websocket-ns-m-paths.js` so the
 // existing test suites (which import from `./websocket.js`) keep working
@@ -458,8 +459,7 @@ function stripViteDynamicImportVirtual(code) {
 // is install-once-per-isolate, dedupes per-URL (so semver's ~30 deep
 // imports produce ~30 lines on the first boot and 0 on subsequent
 // boots within the same isolate), and uses `console.warn` so the
-// message reads as advisory (the round-3 finding in
-// LATEST-05-07-2026-HMR_ANGULAR_DEBUG_SESSION.md). Forensic detail
+// message reads as advisory. Forensic detail
 // (stack) lives on `globalThis.__NS_REQUIRE_GUARD_LAST__` for
 // post-mortem inspection. Set `globalThis.__NS_REQUIRE_GUARD_VERBOSE__`
 // to `true` before any module loads to restore per-call logging.
@@ -1209,6 +1209,22 @@ function processCodeForDevice(code, isVitePreBundled, preserveVendorImports = fa
     // Running the normalizer on libraries like tslib injects harmful destructures
     // (e.g., `const { SuppressedError } = __ns_rt_ns_1`) that shadow globals.
     if (!isNodeModule) {
+        // CRITICAL ORDERING: canonicalise any bare `@nativescript/core[/sub]`
+        // specifiers to `/ns/core[/sub]` BEFORE the AST normaliser sees them.
+        // `astNormalizeModuleImportsAndHelpers` defensively rewrites bare
+        // `@nativescript/core` imports and emits a one-shot
+        // `[ast-normalizer] unexpected @nativescript/core spec` warning —
+        // the warning means the upstream rewriter regressed. For Vue SFC
+        // `<script>` blocks the bare specifier flows through Vite's
+        // transform pipeline without a per-statement source-string rewrite
+        // (Vite's resolver only edits the module graph, not the emitted
+        // code), so the only upstream rewriter that can canonicalise these
+        // in dev mode is this regex sweep. Running it here keeps the AST
+        // normaliser purely a tripwire instead of an active rewriter.
+        try {
+            result = sanitizeStrayCoreReferences(result);
+        }
+        catch { }
         try {
             result = astNormalizeModuleImportsAndHelpers(result);
         }
@@ -1413,8 +1429,7 @@ function processCodeForDevice(code, isVitePreBundled, preserveVendorImports = fa
         const vendorCoreRE1 = /globalThis\.__nsVendor\s*\(\s*["']@nativescript\/core["']\s*\)/g;
         const vendorCoreRE2 = /__nsVendor\s*\(\s*["']@nativescript\/core["']\s*\)/g;
         if (vendorCoreRE1.test(result) || vendorCoreRE2.test(result)) {
-            // Ensure an import for the core bridge exists
-            const hasImport = /import\s+__ns_core_bridge\s+from\s+["'][^"']*\/(?:\@ns|ns)\/core(?:\/[\d]+)?(?:\?p=[^"']+)?["']\s*;?/.test(result) || /(^|\n)\s*import\s+__ns_core_bridge\s+from\s+["']\/(?:\@ns|ns)\/core["']\s*;?/m.test(result);
+            const hasImport = /import\s+__ns_core_bridge\s+from\s+["'][^"']*\/(?:\@ns|ns)\/core(?:\/[^"']+)?["']\s*;?/.test(result) || /(^|\n)\s*import\s+__ns_core_bridge\s+from\s+["']\/(?:\@ns|ns)\/core["']\s*;?/m.test(result);
             if (!hasImport) {
                 result = `import __ns_core_bridge from "/ns/core";\n` + result;
             }
@@ -1428,7 +1443,7 @@ function processCodeForDevice(code, isVitePreBundled, preserveVendorImports = fa
         const reqCoreRE1 = /(^|[^.\w$])require\(\s*["']@nativescript\/core([^"'\n]*)["']\s*\)/g;
         const reqCoreRE2 = /(?:globalThis|window|self)\.require\(\s*["']@nativescript\/core([^"'\n]*)["']\s*\)/g;
         if (reqCoreRE1.test(result) || reqCoreRE2.test(result)) {
-            const hasImport = /import\s+__ns_core_bridge\s+from\s+["'][^"']*\/(?:\@ns|ns)\/core(?:\/[\d]+)?(?:\?p=[^"']+)?["']\s*;?/.test(result) || /(^|\n)\s*import\s+__ns_core_bridge\s+from\s+["']\/(?:\@ns|ns)\/core["']\s*;?/m.test(result);
+            const hasImport = /import\s+__ns_core_bridge\s+from\s+["'][^"']*\/(?:\@ns|ns)\/core(?:\/[^"']+)?["']\s*;?/.test(result) || /(^|\n)\s*import\s+__ns_core_bridge\s+from\s+["']\/(?:\@ns|ns)\/core["']\s*;?/m.test(result);
             if (!hasImport) {
                 result = `import __ns_core_bridge from "/ns/core";\n` + result;
             }
@@ -1458,7 +1473,7 @@ function processCodeForDevice(code, isVitePreBundled, preserveVendorImports = fa
                 return m.length === 2 ? `${m[0].trim()}: ${m[1].trim()}` : seg;
             })
                 .join(', ');
-            const reNamed = /(^|\n)\s*import\s*\{([^}]+)\}\s*from\s*["']((?:https?:\/\/[^"']+)?\/ns\/core(?:\/[\d]+)?(?:\?p=[^"']+)?)['"];?\s*/gm;
+            const reNamed = /(^|\n)\s*import\s*\{([^}]+)\}\s*from\s*["']((?:https?:\/\/[^"']+)?\/ns\/core(?:\/[^"']+)?)['"];?\s*/gm;
             result = result.replace(reNamed, (_full, pfx, specList, src) => {
                 // Deep subpath URLs serve actual ESM with real named exports — skip.
                 if (isDeepCoreSubpath(src))
@@ -1468,7 +1483,7 @@ function processCodeForDevice(code, isVitePreBundled, preserveVendorImports = fa
                 const decl = `const { ${toDestructureCore(specList)} } = ${tmp};`;
                 return `${pfx}import ${tmp} from ${JSON.stringify(src)};\n${decl}\n`;
             });
-            const reMixed = /(^|\n)\s*import\s+([A-Za-z_$][\w$]*)\s*,\s*\{([^}]+)\}\s*from\s*["']((?:https?:\/\/[^"']+)?\/ns\/core(?:\/[\d]+)?(?:\?p=[^"']+)?)['"];?\s*/gm;
+            const reMixed = /(^|\n)\s*import\s+([A-Za-z_$][\w$]*)\s*,\s*\{([^}]+)\}\s*from\s*["']((?:https?:\/\/[^"']+)?\/ns\/core(?:\/[^"']+)?)['"];?\s*/gm;
             result = result.replace(reMixed, (_full, pfx, defName, specList, src) => {
                 if (isDeepCoreSubpath(src))
                     return _full;
@@ -1713,7 +1728,10 @@ function assertNoOptimizedArtifacts(code, contextLabel) {
     }
 }
 // Ensure there are no lingering named imports from the unified core bridge.
-// Converts named imports from /ns/core[/ver][?p=...] into default import + destructuring.
+// Converts named imports from `/ns/core[/<sub>]` into default import +
+// destructuring. The package-main bridge serves a shape-shifted module whose
+// named exports come from `__ns_core_bridge.default` rather than ESM named
+// exports, so a named-import binding would be `undefined` at evaluation.
 function ensureDestructureCoreImports(code) {
     try {
         let result = code;
@@ -1727,8 +1745,8 @@ function ensureDestructureCoreImports(code) {
             return m.length === 2 ? `${m[0].trim()}: ${m[1].trim()}` : seg;
         })
             .join(', ');
-        // import { A, B } from '/ns/core[/ver][?p=...]'
-        const reNamed = /(^|\n)\s*import\s*\{([^}]+)\}\s*from\s*["']((?:https?:\/\/[^"']+)?\/ns\/core(?:\/[\d]+)?(?:\?p=[^"']+)?)['"];?\s*/gm;
+        // import { A, B } from '/ns/core[/<sub>]'
+        const reNamed = /(^|\n)\s*import\s*\{([^}]+)\}\s*from\s*["']((?:https?:\/\/[^"']+)?\/ns\/core(?:\/[^"']+)?)['"];?\s*/gm;
         result = result.replace(reNamed, (_full, pfx, specList, src) => {
             // Deep subpath URLs serve actual ESM with real named exports — skip.
             if (isDeepCoreSubpath(src))
@@ -1738,8 +1756,8 @@ function ensureDestructureCoreImports(code) {
             const decl = `const { ${toDestructure(specList)} } = ${tmp};`;
             return `${pfx}import ${tmp} from ${JSON.stringify(src)};\n${decl}\n`;
         });
-        // import Default, { A, B } from '/ns/core[...]'
-        const reMixed = /(^|\n)\s*import\s+([A-Za-z_$][\w$]*)\s*,\s*\{([^}]+)\}\s*from\s*["']((?:https?:\/\/[^"']+)?\/ns\/core(?:\/[\d]+)?(?:\?p=[^"']+)?)['"];?\s*/gm;
+        // import Default, { A, B } from '/ns/core[/<sub>]'
+        const reMixed = /(^|\n)\s*import\s+([A-Za-z_$][\w$]*)\s*,\s*\{([^}]+)\}\s*from\s*["']((?:https?:\/\/[^"']+)?\/ns\/core(?:\/[^"']+)?)['"];?\s*/gm;
         result = result.replace(reMixed, (_full, pfx, defName, specList, src) => {
             if (isDeepCoreSubpath(src))
                 return _full;
@@ -1856,6 +1874,27 @@ function dedupeRtNamedImportsAgainstDestructures(code) {
  */
 export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, projectRoot, verbose = false, outputDirOverrideRel, httpOrigin, resolveVendorAsHttp = false) {
     let result = code;
+    // Pre-normalize concatenated imports onto their own lines.
+    //
+    // Babel's `genCode(ast, { retainLines: true })` in
+    // `astNormalizeModuleImportsAndHelpers` (which runs before us in the SFC
+    // asm pipeline, and in several other hot paths) can emit multiple
+    // statements on a single line, e.g.:
+    //   `} = __ns_rt_ns_1;import { $goTo } from "../utils";import PageWrapper from ...;`
+    //
+    // IMPORT_PATTERN_1/_2/_3/SIDE_EFFECT all anchor on `(?:^|\n)\s*import`,
+    // so any import past the first one on a single line is silently dropped
+    // by the rewriter. Downstream that leaves bare relative specifiers like
+    // `../utils` to be resolved by the iOS HTTP ESM loader, which interprets
+    // them relative to the `/ns/asm/0?path=...` URL and 404s on the
+    // resulting `/ns/utils`. Splitting `;import` onto its own line makes the
+    // existing patterns match every import, restoring the rewrite contract.
+    //
+    // Mirrors the same normalization already performed in
+    // `core-sanitize.ts::normalizeStrayCoreStringLiterals` (`;\s*import` →
+    // `;\nimport`) but applied universally at the rewriter entry point so
+    // every caller benefits without having to opt in.
+    result = result.replace(/;\s*import\s+/g, ';\nimport ');
     const httpOriginSafe = httpOrigin;
     const mixedRuntimePluginHttpRootPackages = collectMixedRuntimePluginHttpRootPackages(result, projectRoot);
     const isDynamicImportPrefix = (prefix) => /import\(\s*["']?$/.test(prefix.trimStart());
@@ -1873,13 +1912,14 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
     try {
         let coreAliasIdx = 0;
         const mkAlias = () => `__NSC${coreAliasIdx++}`;
-        // Use the canonical PATH form `/ns/core/<sub>` (NOT the legacy
-        // `/ns/core?p=<sub>` query form). The iOS HTTP ESM loader caches
-        // module records by URL string — if vendor.mjs's external imports
-        // resolve to `/ns/core/<sub>` (via the import map + buildCoreUrl()
-        // canonical generator) and the app's rewritten imports resolve to
-        // `/ns/core?p=<sub>`, V8 creates two distinct module records for
-        // the same logical core subpath. Each gets its own class
+        // Use the canonical PATH form `/ns/core/<sub>`. The iOS HTTP ESM
+        // loader caches module records by URL string — every emitter
+        // (`buildCoreUrl()` / `buildCoreUrlPath()`, the runtime import map,
+        // vendor `require()` shims, app-side rewrites, the cold-boot
+        // preload in `entry-runtime.ts`) MUST produce the same byte
+        // string for the same logical core subpath. A divergence creates
+        // two distinct V8 module records for the same source. Each gets
+        // its own class
         // identities (TextBase, View, etc.), and side-effect patches
         // applied to one (e.g. @nativescript-community/text's
         // `TextBase.prototype.setTextDecorationAndTransform` override
@@ -2248,6 +2288,40 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
                 return `${prefix}./${depFile}${suffix}`;
             }
         }
+        // ── Bare specifier vendor routing ────────────────────────────
+        // Bare specifiers like `pinia`, `dayjs`, `lodash` never reach
+        // the `nodeModulesSpecifier` branch above because
+        // `normalizeNodeModulesSpecifier` keys on a literal
+        // `/node_modules/` segment in the path. Without this check
+        // they'd fall straight into the HTTP fallback below and get
+        // rewritten to `/ns/m/node_modules/<spec>`, which serves the
+        // package source over HTTP and bypasses the device-side import
+        // map's `<pkg>` → `ns-vendor://<pkg>` entry. For CJS/UMD
+        // packages (e.g. Pinia) the bare HTTP path doesn't expose the
+        // full named-exports surface (only the default export round-
+        // trips), so consumers like
+        // `import { defineStore } from "pinia"` blow up at instantiate
+        // time with `SyntaxError: ... does not provide an export named
+        // 'defineStore'`. Preserving the bare spec lets the vendor
+        // bridge serve it from the prebuilt `bundle.mjs`, which already
+        // re-exports the full CJS surface. Subpath imports
+        // (`pinia/plugins/foo`) intentionally fall through to the
+        // HTTP fallback — `resolveVendorRouting` returns
+        // `{ route: 'http' }` for non-main-entry subpaths even when the
+        // root package is in the manifest, mirroring the
+        // `nodeModulesSpecifier` branch.
+        if (spec && !spec.startsWith('/') && !spec.startsWith('./') && !spec.startsWith('../') && !/^https?:\/\//i.test(spec) && !spec.startsWith('ns-vendor:') && !spec.startsWith('@nativescript/core')) {
+            const bareNpmRe = /^(?:@[A-Za-z0-9][\w.-]*\/)?[A-Za-z0-9][\w.-]*(?:\/[\w.\-/]+)?$/;
+            if (bareNpmRe.test(spec)) {
+                const bareVendorRouting = resolveVendorRouting(spec, projectRoot);
+                if (bareVendorRouting?.route === 'vendor') {
+                    if (verbose) {
+                        console.log(`[rewrite] bare vendor import: ${spec} → ${bareVendorRouting.bareSpec}`);
+                    }
+                    return `${prefix}${bareVendorRouting.bareSpec}${suffix}`;
+                }
+            }
+        }
         // Bare npm package specifier fallback — route to /ns/m/node_modules/.
         // This catches specifiers like `source-map-js/lib/source-map-generator.js`
         // emitted by helpers such as the CommonJS compat transform, which Vite
@@ -3143,7 +3217,6 @@ function createHmrWebSocketPlugin(opts) {
                         const origin = getServerOrigin(server);
                         code = ensureVersionedRtImports(code, origin, graphVersion);
                         code = ACTIVE_STRATEGY.ensureVersionedImports(code, origin, graphVersion);
-                        code = ensureVersionedCoreImports(code, origin, graphVersion);
                     }
                     catch { }
                     // Compute rel .mjs output path
@@ -3200,7 +3273,6 @@ function createHmrWebSocketPlugin(opts) {
                                 try {
                                     depCode = ensureVersionedRtImports(depCode, getServerOrigin(server), graphVersion);
                                     depCode = ACTIVE_STRATEGY.ensureVersionedImports(depCode, getServerOrigin(server), graphVersion);
-                                    depCode = ensureVersionedCoreImports(depCode, getServerOrigin(server), graphVersion);
                                 }
                                 catch { }
                                 let depRel = depResolved.replace(/^\//, '').replace(/\.(tsx?|jsx?)$/i, '.mjs');
@@ -3928,7 +4000,6 @@ export const piniaSymbol = p.piniaSymbol;
                         const verNum = 0;
                         code = ensureVersionedRtImports(code, getServerOrigin(server), verNum);
                         code = ACTIVE_STRATEGY.ensureVersionedImports(code, getServerOrigin(server), verNum);
-                        code = ensureVersionedCoreImports(code, getServerOrigin(server), verNum);
                     }
                     catch { }
                     // `/ns/m` URL finalize step.
@@ -4140,162 +4211,15 @@ export const piniaSymbol = p.piniaSymbol;
                     res.setHeader('Expires', '0');
                     const rtVerSeg = urlObj.pathname.replace(/^\/ns\/rt\/?/, '');
                     const rtVer = /^[0-9]+$/.test(rtVerSeg) ? rtVerSeg : String(graphVersion || 0);
-                    const origin = getServerOrigin(server);
-                    let code = `// [ns-rt][v2.3] NativeScript-Vue runtime bridge (module-scoped cache, no globals)\n` +
-                        `const __origin = ((typeof globalThis !== 'undefined' && globalThis && globalThis.__NS_HTTP_ORIGIN__) || (new URL(import.meta.url)).origin);\n` +
-                        `let __ns_core_bridge = null; try { import(__origin + "/ns/core/${rtVer}").then(m => { __ns_core_bridge = m; }).catch(() => {}); } catch {}\n` +
-                        `const g = globalThis;\n` +
-                        `const reg = (g.__nsVendorRegistry ||= new Map());\n` +
-                        `const req = reg && reg.get ? (g.__nsVendorRequire || g.__nsRequire || g.require) : (g.__nsRequire || g.require);\n` +
-                        `let __cached_rt = null;\n` +
-                        `let __cached_vm = null;\n` +
-                        `const __RT_REALM_TAG = (globalThis.__NS_RT_REALM__ ||= Math.random().toString(36).slice(2));\n` +
-                        // One-shot evaluation marker to confirm the bridge is executed on
-                        // device. Gated on __NS_ENV_VERBOSE__ so it stays silent unless
-                        // the developer opts in via NS_VITE_VERBOSE / VITE_DEBUG_LOGS.
-                        `try { if (!(globalThis.__NS_RT_ONCE__ && globalThis.__NS_RT_ONCE__.eval)) { (globalThis.__NS_RT_ONCE__ ||= {}).eval = true; if (globalThis.__NS_ENV_VERBOSE__) console.log('[ns-rt] evaluated', { rtRealm: __RT_REALM_TAG }); } } catch {}\n` +
-                        `function __ensure(){\n` +
-                        `  if (__cached_rt) return __cached_rt;\n` +
-                        `  let vm = null;\n` +
-                        `  try { vm = reg && reg.has && reg.has('nativescript-vue') ? reg.get('nativescript-vue') : (typeof req==='function' ? req('nativescript-vue') : null); } catch {}\n` +
-                        `  if (!vm) { try { vm = reg && reg.has && reg.has('vue') ? reg.get('vue') : (typeof req==='function' ? req('vue') : null); } catch {} }\n` +
-                        `  const rt = (vm && (vm.default ?? vm)) || {};\n` +
-                        `  __cached_vm = vm;\n` +
-                        `  __cached_rt = rt;\n` +
-                        `  return rt;\n` +
-                        `}\n` +
-                        `// Soft-globals for @nativescript/core when missing (dev-only safety)\n` +
-                        `try {\n` +
-                        `  const dev = typeof __DEV__ !== 'undefined' ? __DEV__ : true;\n` +
-                        `  if (dev) {\n` +
-                        `    const ns = (__ns_core_bridge && (__ns_core_bridge.__esModule && __ns_core_bridge.default ? __ns_core_bridge.default : (__ns_core_bridge.default || __ns_core_bridge))) || __ns_core_bridge || {};\n` +
-                        `    if (ns) {\n` +
-                        `      if (!g.Frame && ns.Frame) g.Frame = ns.Frame;\n` +
-                        `      if (!g.Page && ns.Page) g.Page = ns.Page;\n` +
-                        `      if (!g.Application && (ns.Application||ns.app||ns.application)) g.Application = (ns.Application||ns.app||ns.application);\n` +
-                        `    }\n` +
-                        `  }\n` +
-                        `} catch {}\n` +
-                        `const __get = (k) => { const rt = __ensure(); const v = rt && rt[k]; if (typeof v !== 'function' && v === undefined) { throw new Error('[ns-rt] missing export '+k); } return v; };\n` +
-                        `export const __realm = __RT_REALM_TAG;\n` +
-                        `export const defineComponent = (...a) => (__get('defineComponent'))(...a);\n` +
-                        `export const resolveComponent = (...a) => (__ensure().resolveComponent)(...a);\n` +
-                        `export const createVNode = (...a) => (__ensure().createVNode)(...a);\n` +
-                        `export const createTextVNode = (...a) => (__ensure().createTextVNode)(...a);\n` +
-                        `export const createCommentVNode = (...a) => (__ensure().createCommentVNode)(...a);\n` +
-                        `export const Fragment = (__ensure().Fragment);\n` +
-                        `export const Teleport = (__ensure().Teleport);\n` +
-                        `export const Transition = (__ensure().Transition);\n` +
-                        `export const TransitionGroup = (__ensure().TransitionGroup);\n` +
-                        `export const KeepAlive = (__ensure().KeepAlive);\n` +
-                        `export const Suspense = (__ensure().Suspense);\n` +
-                        `export const withCtx = (...a) => (__ensure().withCtx)(...a);\n` +
-                        `export const openBlock = (...a) => (__ensure().openBlock)(...a);\n` +
-                        `export const createBlock = (...a) => (__ensure().createBlock)(...a);\n` +
-                        `export const createElementVNode = (...a) => (__ensure().createElementVNode)(...a);\n` +
-                        `export const createElementBlock = (...a) => (__ensure().createElementBlock)(...a);\n` +
-                        `export const renderSlot = (...a) => (__ensure().renderSlot)(...a);\n` +
-                        `export const mergeProps = (...a) => (__ensure().mergeProps)(...a);\n` +
-                        `export const toHandlers = (...a) => (__ensure().toHandlers)(...a);\n` +
-                        `export const renderList = (...a) => (__ensure().renderList)(...a);\n` +
-                        `export const normalizeProps = (...a) => (__ensure().normalizeProps)(...a);\n` +
-                        `export const guardReactiveProps = (...a) => (__ensure().guardReactiveProps)(...a);\n` +
-                        `export const normalizeClass = (...a) => (__ensure().normalizeClass)(...a);\n` +
-                        `export const normalizeStyle = (...a) => (__ensure().normalizeStyle)(...a);\n` +
-                        `export const toDisplayString = (...a) => (__ensure().toDisplayString)(...a);\n` +
-                        `export const withDirectives = (...a) => (__ensure().withDirectives)(...a);\n` +
-                        `export const resolveDirective = (...a) => (__ensure().resolveDirective)(...a);\n` +
-                        `export const withModifiers = (...a) => (__ensure().withModifiers)(...a);\n` +
-                        `export const withKeys = (...a) => (__ensure().withKeys)(...a);\n` +
-                        `export const resolveDynamicComponent = (...a) => (__ensure().resolveDynamicComponent)(...a);\n` +
-                        `export const isVNode = (...a) => (__ensure().isVNode)(...a);\n` +
-                        `export const cloneVNode = (...a) => (__ensure().cloneVNode)(...a);\n` +
-                        `export const isRef = (...a) => (__ensure().isRef)(...a);\n` +
-                        `export const ref = (...a) => (__ensure().ref)(...a);\n` +
-                        `export const shallowRef = (...a) => (__ensure().shallowRef)(...a);\n` +
-                        `export const unref = (...a) => (__ensure().unref)(...a);\n` +
-                        `export const computed = (...a) => (__ensure().computed)(...a);\n` +
-                        `export const reactive = (...a) => (__ensure().reactive)(...a);\n` +
-                        `export const readonly = (...a) => (__ensure().readonly)(...a);\n` +
-                        `export const isReactive = (...a) => (__ensure().isReactive)(...a);\n` +
-                        `export const isReadonly = (...a) => (__ensure().isReadonly)(...a);\n` +
-                        `export const toRaw = (...a) => (__ensure().toRaw)(...a);\n` +
-                        `export const markRaw = (...a) => (__ensure().markRaw)(...a);\n` +
-                        `export const shallowReactive = (...a) => (__ensure().shallowReactive)(...a);\n` +
-                        `export const shallowReadonly = (...a) => (__ensure().shallowReadonly)(...a);\n` +
-                        `export const watch = (...a) => (__ensure().watch)(...a);\n` +
-                        `export const watchEffect = (...a) => (__ensure().watchEffect)(...a);\n` +
-                        `export const watchPostEffect = (...a) => (__ensure().watchPostEffect)(...a);\n` +
-                        `export const watchSyncEffect = (...a) => (__ensure().watchSyncEffect)(...a);\n` +
-                        `export const onBeforeMount = (...a) => (__ensure().onBeforeMount)(...a);\n` +
-                        `export const onMounted = (...a) => (__ensure().onMounted)(...a);\n` +
-                        `export const onBeforeUpdate = (...a) => (__ensure().onBeforeUpdate)(...a);\n` +
-                        `export const onUpdated = (...a) => (__ensure().onUpdated)(...a);\n` +
-                        `export const onBeforeUnmount = (...a) => (__ensure().onBeforeUnmount)(...a);\n` +
-                        `export const onUnmounted = (...a) => (__ensure().onUnmounted)(...a);\n` +
-                        `export const onActivated = (...a) => (__ensure().onActivated)(...a);\n` +
-                        `export const onDeactivated = (...a) => (__ensure().onDeactivated)(...a);\n` +
-                        `export const onErrorCaptured = (...a) => (__ensure().onErrorCaptured)(...a);\n` +
-                        `export const onRenderTracked = (...a) => (__ensure().onRenderTracked)(...a);\n` +
-                        `export const onRenderTriggered = (...a) => (__ensure().onRenderTriggered)(...a);\n` +
-                        `export const nextTick = (...a) => (__ensure().nextTick)(...a);\n` +
-                        `export const h = (...a) => (__ensure().h)(...a);\n` +
-                        `export const provide = (...a) => (__ensure().provide)(...a);\n` +
-                        `export const inject = (...a) => (__ensure().inject)(...a);\n` +
-                        `export const vShow = (__ensure().vShow);\n` +
-                        `export const createApp = (...a) => (__ensure().createApp)(...a);\n` +
-                        `export const registerElement = (...a) => (__ensure().registerElement)(...a);\n` +
-                        `export const $navigateTo = (...a) => { const vm = (__cached_vm || (void __ensure(), __cached_vm)); const rt = __ensure(); try { if (!(g && g.Frame)) { const ns = (__ns_core_bridge && (__ns_core_bridge.__esModule && __ns_core_bridge.default ? __ns_core_bridge.default : (__ns_core_bridge.default || __ns_core_bridge))) || __ns_core_bridge || {}; if (ns) { if (!g.Frame && ns.Frame) g.Frame = ns.Frame; if (!g.Page && ns.Page) g.Page = ns.Page; if (!g.Application && (ns.Application||ns.app||ns.application)) g.Application = (ns.Application||ns.app||ns.application); } } } catch {} try { const hmrRealm = (g && g.__NS_HMR_REALM__) || 'unknown'; const hasTop = !!(g && g.Frame && g.Frame.topmost && g.Frame.topmost()); const top = hasTop ? g.Frame.topmost() : null; const ctor = top && top.constructor && top.constructor.name; } catch {} if (g && typeof g.__nsNavigateUsingApp === 'function') { try { return g.__nsNavigateUsingApp(...a); } catch (e) { console.error('[ns-rt] $navigateTo app navigator error', e); throw e; } } console.error('[ns-rt] $navigateTo unavailable: app navigator missing'); throw new Error('$navigateTo unavailable: app navigator missing'); } ;\n` +
-                        `export const $navigateBack = (...a) => { const vm = (__cached_vm || (void __ensure(), __cached_vm)); const rt = __ensure(); const impl = (vm && (vm.$navigateBack || (vm.default && vm.default.$navigateBack))) || (rt && (rt.$navigateBack || (rt.runtimeHelpers && rt.runtimeHelpers.navigateBack))); let res; try { const via = (impl && (impl === (vm && vm.$navigateBack) || impl === (vm && vm.default && vm.default.$navigateBack))) ? 'vm' : (impl ? 'rt' : 'none'); } catch {} try { if (typeof impl === 'function') res = impl(...a); } catch {} try { const top = (g && g.Frame && g.Frame.topmost && g.Frame.topmost()); if (!res && top && top.canGoBack && top.canGoBack()) { res = top.goBack(); } } catch {} try { const hook = g && (g.__NS_HMR_ON_NAVIGATE_BACK || g.__NS_HMR_ON_BACK || g.__nsAttemptBackRemount); if (typeof hook === 'function') hook(); } catch {} return res; }\n` +
-                        `export const $showModal = (...a) => { const vm = (__cached_vm || (void __ensure(), __cached_vm)); const rt = __ensure(); const impl = (vm && (vm.$showModal || (vm.default && vm.default.$showModal))) || (rt && (rt.$showModal || (rt.runtimeHelpers && rt.runtimeHelpers.showModal))); try { if (typeof impl === 'function') return impl(...a); } catch (e) { } return undefined; }\n` +
-                        // Vite client helpers re-exported through the runtime bridge.
-                        //
-                        // Vite's `vite:import-analysis` plugin rewrites unresolvable dynamic
-                        // imports (where the URL is not a static string literal) as
-                        // `__vite__injectQuery(<expr>, 'import')` and prepends an import
-                        // from `/@vite/client`. The /* @vite-ignore */ comment only
-                        // suppresses the warning, not the rewrite — Vite gates the rewrite
-                        // on `urlIsStringRE`, not `hasViteIgnoreRE`.
-                        //
-                        // In NativeScript dev, the AST normalizer (packages/vite/hmr/helpers/
-                        // ast-normalizer.ts) correctly strips the /@vite/client import (the
-                        // browser-only client module is not loadable on-device), then sees
-                        // the unbound `__vite__injectQuery` identifier and synthesizes
-                        // `const { vite__injectQuery: __vite__injectQuery } = __ns_rt_ns_1`
-                        // from this bridge. Without this export the destructure binds to
-                        // undefined and Angular 21's component HMR loader (and any other
-                        // caller of dynamic-import-with-non-literal-URL) fails with
-                        // `__vite__injectQuery is not a function` at module evaluation.
-                        //
-                        // This polyfill mirrors Vite 8's `__vite__injectQuery` in
-                        // node_modules/vite/dist/node/chunks/node.js — for relative or
-                        // absolute-path URLs it appends `?<queryToInject>` (preserving
-                        // existing search/hash); for already-absolute URLs (http(s):, etc.)
-                        // it returns the URL unchanged. Angular's `ɵɵgetReplaceMetadataURL`
-                        // returns absolute HTTP URLs, so this acts as a passthrough at
-                        // runtime, matching Vite's web behavior.
-                        `export const vite__injectQuery = (url, queryToInject) => {\n` +
-                        `  if (typeof url !== 'string') return url;\n` +
-                        `  if (url[0] !== '.' && url[0] !== '/') return url;\n` +
-                        `  const pathname = url.replace(/[?#].*$/, '');\n` +
-                        `  let search = '', hash = '';\n` +
-                        `  try { const u = new URL(url, 'http://vite.dev'); search = u.search || ''; hash = u.hash || ''; } catch {}\n` +
-                        `  return pathname + '?' + queryToInject + (search ? '&' + search.slice(1) : '') + (hash || '');\n` +
-                        `};\n` +
-                        `export default {\n` +
-                        `  defineComponent, resolveComponent, createVNode, createTextVNode, createCommentVNode,\n` +
-                        `  Fragment, Teleport, Transition, TransitionGroup, KeepAlive, Suspense, withCtx, openBlock,\n` +
-                        `  createBlock, createElementVNode, createElementBlock, renderSlot, mergeProps, toHandlers,\n` +
-                        `  renderList, normalizeProps, guardReactiveProps, normalizeClass, normalizeStyle, toDisplayString,\n` +
-                        `  withDirectives, resolveDirective, withModifiers, withKeys, resolveDynamicComponent,\n` +
-                        `  isVNode, cloneVNode, isRef, ref, shallowRef, unref, computed, reactive, readonly, isReactive, isReadonly, toRaw, markRaw, shallowReactive, shallowReadonly,\n` +
-                        `  watch, watchEffect, watchPostEffect, watchSyncEffect, onBeforeMount, onMounted, onBeforeUpdate, onUpdated,\n` +
-                        `  onBeforeUnmount, onUnmounted, onActivated, onDeactivated, onErrorCaptured, onRenderTracked, onRenderTriggered, nextTick, h, provide, inject, vShow, createApp, registerElement,\n` +
-                        `  $navigateTo, $navigateBack, $showModal,\n` +
-                        `  vite__injectQuery\n` +
-                        `};\n`;
-                    // Prepend guard and ship (harmless, keeps diagnostics consistent)
-                    code = REQUIRE_GUARD_SNIPPET + code;
+                    // Single-realm bridge: discover every export `nativescript-vue`
+                    // (plus its `@vue/runtime-core` re-export chain) publishes so
+                    // the bridge never silently drops a symbol. `discoverNsvBridgeExports`
+                    // returns the union of static discovery and the curated baseline,
+                    // with the baseline acting as the floor if discovery fails. The
+                    // shared builder owns the bridge body (preamble, passthroughs,
+                    // HMR shims, polyfills, default export) — there's no inline copy.
+                    const vendorExports = discoverNsvBridgeExports(getProjectRootPath());
+                    const code = buildNsRtBridgeModule({ rtVer, requireGuardSnippet: REQUIRE_GUARD_SNIPPET, vendorExports });
                     res.statusCode = 200;
                     res.end(code);
                 }
@@ -4366,7 +4290,7 @@ export const piniaSymbol = p.piniaSymbol;
                     return next();
                 }
             });
-            // 2.6) ESM bridge for @nativescript/core: GET /ns/core[/<ver>][?p=sub/path]
+            // 2.6) ESM bridge for @nativescript/core: GET /ns/core[/<sub>]
             //
             // Since bundle.mjs no longer bundles @nativescript/core (it is
             // declared external in the rolldown config under HMR), this
@@ -4412,7 +4336,7 @@ export const piniaSymbol = p.piniaSymbol;
                     res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0');
                     res.setHeader('Pragma', 'no-cache');
                     res.setHeader('Expires', '0');
-                    const { normalizedSub, sub, ver } = coreRequest;
+                    const { normalizedSub, sub } = coreRequest;
                     const resolveModuleId = async (moduleId) => {
                         const resolved = await server.pluginContainer?.resolveId?.(moduleId, undefined);
                         return typeof resolved === 'string' ? resolved : resolved?.id || null;
@@ -4438,7 +4362,7 @@ export const piniaSymbol = p.piniaSymbol;
                     // Vite's transform output references module IDs with /@fs,
                     // relative specifiers, or absolute project paths. Rewrite
                     // those to URLs iOS can fetch over HTTP.
-                    let rewritten = rewriteSpecifiersForDevice(transformed.code, getServerOrigin(server), Number(ver));
+                    let rewritten = rewriteSpecifiersForDevice(transformed.code, getServerOrigin(server), Number(graphVersion || 0));
                     // Invariant D (CJS/ESM interop shape) — EXPORT-SIDE fix.
                     //
                     // `@nativescript/core/index.js` declares namespace
@@ -5169,17 +5093,16 @@ export const piniaSymbol = p.piniaSymbol;
                     code = ensureVariableDynamicImportHelper(code);
                     try {
                         // For variant requests under /ns/sfc, prefer the version from the path segment when present
-                        // so that any internal '/ns/rt', '/ns/core', or '/ns/sfc' imports are aligned with the same version.
+                        // so that any internal '/ns/rt' or '/ns/sfc' imports are aligned with the same version.
+                        // `/ns/core` URLs are intentionally unversioned (realm-split history).
                         const verNum = Number(verFromPath || '0');
                         if (Number.isFinite(verNum) && verNum > 0) {
                             code = ensureVersionedRtImports(code, getServerOrigin(server), verNum);
                             code = ACTIVE_STRATEGY.ensureVersionedImports(code, getServerOrigin(server), verNum);
-                            code = ensureVersionedCoreImports(code, getServerOrigin(server), verNum);
                         }
                         else {
                             code = ensureVersionedRtImports(code, getServerOrigin(server), graphVersion);
                             code = ACTIVE_STRATEGY.ensureVersionedImports(code, getServerOrigin(server), graphVersion);
-                            code = ensureVersionedCoreImports(code, getServerOrigin(server), graphVersion);
                         }
                     }
                     catch { }
@@ -5189,7 +5112,7 @@ export const piniaSymbol = p.piniaSymbol;
                     }
                     catch { }
                     // CRITICAL: As a last step for script/template variants, re-run AST normalization and strip
-                    // any sentinel destructures that could cause duplicate locals, then re-apply core versioning.
+                    // any sentinel destructures that could cause duplicate locals, then re-apply rt versioning.
                     try {
                         code = astNormalizeModuleImportsAndHelpers(code);
                     }
@@ -5203,11 +5126,9 @@ export const piniaSymbol = p.piniaSymbol;
                         const verNum = Number(verFromPath || '0');
                         if (Number.isFinite(verNum) && verNum > 0) {
                             code = ensureVersionedRtImports(code, getServerOrigin(server), verNum);
-                            code = ensureVersionedCoreImports(code, getServerOrigin(server), verNum);
                         }
                         else {
                             code = ensureVersionedRtImports(code, getServerOrigin(server), graphVersion);
-                            code = ensureVersionedCoreImports(code, getServerOrigin(server), graphVersion);
                         }
                     }
                     catch { }
@@ -5620,10 +5541,6 @@ export const piniaSymbol = p.piniaSymbol;
                             parts.push(`export default __ns_sfc__`);
                             let inlineCode = parts.filter(Boolean).join('\n');
                             inlineCode = processCodeForDevice(inlineCode, false, true);
-                            try {
-                                inlineCode = ensureVersionedCoreImports(inlineCode, getServerOrigin(server), Number(ver));
-                            }
-                            catch { }
                             try {
                                 inlineCode = ensureDestructureCoreImports(inlineCode);
                             }
@@ -5690,10 +5607,6 @@ export const piniaSymbol = p.piniaSymbol;
                                 outParts.push('export default __ns_sfc__');
                                 let inlineCode2 = outParts.filter(Boolean).join('\n');
                                 inlineCode2 = processCodeForDevice(inlineCode2, false, true);
-                                try {
-                                    inlineCode2 = ensureVersionedCoreImports(inlineCode2, getServerOrigin(server), Number(ver));
-                                }
-                                catch { }
                                 try {
                                     inlineCode2 = ensureDestructureCoreImports(inlineCode2);
                                 }
@@ -5897,7 +5810,6 @@ export const piniaSymbol = p.piniaSymbol;
                                     const origin = getServerOrigin(server);
                                     inlineCode2 = ensureVersionedRtImports(inlineCode2, origin, Number(ver));
                                     inlineCode2 = ACTIVE_STRATEGY.ensureVersionedImports(inlineCode2, origin, Number(ver));
-                                    inlineCode2 = ensureVersionedCoreImports(inlineCode2, origin, Number(ver));
                                 }
                                 catch { }
                                 // Normalize imports/helpers via AST to ensure _defineComponent and other helpers are bound once
@@ -6001,10 +5913,6 @@ export const piniaSymbol = p.piniaSymbol;
                     // Run full device processing so helper aliasing and globals are consistent in this path too
                     let code = REQUIRE_GUARD_SNIPPET + asm;
                     code = processCodeForDevice(code, false, true, /(?:^|\/)node_modules\//.test(base), base);
-                    try {
-                        code = ensureVersionedCoreImports(code, getServerOrigin(server), Number(ver));
-                    }
-                    catch { }
                     code = rewriteImports(code, base, sfcFileMap, depFileMap, projectRoot, !!verbose, undefined, getServerOrigin(server));
                     try {
                         code = ensureDestructureCoreImports(code);
@@ -6016,7 +5924,6 @@ export const piniaSymbol = p.piniaSymbol;
                         const origin = getServerOrigin(server);
                         code = ensureVersionedRtImports(code, origin, Number(ver));
                         code = ACTIVE_STRATEGY.ensureVersionedImports(code, origin, Number(ver));
-                        code = ensureVersionedCoreImports(code, origin, Number(ver));
                     }
                     catch { }
                     // Inline-template body path already runs processCodeForDevice (AST + sanitizers); no additional _defineComponent fix needed
@@ -6174,10 +6081,6 @@ export const piniaSymbol = p.piniaSymbol;
                                     // Reuse existing sanitation chain (lightweight)
                                     code = cleanCode(code);
                                     code = processCodeForDevice(code, false, true, /(?:^|\/)node_modules\//.test(resolvedCandidate || spec), resolvedCandidate || spec);
-                                    try {
-                                        code = ensureVersionedCoreImports(code, getServerOrigin(server), graphVersion);
-                                    }
-                                    catch { }
                                     code = rewriteImports(code, spec, sfcFileMap, depFileMap, server.config?.root || process.cwd(), !!verbose, undefined, getServerOrigin(server));
                                     code = ensureVariableDynamicImportHelper(code);
                                     code = ensureGuardPlainDynamicImports(code, origin);
@@ -6229,10 +6132,6 @@ export const piniaSymbol = p.piniaSymbol;
                                                 let depCode = depTrans.code;
                                                 depCode = cleanCode(depCode);
                                                 depCode = processCodeForDevice(depCode, false, true, /(?:^|\/)node_modules\//.test(depResolved), depResolved);
-                                                try {
-                                                    depCode = ensureVersionedCoreImports(depCode, getServerOrigin(server), graphVersion);
-                                                }
-                                                catch { }
                                                 depCode = rewriteImports(depCode, depResolved, sfcFileMap, depFileMap, server.config?.root || process.cwd(), !!verbose, undefined, getServerOrigin(server));
                                                 depCode = ensureVariableDynamicImportHelper(depCode);
                                                 depCode = ensureGuardPlainDynamicImports(depCode, origin);