@octane-xplat/patches 0.16.0 → 0.17.0

package/patches/@nativescript-community__vite-octane@0.2.1.patch

@@ -1,8 +1,8 @@
 diff --git a/dist/server/strategy.js b/dist/server/strategy.js
-index 7d84b37e2ed3a026da5b31c8a11027e0580877b2..f6594a913ba64837135e994cb183add13c6a0530 100644
+index 7d84b37e2ed3a026da5b31c8a11027e0580877b2..1943f7c05e47d95950212789f84d5b7725da9ac9 100644
 --- a/dist/server/strategy.js
 +++ b/dist/server/strategy.js
-@@ -14,7 +14,9 @@ import { purgeTransformCachesForHotUpdate, runHotUpdatePrologue, typescriptServe
+@@ -14,17 +14,26 @@ import { purgeTransformCachesForHotUpdate, runHotUpdatePrologue, typescriptServe
   * otherwise the re-fetch can be served from the previous save's transform and
   * the screen ends up one save behind.
   */
@@ -13,7 +13,16 @@ index 7d84b37e2ed3a026da5b31c8a11027e0580877b2..f6594a913ba64837135e994cb183add1
  export const octaneServerStrategy = {
      ...typescriptServerStrategy,
      flavor: 'octane',
-@@ -24,7 +26,7 @@ export const octaneServerStrategy = {
++    matchesFile(id) {
++        // Shared sources have workspace/@fs identities rather than /src IDs.
++        // Source-root gating remains in runHotUpdatePrologue; dependency and
++        // type/test files must not enter executable transaction batches.
++        const clean = id.replace(/[?#].*$/, '');
++        return SCRIPT_FILE_RE.test(clean) && !/(?:^|\/)(?:node_modules|__tests__|__mocks__)(?:\/|$)|\.(?:spec|test)\.[^/]+$|\.d\.(?:ts|mts|cts)$/i.test(clean);
++    },
+     deferDeltaBroadcast: true,
+     async handleHotUpdate(ctx, deps) {
+         const state = await runHotUpdatePrologue(ctx, deps);
          if (!state)
              return;
          const { root, metrics, emitSummary } = state;
@@ -22,7 +31,29 @@ index 7d84b37e2ed3a026da5b31c8a11027e0580877b2..f6594a913ba64837135e994cb183add1
          const { file, server } = ctx;
          if (!SCRIPT_FILE_RE.test(file)) {
              emitSummary();
-@@ -71,6 +73,16 @@ export const octaneServerStrategy = {
+@@ -37,9 +46,9 @@ export const octaneServerStrategy = {
+                     .normalize(path.relative(root, file))
+                     .split(path.sep)
+                     .join('/');
+-            const normalizedId = moduleGraph.normalizeGraphId(rel);
++            const normalizedId = moduleGraph.normalizeGraphId(file);
+             if (!moduleGraph.get(normalizedId)) {
+-                moduleGraph.upsert(rel, `/* octane-hmr ${Date.now()} */`, [], {
++                moduleGraph.upsert(normalizedId, `/* octane-hmr ${Date.now()} */`, [], {
+                     emitDeltaOnInsert: true,
+                 });
+             }
+@@ -51,7 +60,8 @@ export const octaneServerStrategy = {
+                 label: 'octane',
+             });
+             try {
+-                const fresh = await sharedTransformRequest(rel, 30000);
++                const transformId = path.relative(root, file).startsWith('..' + path.sep) ? '/@fs/' + file.replace(/\\/g, '/') : rel;
++                const fresh = await sharedTransformRequest(transformId, 30000);
+                 if (fresh?.code) {
+                     const viteModule = server.moduleGraph.getModuleById(file);
+                     const deps = viteModule
+@@ -71,6 +81,16 @@ export const octaneServerStrategy = {
              const gm = moduleGraph.get(normalizedId);
              if (gm)
                  moduleGraph.emitDelta([gm], []);

package/patches/{@nativescript__vite@8.0.17.patch → @nativescript__vite@8.0.20.patch}

@@ -1,5 +1,5 @@
 diff --git a/helpers/project.js b/helpers/project.js
-index ef8a029f7e6e66cdeaa344a6af18af28145b8b05..b06cce4f6909d61b538295124ebb1d80a1eb31bf 100644
+index f6777fa5e64e667cbc56c7e76c4c32c5ab76a911..fdc1f974884e26030c0084d75c1e51a1e5968db2 100644
 --- a/helpers/project.js
 +++ b/helpers/project.js
 @@ -73,7 +73,11 @@ function denoConfigHasWorkspace(dir) {
@@ -108,7 +108,7 @@ index a05696b679b3feecd1bafa267de44b59db559162..06648067a3fcf7f8c74437a82b94ec01
      return ['.native', ''];
  }
 diff --git a/hmr/helpers/ast-normalizer.js b/hmr/helpers/ast-normalizer.js
-index c6113c74247db616609b87d7f365c4d4c199c934..73651a1fd1892555cc5dd57bcefb9e93d30516b6 100644
+index 77f5533a289902b644f2dba4c8a558f5a00c8314..5c1d57f34a5e863ae3e684012a99f9bb8796e974 100644
 --- a/hmr/helpers/ast-normalizer.js
 +++ b/hmr/helpers/ast-normalizer.js
 @@ -86,9 +86,10 @@ export function astNormalizeModuleImportsAndHelpers(code, opts) {
@@ -145,7 +145,7 @@ index 0d7cd968eac690a85411cf3d6a24323a3d3a3992..98094d6ccfb918d00249d8087aebdd99
  //# sourceMappingURL=css-device-module.js.map
 
 diff --git a/hmr/server/deps-bundle.js b/hmr/server/deps-bundle.js
-index 8f2fa15556244f7ef811b5e2ea0fc6a19bab74d3..80137262ec46d347d39a7ee12d66d649b5f909f5 100644
+index 395c29e9b9b552fbf30c4a7131121a0d841df116..ca4d7beaf4ae0444ea947a8c97aa9d7fb1a254ef 100644
 --- a/hmr/server/deps-bundle.js
 +++ b/hmr/server/deps-bundle.js
 @@ -53,6 +53,7 @@
@@ -156,7 +156,7 @@ index 8f2fa15556244f7ef811b5e2ea0fc6a19bab74d3..80137262ec46d347d39a7ee12d66d649
  import * as esbuild from 'esbuild';
  import { resolvePlatform } from '../../helpers/cli-flags.js';
  import { getGlobalDefines, getUserDefineEntries } from '../../helpers/global-defines.js';
-@@ -698,6 +699,29 @@ export async function generateDepsBundle(options) {
+@@ -699,6 +700,29 @@ export async function generateDepsBundle(options) {
      // the device cannot resolve.
      const buildPlugins = () => [
          createWebpackLoaderStubEsbuildPlugin(),
@@ -203,16 +203,119 @@ index 71574c48f655183af0c9601b020fd1febd63ccb3..0061d9c9e9fe9c6034576eae8449831d
      if (!imports.length) {
          return code;
      }
+diff --git a/hmr/server/hmr-module-graph.js b/hmr/server/hmr-module-graph.js
+index 8cff593b8ac8d8eff82ebdd398c1305a8408d308..92f6d194924b288864bcaca4fc42ef805d048e4f 100644
+--- a/hmr/server/hmr-module-graph.js
++++ b/hmr/server/hmr-module-graph.js
+@@ -1,3 +1,4 @@
++import { normalizeHmrModuleId } from './hmr-module-id.js';
+ import { matchesRuntimeGraphModuleId } from './runtime-graph-filter.js';
+ import { classifyGraphUpsert, shouldBroadcastGraphUpsertDelta, shouldBumpGraphVersion } from './websocket-graph-upsert.js';
+ import { getProjectAppVirtualPath } from '../../helpers/utils.js';
+@@ -39,25 +40,9 @@ export class HmrModuleGraph {
+         return ('00000000' + (h >>> 0).toString(16)).slice(-8);
+     }
+     normalizeGraphId(raw) {
+-        if (!raw)
+-            return raw;
+-        let id = raw.split('?')[0].replace(/\\/g, '/');
+-        id = id.replace(/^file:\/\//, '');
+-        const pluginRoot = this.deps.getPluginRoot();
+-        if (pluginRoot) {
+-            const rootNorm = pluginRoot.replace(/\\/g, '/');
+-            if (id.startsWith(rootNorm)) {
+-                id = id.slice(rootNorm.length);
+-            }
+-        }
+-        if (!id.startsWith('/'))
+-            id = '/' + id;
+-        // Collapse nested app root indicators when present (defensive)
+-        const idx = id.indexOf(APP_VIRTUAL_WITH_SLASH);
+-        if (idx !== -1)
+-            id = id.slice(idx);
+-        return id;
++        return normalizeHmrModuleId(raw, this.deps.getPluginRoot());
+     }
++
+     // Dependency-closed, topologically sorted list of modules for a set of
+     // changed ids. Only includes application modules we can serve (under the
+     // app virtual root and known framework/.ts/.js entries already in the graph).
+diff --git a/hmr/server/hmr-module-id.js b/hmr/server/hmr-module-id.js
+new file mode 100644
+index 0000000000000000000000000000000000000000..13a0c29d4b0fad502730062ddba081016514c440
+--- /dev/null
++++ b/hmr/server/hmr-module-id.js
+@@ -0,0 +1,30 @@
++import { existsSync } from 'node:fs';
++import * as path from 'node:path';
++import { getMonorepoWorkspaceRoot } from '../../helpers/project.js';
++import { rewriteFsAbsoluteToNsM } from './websocket-module-specifiers.js';
++
++// Use the same app/workspace/@fs spelling as static device imports. App
++// virtual IDs remain intact; an unrelated /src/ substring is never a root.
++export function normalizeHmrModuleId(raw, projectRoot) {
++    if (!raw) return raw;
++    let id = raw.split(/[?#]/)[0].replace(/\\/g, '/');
++    if (id.startsWith('/ns/m/')) return id.slice('/ns/m'.length);
++    const fileUrl = id.startsWith('file://');
++    if (fileUrl) id = id.slice('file://'.length);
++    const fsUrl = id.startsWith('/@fs/');
++    if (fsUrl) id = id.slice('/@fs'.length);
++    const root = projectRoot?.replace(/\\/g, '/').replace(/\/$/, '');
++    const within = (base) => base && (id === base || id.startsWith(base + '/'));
++    // Preserve ordinary app IDs, including Windows drive paths, without
++    // passing a drive-letter source through POSIX /@fs parsing.
++    if (within(root)) return id.slice(root.length) || '/';
++    const workspace = root ? getMonorepoWorkspaceRoot(root) : null;
++    if (root && id.startsWith('/../')) id = path.resolve(root, '.' + id).replace(/\\/g, '/');
++    if (root && (fileUrl || fsUrl || within(root) || within(workspace) || (path.isAbsolute(id) && existsSync(id)))) {
++        const url = rewriteFsAbsoluteToNsM('/@fs' + id, root, workspace);
++        // The module route serves explicit /@fs paths for linked sources
++        // outside both roots, matching rewriteImports' existing fallback.
++        return url ? url.slice('/ns/m'.length) : '/@fs' + id;
++    }
++    return id.startsWith('/') ? id : '/' + id;
++}
 diff --git a/hmr/server/process-code-for-device.js b/hmr/server/process-code-for-device.js
-index c71d457806a8add919f7e2368e7ebc349bd908e7..998eb268ed0db1200f8b5ce30fc7da211125406f 100644
+index 1f02ba5ebb7e89d40eff58d1c395b5ec838f45fe..5bbb6e4827da640624624ef80f94a7e5eb5c28ce 100644
 --- a/hmr/server/process-code-for-device.js
 +++ b/hmr/server/process-code-for-device.js
-@@ -1,3 +1,4 @@
+@@ -1,3 +1,5 @@
++import { normalizeHmrModuleId } from './hmr-module-id.js';
 +import { CSS_MODULE_RE } from './css-device-module.js';
  // Device code-transform: cleans Vite/framework noise out of a served module,
  // injects NativeScript build globals + the process.env shim, normalizes
  // imports/helpers for the on-device ESM runtime, and collects an importer's
-@@ -451,13 +452,13 @@ function processCodeForDevice(code, isVitePreBundled, preserveVendorImports = fa
+@@ -125,25 +127,10 @@ export function inlineNsConfigVirtualImports(code) {
+ // `hmr/client/hot-context.ts` so cold-boot evaluation and HMR re-evaluation
+ // resolve the same `hot.data` entry.
+ export function computeHotContextId(sourceId, projectRoot) {
+-    if (!sourceId || typeof sourceId !== 'string')
+-        return null;
+-    let id = sourceId.split('?')[0].split('#')[0].replace(/\\/g, '/');
+-    if (!id)
+-        return null;
+-    id = id.replace(/^\/@fs/, '');
+-    if (projectRoot) {
+-        const rootPosix = projectRoot.replace(/\\/g, '/').replace(/\/$/, '');
+-        if (rootPosix && id.startsWith(rootPosix + '/')) {
+-            id = id.slice(rootPosix.length);
+-        }
+-    }
+-    if (id.startsWith('/ns/m/'))
+-        id = id.slice('/ns/m'.length);
+-    id = id.replace(/\.(ts|tsx|js|jsx|mjs|mts|cts)$/i, '');
+-    if (!id.startsWith('/'))
+-        id = '/' + id;
+-    return id;
++    if (!sourceId || typeof sourceId !== 'string') return null;
++    return normalizeHmrModuleId(sourceId, projectRoot).replace(/\.(ts|tsx|tsrx|js|jsx|mjs|mts|cts)$/i, '');
+ }
++
+ // One-line `import.meta.hot` prelude. Single-statement, no internal `;` or
+ // newline, so that if any later sanitize pass re-applies
+ // `IMPORT_META_HOT_ASSIGNMENT` the whole statement strips cleanly (module
+@@ -449,13 +436,13 @@ function processCodeForDevice(code, isVitePreBundled, preserveVendorImports = fa
      // Unlike other virtual ids these are real, servable dev-server URLs returning
      // self-contained ESM — stripping them leaves `_decorate`/`_decorateMetadata`
      // undefined at runtime. They're origin-prefixed for the device in rewriteImports.
@@ -229,7 +332,7 @@ index c71d457806a8add919f7e2368e7ebc349bd908e7..998eb268ed0db1200f8b5ce30fc7da21
          result = `// [hmr-sanitize] stripped virtual /@id/ side-effect imports\n${result}`;
      }
 diff --git a/hmr/server/rewrite-imports.js b/hmr/server/rewrite-imports.js
-index 4a6575cb00a6aeecbbb7ac5ccac3268cb10d7f54..2876cf3694c278249b9db182e2f89df34cc464f3 100644
+index 51ad398cefe75c918e887bd9506d9152259b957e..235b7cd49cbfb18c8cca87edf62e53c4771b304e 100644
 --- a/hmr/server/rewrite-imports.js
 +++ b/hmr/server/rewrite-imports.js
 @@ -1,3 +1,4 @@
@@ -331,7 +434,7 @@ index 4a6575cb00a6aeecbbb7ac5ccac3268cb10d7f54..2876cf3694c278249b9db182e2f89df3
  export function prepareAngularEntryForDevice(code, importerPath, sfcFileMap, depFileMap, projectRoot, verbose = false, outputDirOverrideRel, httpOrigin, resolveVendorAsHttp = false) {
      const rewrittenCode = rewriteImports(code, importerPath, sfcFileMap, depFileMap, projectRoot, verbose, outputDirOverrideRel, httpOrigin, resolveVendorAsHttp);
      return rewriteAngularEntryRegisterOnly(rewrittenCode, resolveAngularCoreHmrImportSource(rewrittenCode, httpOrigin));
-@@ -236,6 +323,19 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
+@@ -239,6 +326,19 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
              }
              return `${prefix}${stub}${suffix}`;
          }
@@ -351,7 +454,7 @@ index 4a6575cb00a6aeecbbb7ac5ccac3268cb10d7f54..2876cf3694c278249b9db182e2f89df3
          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
-@@ -253,17 +353,39 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
+@@ -256,17 +356,39 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
                  }
                  return `${prefix}${rewritten}${suffix}`;
              }
@@ -397,159 +500,45 @@ index 4a6575cb00a6aeecbbb7ac5ccac3268cb10d7f54..2876cf3694c278249b9db182e2f89df3
              if (httpOriginSafe) {
                  return `${prefix}${httpOriginSafe}${spec}${suffix}`;
 diff --git a/hmr/server/websocket-module-specifiers.js b/hmr/server/websocket-module-specifiers.js
-index 74f50a77f48f3873aebf375a29d06b16c29440a3..0f06b6dc997118473e4a1ac6d3a3c48432311c71 100644
+index 0081819906b9df7480408697b1afadb149e26e31..562bd0f7f982cd90d22c945f369d2581201597a2 100644
 --- a/hmr/server/websocket-module-specifiers.js
 +++ b/hmr/server/websocket-module-specifiers.js
-@@ -1,8 +1,8 @@
--import { existsSync, readdirSync, readFileSync, realpathSync } from 'fs';
-+import { existsSync, readdirSync, readFileSync, realpathSync, statSync } from 'fs';
- import * as path from 'path';
- import * as PAT from './constants.js';
- import { getVendorManifest, resolveVendorSpecifier } from '../shared/vendor/registry.js';
--import { getProjectRootPath } from '../../helpers/project.js';
-+import { getMonorepoWorkspaceRoot, getProjectRootPath } from '../../helpers/project.js';
- import { extractRootPackageName, getPackageRuntimeInfo } from '../shared/package-classifier.js';
- import { getFlavorClientPackages } from '../framework-flavors.js';
- const ESM_FRAMEWORK_PACKAGE_ROOTS = new Set(['@nativescript/angular', 'nativescript-angular']);
-@@ -328,6 +328,76 @@ export function resolveVendorFromCandidate(specifier) {
+@@ -328,6 +328,24 @@ export function resolveVendorFromCandidate(specifier) {
      }
      return null;
  }
-+const depFallbackDirsCache = new Map();
-+/**
-+ * `node_modules` dirs reachable through the app's dependency specs rather than
-+ * its workspace layout — consulted when neither the project root nor the
-+ * workspace root can anchor a served `/node_modules/` tail:
-+ *  - `link:`/`file:`/`portal:` deps keep their own `node_modules` at the real
-+ *    target; their workspace siblings can own transitive deps too. Reuse the
-+ *    bounded workspace scan rather than recursively walking dependency trees.
-+ *  - pnpm's isolated virtual store keeps every non-hoisted package under
-+ *    `node_modules/.pnpm/<name>@<ver>/node_modules/`.
-+ * Importer info is gone from the URL — first hit wins, same as the workspace
-+ * scan above. Cached per project root; the set only changes on install.
-+ */
-+function listDepFallbackDirs(projectRoot) {
-+    const cached = depFallbackDirsCache.get(projectRoot);
-+    if (cached) {
-+        return cached;
-+    }
++const pnpmStoreDirsCache = new Map();
++// Upstream scans linked checkouts; retain only the app-local pnpm store fallback.
++function listPnpmStoreNodeModulesDirs(projectRoot) {
++    const cached = pnpmStoreDirsCache.get(projectRoot);
++    if (cached) return cached;
 +    const dirs = [];
-+    const seen = new Set();
-+    const linkedWorkspaces = new Set();
-+    const pushIfPresent = (dir) => {
-+        if (!seen.has(dir) && existsSync(dir)) {
-+            seen.add(dir);
-+            dirs.push(dir);
-+        }
-+    };
-+    const pnpmStore = path.join(projectRoot, 'node_modules', '.pnpm');
++    const store = path.join(projectRoot, 'node_modules', '.pnpm');
 +    try {
-+        for (const entry of readdirSync(pnpmStore, { withFileTypes: true })) {
++        for (const entry of readdirSync(store, { withFileTypes: true })) {
 +            if (entry.isDirectory() && !entry.name.startsWith('.')) {
-+                pushIfPresent(path.join(pnpmStore, entry.name, 'node_modules'));
-+            }
-+        }
-+    }
-+    catch {
-+    }
-+    try {
-+        const pkg = JSON.parse(readFileSync(path.join(projectRoot, 'package.json'), 'utf8'));
-+        for (const section of ['dependencies', 'devDependencies', 'optionalDependencies', 'peerDependencies']) {
-+            for (const spec of Object.values(pkg[section] ?? {})) {
-+                const target = /^(?:link|file|portal):(.+)$/.exec(String(spec))?.[1];
-+                if (!target)
-+                    continue;
-+                try {
-+                    const depDir = realpathSync(path.resolve(projectRoot, target));
-+                    if (statSync(depDir).isDirectory()) {
-+                        pushIfPresent(path.join(depDir, 'node_modules'));
-+                        const workspace = getMonorepoWorkspaceRoot(depDir);
-+                        if (workspace)
-+                            linkedWorkspaces.add(workspace);
-+                    }
-+                }
-+                catch {
-+                }
++                const dir = path.join(store, entry.name, 'node_modules');
++                if (existsSync(dir)) dirs.push(dir);
 +            }
 +        }
-+    }
-+    catch {
-+    }
-+    // Preserve direct-dependency precedence. Scan each linked workspace once,
-+    // using the existing two-level package scan and its per-workspace cache.
-+    for (const workspace of linkedWorkspaces) {
-+        pushIfPresent(path.join(workspace, 'node_modules'));
-+        for (const dir of listWorkspaceNodeModulesDirs(workspace))
-+            pushIfPresent(dir);
-+    }
-+    depFallbackDirsCache.set(projectRoot, dirs);
++    } catch {}
++    pnpmStoreDirsCache.set(projectRoot, dirs);
 +    return dirs;
 +}
  const workspaceNodeModulesDirsCache = new Map();
  /**
   * `node_modules` dirs that can hold a package the served URL no longer
-@@ -428,6 +498,16 @@ export function resolveCandidateFilePath(candidate, projectRoot, workspaceRoot)
-             }
+@@ -485,6 +503,8 @@ export function resolveCandidateFilePath(candidate, projectRoot, workspaceRoot)
+                 return fromWorkspaceScan;
          }
      }
-+    // Deps reachable only through the app's dependency specs — linked-package
-+    // node_modules, pnpm's virtual store — still resolve to real files.
-+    if (cleaned.includes('/node_modules/')) {
-+        const tail = cleaned.slice(cleaned.lastIndexOf('/node_modules/') + '/node_modules/'.length);
-+        for (const nmDir of listDepFallbackDirs(projectRoot)) {
-+            const absPath = path.resolve(nmDir, tail);
-+            if (absPath.startsWith(nmDir + path.sep) && existsSync(absPath))
-+                return absPath;
-+        }
-+    }
-     return null;
- }
- /**
-@@ -512,8 +592,8 @@ export function rewriteFsAbsoluteToNsM(spec, projectRoot, workspaceRoot) {
-  * `export const X: string = '...'`. Routing through the realpath makes
-  * Vite see a non-`node_modules` path and the TS transform applies.
-  *
-- * App-local candidates whose real path is also app-local are returned
-- * unchanged so existing behaviour is preserved bit-for-bit.
-+ * Candidates are returned unchanged only when their URL addresses the file
-+ * found. Fallback files need filesystem anchors even inside the app root.
-  */
- export function filterExistingNodeModulesTransformCandidates(spec, candidates, projectRoot, workspaceRoot) {
-     const cleanedSpec = spec.replace(PAT.QUERY_PATTERN, '');
-@@ -557,22 +637,18 @@ export function filterExistingNodeModulesTransformCandidates(spec, candidates, p
-             // through to the existing project/workspace logic.
-         }
-         if (mapped === null) {
--            if (!hasDistinctWorkspaceRoot) {
-+            const candidatePath = cleanedCandidate.startsWith('/@fs/')
-+                ? path.resolve(cleanedCandidate.slice('/@fs'.length))
-+                : path.resolve(resolvedProjectRoot, cleanedCandidate.replace(/^\/+/, ''));
-+            if (candidatePath === resolved) {
-                 mapped = candidate;
-             }
-             else {
--                const relFromProject = path.relative(resolvedProjectRoot, resolved);
--                const insideProjectRoot = relFromProject !== '' && !relFromProject.startsWith('..') && !path.isAbsolute(relFromProject);
--                if (insideProjectRoot) {
--                    mapped = candidate;
--                }
--                else {
--                    // Hoisted `node_modules/<pkg>/...` file lives above projectRoot.
--                    // Rewrite the URL to its fs-anchored form so Vite reads it directly
--                    // instead of bouncing through bare-specifier resolution that the
--                    // hoisted package's `exports` field may refuse.
--                    mapped = `/@fs${resolved.replace(/\\/g, '/')}${querySuffix}`;
--                }
-+                // The candidate URL does not address the discovered file. A
-+                // fallback may live inside the project (nested link: dependency
-+                // or pnpm store) as well as outside it (hoisted dependency).
-+                // Anchor the actual path so Vite loads the same file we found.
-+                mapped = `/@fs${resolved.replace(/\\/g, '/')}${querySuffix}`;
-             }
-         }
-         if (seen.has(mapped))
++    const fromPnpmStore = probeNodeModulesTail(listPnpmStoreNodeModulesDirs(projectRoot));
++    if (fromPnpmStore) return fromPnpmStore;
+     // Linked source checkouts keep private node_modules outside both roots.
+     // Only packages the app's own install lacks may come from them: each
+     // extension/index variant is resolved separately, so a variant missing
 diff --git a/hmr/server/websocket-ns-m-request.js b/hmr/server/websocket-ns-m-request.js
-index a11fbd5d24579cdf572a91f70cb06561bfa43cd0..c887334efce2c2f6cf85c7508276109467ff3737 100644
+index 0879633dc5ee172f16de82d5d24bebe2f6f7878f..b489d7f1524eb35ba87206d86cdb9448a95c188e 100644
 --- a/hmr/server/websocket-ns-m-request.js
 +++ b/hmr/server/websocket-ns-m-request.js
 @@ -27,10 +27,15 @@ const MODULE_CANDIDATE_EXTS = ['ts', 'js', 'tsx', 'jsx', 'mjs', 'mts', 'cts', 'v
@@ -570,26 +559,25 @@ index a11fbd5d24579cdf572a91f70cb06561bfa43cd0..c887334efce2c2f6cf85c75082761094
          }
          candidates.push(...MODULE_CANDIDATE_EXTS.map((ext) => `${base}.${ext}`));
      }
-@@ -149,8 +154,12 @@ export function resolveFsAnchoredSpec(spec, serverRoot, workspaceRoot) {
-     for (const root of roots) {
-         const rootPosix = root.replace(/\\/g, '/').replace(/\/$/, '');
-         const fsId = `/@fs${rootPosix}${spec.startsWith('/') ? '' : '/'}${spec}`;
--        if (resolveCandidateFilePath(fsId, serverRoot, workspaceRoot)) {
--            return fsId;
-+        // The fs id is a guess composed under a root — serve the path the
-+        // resolver actually found (it may live in a dep's own node_modules,
-+        // outside both roots).
-+        const resolved = resolveCandidateFilePath(fsId, serverRoot, workspaceRoot);
-+        if (resolved) {
-+            return `/@fs${resolved.replace(/\\/g, '/')}`;
+@@ -216,8 +221,11 @@ export async function resolveNsMTransformedModule(options) {
+             }
          }
      }
-     return null;
+-    const fsId = resolveFsAnchoredSpec(spec, serverRoot, workspaceRoot);
+-    if (fsId) {
++    // A workspace-relative extensionless URL is not a Vite app URL.
++    // Probe the same extension/platform candidates under both source roots.
++    for (const candidate of new Set([spec, ...transformCandidates])) {
++        const fsId = resolveFsAnchoredSpec(candidate, serverRoot, workspaceRoot);
++        if (!fsId) continue;
+         transformed = await tryTransformRequest(transformRequest, fsId, timeoutMs);
+         if (transformed?.code) {
+             return { transformed, resolvedCandidate: fsId };
 diff --git a/hmr/server/websocket-ns-m.js b/hmr/server/websocket-ns-m.js
-index 63b5d9a4886d8da03b8e7deac8a16d53347ea5d7..0f92b3377e6d697f5e5c9eafad130d9579078d93 100644
+index fcdcd69776b3f82d3fc7d8dd26e03856177c933e..ac33b017b65489472c3573ce45f89bb94859777b 100644
 --- a/hmr/server/websocket-ns-m.js
 +++ b/hmr/server/websocket-ns-m.js
-@@ -97,7 +97,7 @@ export function registerNsModuleServerRoute(server, options) {
+@@ -98,7 +98,7 @@ export function registerNsModuleServerRoute(server, options) {
              // internal virtual modules (e.g., \0nsvite:nsconfig-json for
              // ~/package.json) that don't exist on disk and must NOT run
              // through the device post-processing pipeline below.
@@ -598,7 +586,7 @@ index 63b5d9a4886d8da03b8e7deac8a16d53347ea5d7..0f92b3377e6d697f5e5c9eafad130d95
                  try {
                      // First try Vite's transform pipeline directly
                      const vr = await sharedTransformRequest(spec);
-@@ -157,8 +157,21 @@ export function registerNsModuleServerRoute(server, options) {
+@@ -167,8 +167,21 @@ export function registerNsModuleServerRoute(server, options) {
                      // Workspace css outside the vite root must be anchored to /@fs or
                      // `?inline` is denied and the DOM css module (__vite__updateStyle)
                      // is served instead.
@@ -622,7 +610,7 @@ index 63b5d9a4886d8da03b8e7deac8a16d53347ea5d7..0f92b3377e6d697f5e5c9eafad130d95
                      const inlineCode = inlineRes?.code || '';
                      // `?inline` output is `export default "<compiled css>"`.
                      const m = inlineCode.match(/export\s+default\s+("(?:[^"\\]|\\.)*")\s*;?/s);
-@@ -168,7 +181,14 @@ export function registerNsModuleServerRoute(server, options) {
+@@ -178,7 +191,14 @@ export function registerNsModuleServerRoute(server, options) {
                              css = JSON.parse(m[1]);
                          }
                          catch { }
@@ -638,7 +626,7 @@ index 63b5d9a4886d8da03b8e7deac8a16d53347ea5d7..0f92b3377e6d697f5e5c9eafad130d95
                          const out = `// [ns:m][css] ${spec}\n` + `const __ns_css_text__ = ${JSON.stringify(css)};\n` + buildCssRegisterSnippetFromVar(spec, '__ns_css_text__') + `export default __ns_css_text__;\n`;
                          res.statusCode = 200;
                          res.end(out);
-@@ -181,7 +201,10 @@ export function registerNsModuleServerRoute(server, options) {
+@@ -191,7 +211,10 @@ export function registerNsModuleServerRoute(server, options) {
                      if (verbose)
                          console.warn('[ns:m][css] inline compile failed', spec, cssErr?.message);
                  }
@@ -650,7 +638,7 @@ index 63b5d9a4886d8da03b8e7deac8a16d53347ea5d7..0f92b3377e6d697f5e5c9eafad130d95
              }
              // Queue and dedupe transformRequest calls so heavy app graphs do not
              // overwhelm Vite with concurrent work. Slow-transform warnings start only
-@@ -503,6 +526,8 @@ export function registerNsModuleServerRoute(server, options) {
+@@ -513,6 +536,8 @@ export function registerNsModuleServerRoute(server, options) {
                                      continue;
                                  }
                                  else if (u.pathname.startsWith('/ns/m')) {
@@ -659,6 +647,25 @@ index 63b5d9a4886d8da03b8e7deac8a16d53347ea5d7..0f92b3377e6d697f5e5c9eafad130d95
                                      // Resolve the import target through the SAME
                                      // canonical pipeline the /ns/m route itself uses
                                      // (websocket-ns-m-request.ts) instead of a third
+@@ -546,7 +571,17 @@ export function registerNsModuleServerRoute(server, options) {
+                             catch { }
+                             if (!targetCode)
+                                 continue;
+-                            const hasDefault = /\bexport\s+default\b/.test(targetCode) || /export\s*\{\s*default\s*(?:as\s*default)?\s*\}/.test(targetCode);
++                            // Inspect exports, not source text: compilers emit aliases such as
++                            // `export { Screen as default }`, and comments/strings are not exports.
++                            const targetAst = babelParse(targetCode, {
++                                sourceType: 'module',
++                                plugins: MODULE_IMPORT_ANALYSIS_PLUGINS,
++                            });
++                            const hasDefault = targetAst.program.body.some((node) =>
++                                node.type === 'ExportDefaultDeclaration' ||
++                                (node.type === 'ExportNamedDeclaration' && node.exportKind !== 'type' &&
++                                    node.specifiers.some((specifier) => specifier.exportKind !== 'type' &&
++                                        (specifier.exported?.name === 'default' || specifier.exported?.value === 'default'))));
+                             if (!hasDefault) {
+                                 // CJS/UMD modules won't have `export default` — they get CJS-wrapped
+                                 // by the serving pipeline. Only warn, don't fatally block the importer.
 diff --git a/hmr/server/websocket-served-module-helpers.js b/hmr/server/websocket-served-module-helpers.js
 index b9e3ab67eb4ae7c9b12bc4b02b9aa3660d712644..f857f4a5a5956af229e447ed04bf1a52a90c6399 100644
 --- a/hmr/server/websocket-served-module-helpers.js