@nativescript/vite 8.0.0-alpha.7 → 8.0.0-alpha.9

package/hmr/server/websocket.js

@@ -11,13 +11,14 @@ const babelTraverse = traverse?.default || traverse;
 import * as t from '@babel/types';
 import { existsSync, readFileSync, statSync } from 'fs';
 import { astNormalizeModuleImportsAndHelpers, astVerifyAndAnnotateDuplicates } from '../helpers/ast-normalizer.js';
+import { getCjsNamedExports } from '../helpers/cjs-named-exports.js';
 import { stripRtCoreSentinel, stripDanglingViteCjsImports } from '../helpers/sanitize.js';
 import { WebSocketServer } from 'ws';
 import * as path from 'path';
 import { createHash } from 'crypto';
 import * as PAT from './constants.js';
 import { getVendorManifest, resolveVendorSpecifier } from '../shared/vendor/registry.js';
-import { getPackageJson, getProjectFilePath, getProjectRootPath } from '../../helpers/project.js';
+import { getMonorepoWorkspaceRoot, getPackageJson, getProjectFilePath, getProjectRootPath } from '../../helpers/project.js';
 import { loadPrebuiltVendorManifest } from '../shared/vendor/manifest-loader.js';
 import '../vendor-bootstrap.js';
 import { NS_NATIVE_TAGS } from './compiler.js';
@@ -39,7 +40,7 @@ import { angularSourceHasSemanticDecorator, canonicalizeTransformRequestCacheKey
 import { classifyGraphUpsert, shouldBroadcastGraphUpsertDelta, shouldBumpGraphVersion } from './websocket-graph-upsert.js';
 import { classifyBootRoute, classifyHmrUpdateKind, createColdBootRequestCounter, formatHmrUpdateSummary, formatPopulateInitialGraphSummary, formatServerStartupBanner } from './perf-instrumentation.js';
 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, shouldPreserveBareRuntimePluginSubpathImport, stripDecoratedServePrefixes, tryReadRawExplicitJavaScriptModule, viteDepsPathToBareSpecifier, } from './websocket-module-specifiers.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 { createSharedTransformRequestRunner } from './shared-transform-request.js';
@@ -387,10 +388,7 @@ async function expandStarExports(code, server, projectRoot, verbose, sharedTrans
             if (!names.length)
                 return null;
             if (verbose) {
-                try {
-                    console.log(`[ns/m] expanded export* -> ${names.length} names from ${vitePath}`);
-                }
-                catch { }
+                console.log(`[ns/m] expanded export* -> ${names.length} names from ${vitePath}`);
             }
             return { rep, names };
         }
@@ -453,7 +451,7 @@ function stripViteDynamicImportVirtual(code) {
     }
     return code;
 }
-const REQUIRE_GUARD_SNIPPET = `// [guard] install require('http(s)://') detector\n(()=>{try{var g=globalThis;if(g.__NS_REQUIRE_GUARD_INSTALLED__){}else{var mk=function(o,l){return function(){try{var s=arguments[0];if(typeof s==='string'&&/^(?:https?:)\\/\\//.test(s)){var e=new Error('[ns-hmr][require-guard] require of URL: '+s+' via '+l);try{console.error(e.message+'\\n'+(e.stack||''));}catch(e2){}try{g.__NS_REQUIRE_GUARD_LAST__={spec:s,stack:e.stack,label:l,ts:Date.now()};}catch(e3){}}}catch(e1){}return o.apply(this, arguments);};};if(typeof g.require==='function'&&!g.require.__NS_REQ_GUARDED__){var o1=g.require;g.require=mk(o1,'require');g.require.__NS_REQ_GUARDED__=true;}if(typeof g.__nsRequire==='function'&&!g.__nsRequire.__NS_REQ_GUARDED__){var o2=g.__nsRequire;g.__nsRequire=mk(o2,'__nsRequire');g.__nsRequire.__NS_REQ_GUARDED__=true;}g.__NS_REQUIRE_GUARD_INSTALLED__=true;}}catch(e){}})();\n`;
+const REQUIRE_GUARD_SNIPPET = `// [guard] install require('http(s)://') detector\n(()=>{try{var g=globalThis;if(g.__NS_REQUIRE_GUARD_INSTALLED__){}else{var mk=function(o,l){return function(){try{var s=arguments[0];if(typeof s==='string'&&/^(?:https?:)\\/\\//.test(s)){var e=new Error('[ns-hmr][require-guard] require of URL: '+s+' via '+l);console.error(e.message+'\\n'+(e.stack||''));try{g.__NS_REQUIRE_GUARD_LAST__={spec:s,stack:e.stack,label:l,ts:Date.now()};}catch(e3){}}}catch(e1){}return o.apply(this, arguments);};};if(typeof g.require==='function'&&!g.require.__NS_REQ_GUARDED__){var o1=g.require;g.require=mk(o1,'require');g.require.__NS_REQ_GUARDED__=true;}if(typeof g.__nsRequire==='function'&&!g.__nsRequire.__NS_REQ_GUARDED__){var o2=g.__nsRequire;g.__nsRequire=mk(o2,'__nsRequire');g.__nsRequire.__NS_REQ_GUARDED__=true;}g.__NS_REQUIRE_GUARD_INSTALLED__=true;}}catch(e){}})();\n`;
 function shouldRemapImport(spec) {
     if (!spec || typeof spec !== 'string')
         return false;
@@ -1039,7 +1037,7 @@ function deduplicateLinkerImports(code) {
         return code;
     }
 }
-export function wrapCommonJsModuleForDevice(code) {
+export function wrapCommonJsModuleForDevice(code, absolutePath) {
     if (!code)
         return code;
     try {
@@ -1065,6 +1063,22 @@ export function wrapCommonJsModuleForDevice(code) {
                 namedExports.add(name);
             }
         }
+        // Static enumeration only sees `exports.foo = ...` and `Object.defineProperty(exports, 'foo', ...)`.
+        // Real-world packages like lodash attach their entire surface to a function inside an IIFE and
+        // then `module.exports = thatFunction`. Static analysis returns zero in that case. To handle
+        // these modules we ALSO load the package in the dev-server's Node context (only when we have a
+        // node_modules path) and merge the runtime keys. See `helpers/cjs-named-exports.ts` for the
+        // reasoning and safety boundaries.
+        if (absolutePath) {
+            try {
+                for (const n of getCjsNamedExports(absolutePath)) {
+                    namedExports.add(n);
+                }
+            }
+            catch {
+                /* fall through to whatever we caught statically */
+            }
+        }
         let suffix = `\nvar __cjs_mod = module.exports;\nexport default __cjs_mod;\n`;
         if (namedExports.size) {
             const entries = Array.from(namedExports);
@@ -1457,10 +1471,18 @@ function processCodeForDevice(code, isVitePreBundled, preserveVendorImports = fa
         result = result.replace(/;\s*import\s+/g, ';\nimport ');
         result = result.replace(/}\s*import\s+/g, '}\nimport ');
         // Fallback: ensure any static import that isn't at start of line gets a newline before it.
-        // Only match after statement-ending characters (;, }, ), ], quotes) — NOT after `*` or
-        // spaces inside JSDoc comment blocks, which would accidentally extract example imports
-        // from documentation comments and hoist them as real code.
-        result = result.replace(/([;}\)\]'"`])\s*(import\s+[^;\n]*\s+from\s*["'][^"']+["'])/g, '$1\n$2');
+        //
+        // Only match after **structural** statement-ending characters: `;`, `}`, `)`, `]`. We
+        // deliberately do NOT include `'`, `"`, or `` ` `` here — those are string-literal
+        // terminators (and openers!), and including them caused the regex to fire inside
+        // example code embedded in error strings. Concrete failure observed:
+        // `@supabase/realtime-js` throws an Error whose message contains the literal
+        // `'  import ws from "ws"\n' +`. With `'` in the delimiter class, the engine matched
+        // the opening `'` of that string literal as a "statement terminator" and rewrote the
+        // example to `'\nimport ws from "..."` — splitting the string across two lines and
+        // producing a SyntaxError on device. The structural delimiters below do not appear
+        // inside string-literal openers, so the rewrite is safe.
+        result = result.replace(/([;}\)\]])\s*(import\s+[^;\n]*\s+from\s*["'][^"']+["'])/g, '$1\n$2');
     }
     catch { }
     // Collapse duplicate destructuring from the same temp namespace var (e.g., multiple const { x } = __ns_rt_ns1)
@@ -1823,6 +1845,10 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
     const mixedRuntimePluginHttpRootPackages = collectMixedRuntimePluginHttpRootPackages(result, projectRoot);
     const isDynamicImportPrefix = (prefix) => /import\(\s*["']?$/.test(prefix.trimStart());
     const importerDir = path.posix.dirname(importerPath);
+    // Resolved once per `rewriteImports` call so the per-import `/@fs/` rewriter
+    // can convert workspace-lib paths back into our `/ns/m/` pipeline. Memoized
+    // upstream — calling here is cheap and we reuse the value below.
+    const monorepoWorkspaceRootForRewrite = getMonorepoWorkspaceRoot(projectRoot);
     // Determine importer output relative path (project-relative .mjs) to compute relative imports consistently
     const importerOutRel = outputDirOverrideRel || getProjectRelativeImportPath(importerPath, projectRoot) || stripToProjectRelative(importerPath, projectRoot).replace(/\.(ts|js|tsx|jsx|mjs|mts|cts)$/i, '.mjs');
     const importerOutDir = importerOutRel ? path.posix.dirname(importerOutRel) : '';
@@ -1889,7 +1915,23 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
             const cleanPath = jsonPath.split('?')[0];
             // Resolve the JSON file path relative to the importer
             let fullPath;
-            if (cleanPath.startsWith('/')) {
+            if (cleanPath.startsWith('/@fs/')) {
+                // Vite filesystem URL: `/@fs/<abs-path>`. Strip the `/@fs` prefix
+                // (4 chars, leaving the leading `/`) to recover the absolute
+                // path. This matches `rewriteFsAbsoluteToNsM`'s convention and
+                // covers both bare specifiers Vite pre-resolved out of the
+                // project root (e.g. `emojibase-data/en/compact.json` →
+                // `/@fs/.../node_modules/.../compact.json`) and tsconfig
+                // path-alias targets that resolve outside the project root
+                // (e.g. `~shared/...metadata.json` → `/@fs/.../tools/...json`).
+                // Without this branch the next `else if` would `path.join` the
+                // `/@fs/...` URL onto `projectRoot`, collapsing the leading `/`
+                // and producing a malformed nested path that always misses on
+                // `existsSync` and triggers a `ReferenceError` at runtime when
+                // the JSON-import-failed comment leaves the binding undefined.
+                fullPath = cleanPath.slice('/@fs'.length);
+            }
+            else if (cleanPath.startsWith('/')) {
                 // Absolute from project root
                 fullPath = path.join(projectRoot, cleanPath);
             }
@@ -1911,7 +1953,7 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
                 return `const ${varName} = ${jsonContent};`;
             }
             else {
-                console.warn(`[rewrite] JSON file not found: ${fullPath}`);
+                console.warn(`[rewrite] JSON file not found: ${fullPath} (specifier=${jsonPath})`);
             }
         }
         catch (error) {
@@ -1962,17 +2004,41 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
         if (spec === '@') {
             const stub = `/ns/m/__invalid_at__.mjs`;
             if (verbose) {
-                try {
-                    console.warn(`[rewrite] mapped bare '@' spec to stub: ${stub}`);
-                }
-                catch { }
+                console.warn(`[rewrite] mapped bare '@' spec to stub: ${stub}`);
             }
             return `${prefix}${stub}${suffix}`;
         }
         spec = normalizeNativeScriptCoreSpecifier(spec);
+        // Pull `/@fs/<abs-path>` URLs back into the `/ns/m/` pipeline so they
+        // hit our CJS/UMD-wrapping handler. Vite emits `/@fs/...` for any
+        // resolved id outside the configured `root` — including hoisted
+        // `node_modules/<pkg>` entries and workspace libs in monorepos. Left
+        // untouched, the device fetches them through Vite's standard
+        // middleware which never invokes `wrapCommonJsModuleForDevice`, so a
+        // UMD module like papaparse crashes on `(this).Papa = factory()`
+        // because top-level `this` is `undefined` in ESM context.
+        if (spec.startsWith('/@fs/')) {
+            const rewritten = rewriteFsAbsoluteToNsM(spec, projectRoot, monorepoWorkspaceRootForRewrite);
+            if (rewritten) {
+                if (httpOriginSafe) {
+                    return `${prefix}${httpOriginSafe}${rewritten}${suffix}`;
+                }
+                return `${prefix}${rewritten}${suffix}`;
+            }
+            // Path resolves outside both roots — leave Vite's URL alone as a
+            // last resort. The original behaviour was to fall through here
+            // and let downstream branches (e.g. `normalizeNodeModulesSpecifier`)
+            // handle paths whose abs form happens to contain `/node_modules/`,
+            // so preserve that for the unrewritable case below.
+        }
         // Route Vite virtual modules (/@solid-refresh, etc.) through /ns/m/ so their
         // internal imports (e.g. solid-js) get vendor-rewritten by our pipeline.
-        // Skip known Vite internals (/@vite/, /@id/, /@fs/) which are handled elsewhere.
+        // Skip known Vite internals (/@vite/, /@id/) which are handled elsewhere.
+        // `/@fs/` is intentionally excluded above; if we ever reach here with a
+        // `/@fs/` spec it means the rewrite-to-`/ns/m/` pass couldn't anchor it
+        // under projectRoot or workspaceRoot, so we fall through and rely on the
+        // `normalizeNodeModulesSpecifier` branch below for paths that still
+        // contain a `/node_modules/<pkg>/` segment.
         if (spec.startsWith('/@') && !/^\/@(?:vite|id|fs)\//.test(spec)) {
             const out = `/ns/m${spec}`;
             if (httpOriginSafe) {
@@ -2186,10 +2252,7 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
     result = result.replace(/(import\(\s*['"])@(['"]\s*\))/g, (_m) => {
         const stubExpr = `import(new URL('/ns/m/__invalid_at__.mjs', import.meta.url).href)`;
         if (verbose) {
-            try {
-                console.warn(`[rewrite] mapped dynamic import('@') to /ns/m/__invalid_at__.mjs via import.meta.url`);
-            }
-            catch { }
+            console.warn(`[rewrite] mapped dynamic import('@') to /ns/m/__invalid_at__.mjs via import.meta.url`);
         }
         return stubExpr;
     });
@@ -2198,10 +2261,7 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
     result = result.replace(/(from\s*['"])@(['"])/g, (_m, p1, p2) => {
         const stub = `/ns/m/__invalid_at__.mjs`;
         if (verbose) {
-            try {
-                console.warn(`[rewrite] mapped static from '@' to ${stub}`);
-            }
-            catch { }
+            console.warn(`[rewrite] mapped static from '@' to ${stub}`);
         }
         return `${p1}${stub}${p2}`;
     });
@@ -2209,10 +2269,7 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
     result = result.replace(/(import\s*(?!\()\s*['"])@(['"])/g, (_m, p1, p2) => {
         const stub = `/ns/m/__invalid_at__.mjs`;
         if (verbose) {
-            try {
-                console.warn(`[rewrite] mapped side-effect import '@' to ${stub}`);
-            }
-            catch { }
+            console.warn(`[rewrite] mapped side-effect import '@' to ${stub}`);
         }
         return `${p1}${stub}${p2}`;
     });
@@ -2504,11 +2561,8 @@ function createHmrWebSocketPlugin(opts) {
         const gm = { id, deps: normDeps, hash };
         graph.set(id, gm);
         if (verbose) {
-            try {
-                console.log('[hmr-ws][graph] upsert', { id, deps: normDeps, hash, graphVersion, classification, bumpVersion });
-                console.log('[hmr-ws][graph] size', graph.size);
-            }
-            catch { }
+            console.log('[hmr-ws][graph] upsert', { id, deps: normDeps, hash, graphVersion, classification, bumpVersion });
+            console.log('[hmr-ws][graph] size', graph.size);
         }
         if (shouldBroadcastGraphUpsertDelta(classification, options?.emitDeltaOnInsert === true, options?.broadcastDelta !== false)) {
             emitDelta([gm], []);
@@ -2609,15 +2663,12 @@ function createHmrWebSocketPlugin(opts) {
         // `bumpedVersion=no` result is the happy path, `yes`
         // indicates a regression.
         if (verbose) {
-            try {
-                console.info(formatPopulateInitialGraphSummary({
-                    moduleCount: graph.size,
-                    durationMs: Date.now() - tStart,
-                    graphVersion,
-                    bumpedVersion: graphVersion !== versionAtStart,
-                }));
-            }
-            catch { }
+            console.info(formatPopulateInitialGraphSummary({
+                moduleCount: graph.size,
+                durationMs: Date.now() - tStart,
+                graphVersion,
+                bumpedVersion: graphVersion !== versionAtStart,
+            }));
         }
     }
     // Kick off `populateInitialGraph` in the background (non-awaited) so /ns/m
@@ -2682,10 +2733,7 @@ function createHmrWebSocketPlugin(opts) {
             const configuredTransformCacheMs = Number.parseInt(process.env.NS_VITE_HMR_TRANSFORM_CACHE_MS || '', 10);
             const transformCacheMs = Number.isFinite(configuredTransformCacheMs) && configuredTransformCacheMs >= 0 ? configuredTransformCacheMs : 60000;
             sharedTransformRequest = createSharedTransformRequestRunner((url) => server.transformRequest(url), (url, timeoutMs) => {
-                try {
-                    console.warn('[ns:m] slow transformRequest for', url, '(>' + timeoutMs + 'ms)');
-                }
-                catch { }
+                console.warn('[ns:m] slow transformRequest for', url, '(>' + timeoutMs + 'ms)');
             }, {
                 maxConcurrent: transformConcurrency,
                 resultCacheTtlMs: transformCacheMs,
@@ -2752,10 +2800,7 @@ function createHmrWebSocketPlugin(opts) {
                         log: (line) => {
                             if (!verbose)
                                 return;
-                            try {
-                                console.info(line);
-                            }
-                            catch { }
+                            console.info(line);
                         },
                     });
                 }
@@ -2874,10 +2919,7 @@ function createHmrWebSocketPlugin(opts) {
                 });
             });
             wss.on('error', (err) => {
-                try {
-                    console.warn('[hmr-ws] server error:', err?.message || String(err));
-                }
-                catch { }
+                console.warn('[hmr-ws] server error:', err?.message || String(err));
             });
             // Import map endpoint: GET /ns/import-map.json
             // Returns the import map + runtime config for __nsConfigureRuntime()
@@ -2948,11 +2990,12 @@ function createHmrWebSocketPlugin(opts) {
                     const hasExt = /\.(ts|tsx|js|jsx|mjs|mts|cts|vue)$/i.test(spec);
                     const baseNoExt = hasExt ? spec.replace(/\.(ts|tsx|js|jsx|mjs|mts|cts)$/i, '') : spec;
                     const transformRoot = server.config?.root || process.cwd();
+                    const transformWorkspaceRoot = getMonorepoWorkspaceRoot(transformRoot);
                     const candidates = [];
                     if (hasExt)
                         candidates.push(spec);
                     candidates.push(baseNoExt + '.ts', baseNoExt + '.js', baseNoExt + '.tsx', baseNoExt + '.jsx', baseNoExt + '.mjs', baseNoExt + '.mts', baseNoExt + '.cts', baseNoExt + '.vue', baseNoExt + '/index.ts', baseNoExt + '/index.js', baseNoExt + '/index.tsx', baseNoExt + '/index.jsx', baseNoExt + '/index.mjs');
-                    const transformCandidates = filterExistingNodeModulesTransformCandidates(spec, candidates, transformRoot);
+                    const transformCandidates = filterExistingNodeModulesTransformCandidates(spec, candidates, transformRoot, transformWorkspaceRoot);
                     let transformed = null;
                     let resolvedCandidate = null;
                     for (const cand of transformCandidates) {
@@ -3024,7 +3067,7 @@ function createHmrWebSocketPlugin(opts) {
                             if (seen.has(depBase))
                                 continue;
                             seen.add(depBase);
-                            const depCandidates = filterExistingNodeModulesTransformCandidates(depBase, [depBase + '.ts', depBase + '.js', depBase + '.tsx', depBase + '.jsx', depBase + '.mjs', depBase + '.mts', depBase + '.cts', depBase + '.vue', depBase + '/index.ts', depBase + '/index.js', depBase + '/index.tsx', depBase + '/index.jsx', depBase + '/index.mjs'], transformRoot);
+                            const depCandidates = filterExistingNodeModulesTransformCandidates(depBase, [depBase + '.ts', depBase + '.js', depBase + '.tsx', depBase + '.jsx', depBase + '.mjs', depBase + '.mts', depBase + '.cts', depBase + '.vue', depBase + '/index.ts', depBase + '/index.js', depBase + '/index.tsx', depBase + '/index.jsx', depBase + '/index.mjs'], transformRoot, transformWorkspaceRoot);
                             let depTrans = null;
                             let depResolved = null;
                             for (const c of depCandidates) {
@@ -3129,6 +3172,7 @@ function createHmrWebSocketPlugin(opts) {
                         return;
                     }
                     const serverRoot = (server.config?.root || process.cwd());
+                    const monorepoWorkspaceRoot = getMonorepoWorkspaceRoot(serverRoot);
                     spec = spec.replace(/[?#].*$/, '');
                     // Accept path-based boot/HMR prefixes:
                     //   /ns/m/__ns_boot__/b1/<real-spec>
@@ -3206,7 +3250,7 @@ function createHmrWebSocketPlugin(opts) {
                     const hasExt = /\.(ts|tsx|js|jsx|mjs|mts|cts|vue)$/i.test(spec);
                     const baseNoExt = hasExt ? spec.replace(/\.(ts|tsx|js|jsx|mjs|mts|cts)$/i, '') : spec;
                     const candidates = [...(hasExt ? [spec] : []), baseNoExt + '.ts', baseNoExt + '.js', baseNoExt + '.tsx', baseNoExt + '.jsx', baseNoExt + '.mjs', baseNoExt + '.mts', baseNoExt + '.cts', baseNoExt + '.vue', baseNoExt + '/index.ts', baseNoExt + '/index.js', baseNoExt + '/index.tsx', baseNoExt + '/index.jsx', baseNoExt + '/index.mjs'];
-                    const transformCandidates = filterExistingNodeModulesTransformCandidates(spec, candidates, serverRoot);
+                    const transformCandidates = filterExistingNodeModulesTransformCandidates(spec, candidates, serverRoot, monorepoWorkspaceRoot);
                     let transformed = null;
                     let resolvedCandidate = null;
                     const rawExplicitModule = tryReadRawExplicitJavaScriptModule(spec, serverRoot);
@@ -3270,18 +3314,24 @@ function createHmrWebSocketPlugin(opts) {
                         }
                         catch { }
                     }
-                    // Fallback 2: try /@fs absolute path under project root (Vite file system alias)
+                    // Fallback 2: try /@fs absolute path under project root (Vite file system alias).
+                    // In a monorepo with hoisted node_modules the file may live above
+                    // `serverRoot`, so try the workspace root next.
                     if (!transformed?.code) {
                         try {
                             const toPosix = (p) => p.replace(/\\/g, '/');
-                            const rootPosix = toPosix(serverRoot).replace(/\/$/, '');
-                            const absPosix = `${rootPosix}${spec.startsWith('/') ? '' : '/'}${spec}`;
-                            const fsId = `/@fs${absPosix}`;
-                            if (resolveCandidateFilePath(fsId, serverRoot)) {
-                                const r = await transformWithTimeout(fsId);
-                                if (r?.code) {
-                                    transformed = r;
-                                    resolvedCandidate = fsId;
+                            const rootsToTry = [serverRoot, ...(monorepoWorkspaceRoot && path.resolve(monorepoWorkspaceRoot) !== path.resolve(serverRoot) ? [monorepoWorkspaceRoot] : [])];
+                            for (const root of rootsToTry) {
+                                const rootPosix = toPosix(root).replace(/\/$/, '');
+                                const absPosix = `${rootPosix}${spec.startsWith('/') ? '' : '/'}${spec}`;
+                                const fsId = `/@fs${absPosix}`;
+                                if (resolveCandidateFilePath(fsId, serverRoot, monorepoWorkspaceRoot)) {
+                                    const r = await transformWithTimeout(fsId);
+                                    if (r?.code) {
+                                        transformed = r;
+                                        resolvedCandidate = fsId;
+                                        break;
+                                    }
                                 }
                             }
                         }
@@ -3386,10 +3436,7 @@ function createHmrWebSocketPlugin(opts) {
                                     if (isApp && /\.(ts|tsx|js|jsx|mjs|mts|cts)$/i.test(id) && !isRuntimeGraphExcludedPath(id)) {
                                         const deps = Array.from(collectImportDependencies(code, id));
                                         if (verbose) {
-                                            try {
-                                                console.log('[hmr-ws][ts-graph] candidate', { id, depsCount: deps.length });
-                                            }
-                                            catch { }
+                                            console.log('[hmr-ws][ts-graph] candidate', { id, depsCount: deps.length });
                                         }
                                         // Serve-time warm-up: no live edit happened, so don't bump
                                         // graphVersion.
@@ -3594,7 +3641,7 @@ export const piniaSymbol = p.piniaSymbol;
                     //    typically fall back to `self` or `globalThis`.
                     //  - `module`, `exports` must be shims since they don't exist in ESM.
                     try {
-                        code = wrapCommonJsModuleForDevice(code);
+                        code = wrapCommonJsModuleForDevice(code, resolvedCandidate || null);
                     }
                     catch { }
                     try {
@@ -3808,10 +3855,7 @@ export const piniaSymbol = p.piniaSymbol;
                                         const hasCjsPattern = /\bmodule\s*\.\s*exports\b/.test(targetCode) || /\bexports\s*\.\s*\w/.test(targetCode);
                                         if (hasCjsPattern) {
                                             if (verbose) {
-                                                try {
-                                                    console.warn(`[ns:m][link-check] CJS module without export default: ${u.pathname} (will be CJS-wrapped at serve time)`);
-                                                }
-                                                catch { }
+                                                console.warn(`[ns:m][link-check] CJS module without export default: ${u.pathname} (will be CJS-wrapped at serve time)`);
                                             }
                                             continue;
                                         }
@@ -3827,20 +3871,14 @@ export const piniaSymbol = p.piniaSymbol;
                     }
                     catch (eLC) {
                         if (verbose) {
-                            try {
-                                console.warn('[ns:m][link-check] failed', eLC?.message || eLC);
-                            }
-                            catch { }
+                            console.warn('[ns:m][link-check] failed', eLC?.message || eLC);
                         }
                     }
                     res.statusCode = 200;
                     res.end(code);
                 }
                 catch (e) {
-                    try {
-                        console.warn('[sfc-asm] error serving', req.url, e && e.message ? e.message : e);
-                    }
-                    catch { }
+                    console.warn('[sfc-asm] error serving', req.url, e && e.message ? e.message : e);
                     res.statusCode = 500;
                     res.end('export {}\n');
                 }
@@ -3968,7 +4006,7 @@ export const piniaSymbol = p.piniaSymbol;
                         `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) { try { console.error('[ns-rt] $navigateTo app navigator error', e); } catch {} throw e; } } try { console.error('[ns-rt] $navigateTo unavailable: app navigator missing'); } catch {} throw new Error('$navigateTo unavailable: app navigator missing'); } ;\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` +
                         `export default {\n` +
@@ -4212,7 +4250,7 @@ export const piniaSymbol = p.piniaSymbol;
                         `  }`,
                         `  if (!__nsFirst[__nsKey]) __nsFirst[__nsKey] = __nsUrl;`,
                         `  globalThis.__NS_CORE_EVAL_COUNT__ = (globalThis.__NS_CORE_EVAL_COUNT__ || 0) + 1;`,
-                        `} } catch (e) { try { console.warn('[ns-core] instrumentation failed:', (e && e.message) || e); } catch {} }`,
+                        `} } catch (e) { console.warn('[ns-core] instrumentation failed:', (e && e.message) || e); }`,
                     ].join('\n');
                     // CJS/ESM interop shape — REGISTRATION side.
                     //
@@ -4237,7 +4275,7 @@ export const piniaSymbol = p.piniaSymbol;
                         `  const __nsSelfRaw = (typeof __ns_core_self_ns__ !== 'undefined') ? __ns_core_self_ns__ : { default: undefined };`,
                         `  const __nsSelf = __nsShapeFn(__nsSelfRaw);`,
                         ...registrationKeys.map((k) => `  __nsReg[${k}] = __nsSelf;`),
-                        `} } catch (e) { try { console.warn('[ns-core] self-register failed:', (e && e.message) || e); } catch {} }`,
+                        `} } catch (e) { console.warn('[ns-core] self-register failed:', (e && e.message) || e); }`,
                     ].join('\n');
                     // Bind `import * as __ns_core_self_ns__` to the module's
                     // own export namespace so the footer can stash it into
@@ -4285,10 +4323,7 @@ export const piniaSymbol = p.piniaSymbol;
                     res.end(moduleCode);
                 }
                 catch (e) {
-                    try {
-                        console.warn('[ns-core-bridge] serve failed:', e?.message);
-                    }
-                    catch { }
+                    console.warn('[ns-core-bridge] serve failed:', e?.message);
                     next();
                 }
             });
@@ -4298,14 +4333,11 @@ export const piniaSymbol = p.piniaSymbol;
                     const urlObj = new URL(req.url || '', 'http://localhost');
                     if (!(urlObj.pathname === '/ns/entry-rt'))
                         return next();
-                    try {
-                        if (verbose) {
-                            const ra = req.socket?.remoteAddress;
-                            const rp = req.socket?.remotePort;
-                            console.log('[hmr-http] GET /ns/entry-rt from', ra + (rp ? ':' + rp : ''));
-                        }
+                    if (verbose) {
+                        const ra = req.socket?.remoteAddress;
+                        const rp = req.socket?.remotePort;
+                        console.log('[hmr-http] GET /ns/entry-rt from', ra + (rp ? ':' + rp : ''));
                     }
-                    catch { }
                     res.setHeader('Access-Control-Allow-Origin', '*');
                     res.setHeader('Content-Type', 'application/javascript; charset=utf-8');
                     res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0');
@@ -4550,10 +4582,7 @@ export const piniaSymbol = p.piniaSymbol;
                         }
                         if (!transformed?.code) {
                             if (verbose) {
-                                try {
-                                    console.warn(`[sfc][serve] transform miss for`, fullSpec);
-                                }
-                                catch { }
+                                console.warn(`[sfc][serve] transform miss for`, fullSpec);
                             }
                             // Emit an erroring module to surface the failure at import site with helpful hints
                             try {
@@ -4669,10 +4698,7 @@ export const piniaSymbol = p.piniaSymbol;
                                 }
                                 catch (eTplSelf) {
                                     if (verbose) {
-                                        try {
-                                            console.warn('[sfc][template][self-compile][fail]', fullSpec, eTplSelf?.message);
-                                        }
-                                        catch { }
+                                        console.warn('[sfc][template][self-compile][fail]', fullSpec, eTplSelf?.message);
                                     }
                                     code = transformed.code || 'export {}\n';
                                     code = processTemplateVariantMinimal(code);
@@ -4839,10 +4865,7 @@ export const piniaSymbol = p.piniaSymbol;
                         }
                         catch (eTsVar) {
                             if (verbose) {
-                                try {
-                                    console.warn('[sfc][variant:script][babel-ts][fail]', fullSpec, eTsVar?.message);
-                                }
-                                catch { }
+                                console.warn('[sfc][variant:script][babel-ts][fail]', fullSpec, eTsVar?.message);
                             }
                         }
                     }
@@ -4906,10 +4929,7 @@ export const piniaSymbol = p.piniaSymbol;
                     const kind = isVariant ? `variant:${variantType || 'unknown'}` : 'full';
                     const sig = `// [sfc] kind=${kind} path=${importerPath} len=${code.length} default=${hasDefault} wrapped=${false}\n`;
                     if (verbose) {
-                        try {
-                            console.log(`[sfc][serve] ${fullSpec} kind=${kind} default=${hasDefault} bytes=${code.length}`);
-                        }
-                        catch { }
+                        console.log(`[sfc][serve] ${fullSpec} kind=${kind} default=${hasDefault} bytes=${code.length}`);
                     }
                     // Ensure script variants always provide a default export if they declare a component
                     if (!hasDefault) {
@@ -4978,16 +4998,10 @@ export const piniaSymbol = p.piniaSymbol;
                     // 6) Object property forms (rare in template output) render: (...) => {}
                     const hasRender = /export\s+function\s+render\s*\(/.test(templateCode) || /(?:^|\n)\s*function\s+render\s*\(/.test(templateCode) || /export\s+(?:const|let|var)\s+render\s*=/.test(templateCode) || /(?:^|\n)\s*(?:const|let|var)\s+render\s*=/.test(templateCode) || /\brender\s*[:=]\s*/.test(templateCode) || /export\s*\{\s*render\s*(?:as\s*render)?\s*\}/.test(templateCode);
                     if (hasRender && verbose) {
-                        try {
-                            console.log('[sfc-meta] detected render for', base);
-                        }
-                        catch { }
+                        console.log('[sfc-meta] detected render for', base);
                     }
                     else if (!hasRender && verbose) {
-                        try {
-                            console.warn('[sfc-meta] render NOT detected for', base);
-                        }
-                        catch { }
+                        console.warn('[sfc-meta] render NOT detected for', base);
                     }
                     const hash = createHash('md5').update(base).digest('hex').slice(0, 8);
                     const payload = {
@@ -5121,10 +5135,7 @@ export const piniaSymbol = p.piniaSymbol;
                             }
                             catch (eScript) {
                                 if (verbose) {
-                                    try {
-                                        console.warn('[sfc-asm][compileScript] failed', base, eScript?.message);
-                                    }
-                                    catch { }
+                                    console.warn('[sfc-asm][compileScript] failed', base, eScript?.message);
                                 }
                                 // Retry without inlineTemplate
                                 try {
@@ -5140,10 +5151,7 @@ export const piniaSymbol = p.piniaSymbol;
                                 }
                                 catch (eNoInline) {
                                     if (verbose) {
-                                        try {
-                                            console.warn('[sfc-asm][compileScript][no-inline-fallback] failed', base, eNoInline?.message);
-                                        }
-                                        catch { }
+                                        console.warn('[sfc-asm][compileScript][no-inline-fallback] failed', base, eNoInline?.message);
                                     }
                                 }
                             }
@@ -5174,10 +5182,7 @@ export const piniaSymbol = p.piniaSymbol;
                                 }
                                 catch (eNoInline) {
                                     if (verbose) {
-                                        try {
-                                            console.warn('[sfc-asm][compileScript][no-inline-fallback] failed', base, eNoInline?.message);
-                                        }
-                                        catch { }
+                                        console.warn('[sfc-asm][compileScript][no-inline-fallback] failed', base, eNoInline?.message);
                                     }
                                 }
                             }
@@ -5200,20 +5205,14 @@ export const piniaSymbol = p.piniaSymbol;
                                     });
                                     compiledTplCode = (ct && (ct.code || '')) || '';
                                     if (ct?.errors?.length && verbose) {
-                                        try {
-                                            console.warn('[sfc-asm][compileTemplate][errors]', base, ct.errors);
-                                        }
-                                        catch { }
+                                        console.warn('[sfc-asm][compileTemplate][errors]', base, ct.errors);
                                     }
                                 }
                             }
                             catch (eTpl) {
                                 templateErr = eTpl;
                                 if (verbose) {
-                                    try {
-                                        console.warn('[sfc-asm][compileTemplate] failed', base, eTpl?.message);
-                                    }
-                                    catch { }
+                                    console.warn('[sfc-asm][compileTemplate] failed', base, eTpl?.message);
                                 }
                                 // Fallback: use the variant-transformed template code if available
                                 try {
@@ -5276,10 +5275,7 @@ export const piniaSymbol = p.piniaSymbol;
                                 }
                                 catch (eExtract) {
                                     if (verbose) {
-                                        try {
-                                            console.warn('[sfc-asm][extractTemplateRender] failed', base, eExtract?.message);
-                                        }
-                                        catch { }
+                                        console.warn('[sfc-asm][extractTemplateRender] failed', base, eExtract?.message);
                                     }
                                 }
                             }
@@ -5357,10 +5353,7 @@ export const piniaSymbol = p.piniaSymbol;
                                 }
                                 catch (eTs) {
                                     if (verbose) {
-                                        try {
-                                            console.warn('[sfc-asm][babel-ts][fail]', base, eTs?.message);
-                                        }
-                                        catch { }
+                                        console.warn('[sfc-asm][babel-ts][fail]', base, eTs?.message);
                                     }
                                 }
                                 // Hoist imports + strip residual TS via AST
@@ -5370,18 +5363,12 @@ export const piniaSymbol = p.piniaSymbol;
                                     importLines = astRes.imports;
                                     scriptTransformed = astRes.body;
                                     if (astRes.diagnostics.length && verbose) {
-                                        try {
-                                            console.warn('[sfc-asm][ast]', base, astRes.diagnostics.join('; '));
-                                        }
-                                        catch { }
+                                        console.warn('[sfc-asm][ast]', base, astRes.diagnostics.join('; '));
                                     }
                                 }
                                 catch (eAst) {
                                     if (verbose) {
-                                        try {
-                                            console.warn('[sfc-asm][ast][fail]', base, eAst?.message);
-                                        }
-                                        catch { }
+                                        console.warn('[sfc-asm][ast][fail]', base, eAst?.message);
                                     }
                                 }
                                 // Ensure renderDecl ends with closing brace ONLY for function declaration forms
@@ -6179,6 +6166,7 @@ export const piniaSymbol = p.piniaSymbol;
                         flavor: ACTIVE_STRATEGY.flavor,
                         modules: ctx.modules,
                         getModuleById: (id) => server.moduleGraph.getModuleById(id),
+                        verbose,
                     });
                     for (const mod of graphTargets) {
                         if (!mod?.id)
@@ -6259,6 +6247,12 @@ export const piniaSymbol = p.piniaSymbol;
                     getModuleById: (id) => server.moduleGraph.getModuleById(id),
                     getModulesByFile: (targetFile) => server.moduleGraph.getModulesByFile?.(targetFile),
                 });
+                if (verbose) {
+                    console.info(`[ns-hmr-diag][server] hot-update file=${file} isHtml=${isHtml} isTs=${isTs} ctxModules=${Array.from(ctx.modules || []).length} hotUpdateRoots=${angularHotUpdateRoots.length} (${angularHotUpdateRoots
+                        .map((m) => m?.id ?? '(none)')
+                        .slice(0, 8)
+                        .join(', ')}${angularHotUpdateRoots.length > 8 ? ', …' : ''})`);
+                }
                 if (!(isHtml || isTs))
                     return;
                 updateMetrics.invalidated += angularHotUpdateRoots.length;
@@ -6343,6 +6337,9 @@ export const piniaSymbol = p.piniaSymbol;
                 // narrowing wins (saves re-transform work on the server).
                 // The eviction set always includes importers so V8 re-fetches
                 // and re-binds them.
+                if (verbose) {
+                    console.info(`[ns-hmr-diag][server] angularNeedsTransitive=${angularNeedsTransitive} (file=${path.basename(file)})`);
+                }
                 let transitiveImporters = [];
                 try {
                     transitiveImporters = collectAngularTransitiveImportersForInvalidation({
@@ -6350,6 +6347,9 @@ export const piniaSymbol = p.piniaSymbol;
                         isExcluded: (id) => id.includes('/node_modules/'),
                         maxDepth: 16,
                     });
+                    if (verbose) {
+                        console.info(`[ns-hmr-diag][server] transitiveImporters count=${transitiveImporters.length} firstN=`, transitiveImporters.slice(0, 16).map((m) => m?.id ?? '(none)'));
+                    }
                     if (angularNeedsTransitive) {
                         updateMetrics.invalidated += transitiveImporters.length;
                         for (const mod of transitiveImporters) {
@@ -6463,14 +6463,23 @@ export const piniaSymbol = p.piniaSymbol;
                         });
                     }
                     catch (error) {
-                        if (verbose)
-                            console.warn('[hmr-ws][angular] eviction set computation failed', error);
+                        if (verbose) {
+                            console.warn('[ns-hmr-diag][server] eviction set computation failed', error);
+                        }
                     }
                     if (verbose) {
-                        console.log('[hmr-ws][angular] eviction set', {
-                            count: evictPaths.length,
-                            importerEntry: bootstrapEntryRel,
-                        });
+                        try {
+                            const tsRel = rel.replace(/\.(html|htm)$/i, '.ts');
+                            const jsRel = rel.replace(/\.(html|htm)$/i, '.js');
+                            const containsRelatedTs = evictPaths.some((u) => u.endsWith(tsRel));
+                            const containsRelatedJs = evictPaths.some((u) => u.endsWith(jsRel));
+                            const sample = evictPaths.slice(0, 32);
+                            console.info(`[ns-hmr-diag][server] evict-set count=${evictPaths.length} importerEntry=${bootstrapEntryRel ?? '(none)'} containsRelatedTs=${containsRelatedTs} containsRelatedJs=${containsRelatedJs} firstN=`, sample);
+                            if (evictPaths.length > sample.length) {
+                                console.info(`[ns-hmr-diag][server] evict-set hidden=${evictPaths.length - sample.length} (showed first ${sample.length})`);
+                            }
+                        }
+                        catch { }
                     }
                     const msg = {
                         type: 'ns:angular-update',
@@ -6713,7 +6722,7 @@ if (typeof __VUE_HMR_RUNTIME__ === 'undefined') {
         if (typeof spec === 'string' && /^(?:https?:)\/\//.test(spec)) {
           const err = new Error('[ns-hmr][require-guard] require of URL: ' + spec + ' via ' + label);
           const stack = err.stack || '';
-          try { console.error(err.message + '\n' + stack); } catch {}
+          console.error(err.message + '\n' + stack);
           try { g.__NS_REQUIRE_GUARD_LAST__ = { spec, stack, label, ts: Date.now() }; } catch {}
         }
       } catch {}