@nativescript/vite 8.0.0-alpha.3 → 8.0.0-alpha.31

package/hmr/server/websocket-ns-core.js

@@ -0,0 +1,306 @@
+import { isDirectoryIndexFilename, rewriteSpecifiersForDevice } from './core-sanitize.js';
+import { buildDefaultExportFooter, buildShapeInstallHeader, hasNamespaceReExport, rewriteNamespaceReExportsForShape } from './ns-core-cjs-shape.js';
+import { getCliFlags } from '../../helpers/cli-flags.js';
+import { normalizeCoreSub as normalizeCoreSubCanonical } from '../../helpers/ns-core-url.js';
+import { parseCoreBridgeRequest, resolveRuntimeCoreModulePath } from './websocket-core-bridge.js';
+import { setDeviceModuleHeaders } from './route-helpers.js';
+import { getServerOrigin } from './server-origin.js';
+/**
+ * Registers the `@nativescript/core` device bridge on the dev server:
+ *   - a catch-all that rewrites stray `/node_modules/@nativescript/core/*`
+ *     requests to the canonical `/ns/core[/<sub>]` URL, and
+ *   - `GET /ns/core[/<sub>]` — the ONE place @nativescript/core is evaluated on
+ *     device (single module realm, shared class identities, one-time `register()`).
+ */
+export function registerNsCoreRoute(server, options) {
+    // 2.5.1) Catch-all redirect for stray /node_modules/@nativescript/core/*
+    // requests — route them to the /ns/core bridge so they get the same
+    // __DEV__/__IOS__ preamble and specifier rewriting. Without this,
+    // Vite's default /node_modules/ handler serves the raw file, which
+    // references bare __DEV__ and crashes at module eval.
+    server.middlewares.use((req, _res, next) => {
+        try {
+            const urlObj = new URL(req.url || '', 'http://localhost');
+            const coreNmPrefix = '/node_modules/@nativescript/core';
+            if (!urlObj.pathname.startsWith(coreNmPrefix))
+                return next();
+            const sub = urlObj.pathname.slice(coreNmPrefix.length).replace(/^\/+/, '');
+            if (sub === '' || sub === 'index.js' || sub === 'index') {
+                req.url = `/ns/core`;
+            }
+            else {
+                req.url = `/ns/core/${sub}`;
+            }
+            return next();
+        }
+        catch {
+            return next();
+        }
+    });
+    // 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
+    // endpoint is the ONE place core is evaluated. Every consumer —
+    // bundle.mjs's own `@nativescript/core*` imports (resolved to
+    // full HTTP URLs in the entry virtual module), externalized
+    // vendor packages, HTTP-served app modules — all end up here.
+    // No more proxy bridge, no enumeration, no namespace detection,
+    // no prototype-polluted maps. We just serve Vite's authoritative
+    // transformed module content.
+    //
+    // iOS caches by URL path, so each unique URL is evaluated exactly
+    // once per app lifetime. Every class identity is shared, every
+    // `register()` side effect runs once, every `Application` reference
+    // is the same iosApp singleton. The entire class of "does not
+    // provide an export named X" and "Cannot redefine property" errors
+    // is eliminated by construction.
+    server.middlewares.use(async (req, res, next) => {
+        try {
+            const urlObj = new URL(req.url || '', 'http://localhost');
+            const coreRequest = parseCoreBridgeRequest(urlObj.pathname, urlObj.searchParams, Number(options.getGraphVersion() || 0));
+            if (!coreRequest)
+                return next();
+            // Non-canonical incoming URL — every emitter is supposed
+            // to canonicalize before hitting the device. Promote the
+            // drift to a 301 redirect so iOS still gets the file at
+            // the canonical URL (no realm split) but the offending
+            // caller is forced to update. We log the offending raw
+            // pathname so the regression source is easy to find.
+            if (coreRequest.canonicalPath) {
+                try {
+                    console.warn(`[ns-core-bridge] 301 ${urlObj.pathname}${urlObj.search} → ${coreRequest.canonicalPath} (non-canonical core URL — please update emitter)`);
+                }
+                catch { }
+                res.setHeader('Access-Control-Allow-Origin', '*');
+                res.setHeader('Location', coreRequest.canonicalPath);
+                res.statusCode = 301;
+                res.end();
+                return;
+            }
+            setDeviceModuleHeaders(res);
+            const { normalizedSub, sub } = coreRequest;
+            const resolveModuleId = async (moduleId) => {
+                const resolved = await server.pluginContainer?.resolveId?.(moduleId, undefined);
+                return typeof resolved === 'string' ? resolved : resolved?.id || null;
+            };
+            let modulePath = null;
+            if (sub) {
+                const resolvedSubpath = normalizedSub || sub;
+                modulePath = await resolveRuntimeCoreModulePath(resolvedSubpath, resolveModuleId);
+                if (!modulePath) {
+                    modulePath = `/node_modules/@nativescript/core/${resolvedSubpath}`;
+                }
+            }
+            else {
+                modulePath = (await resolveModuleId('@nativescript/core')) || '/node_modules/@nativescript/core/index.js';
+            }
+            const transformed = await options.sharedTransformRequest(modulePath);
+            if (!transformed?.code) {
+                res.statusCode = 500;
+                res.setHeader('Content-Type', 'application/json');
+                res.end(JSON.stringify({ error: 'core-transform-failed', modulePath, sub: sub || null }));
+                return;
+            }
+            // Vite's transform output references module IDs with /@fs,
+            // relative specifiers, or absolute project paths. Rewrite
+            // those to URLs iOS can fetch over HTTP.
+            //
+            // We also thread a `RelativeBase` so any lingering relative
+            // specifiers (`./x`, `../x`) — which Vite's import-analysis
+            // sometimes leaves untouched for `node_modules` files — get
+            // resolved against the served URL's logical directory and
+            // rewritten to canonical `/ns/core/<resolved>` URLs.
+            //
+            // Without this, V8/iOS apply RFC 3986 URL resolution against
+            // the served URL (which has no trailing slash) and treat the
+            // last path segment as a *file*, so `./layout-helper-common`
+            // from `/ns/core/utils/layout-helper` becomes
+            // `/ns/core/utils/layout-helper-common` — a sibling that
+            // doesn't exist, producing "Failed to load url … Does the
+            // file exist?" from Vite and a stuck boot screen.
+            const __rawSubForRel = String(normalizedSub || sub || '').replace(/^\/+|\/+$/g, '');
+            const __isDirIndex = isDirectoryIndexFilename(modulePath || '');
+            const __relBase = { sub: __rawSubForRel, isDirectoryIndex: __isDirIndex };
+            let rewritten = rewriteSpecifiersForDevice(transformed.code, getServerOrigin(server), Number(options.getGraphVersion() || 0), __relBase);
+            // Invariant D (CJS/ESM interop shape) — EXPORT-SIDE fix.
+            //
+            // `@nativescript/core/index.js` declares namespace
+            // re-exports like:
+            //     export * as Utils from './utils';
+            // The ES spec says these produce Module Namespace Objects
+            // with [[Prototype]] = null. Consumers that reach them
+            // via direct ESM import — `import { Utils } from
+            // '@nativescript/core'` — get the raw null-proto value,
+            // bypassing any CJS `require` shim we install. Most
+            // consumers tolerate this, but CJS-style interop (most
+            // notably zone.js's `patchMethod`) calls
+            // `hasOwnProperty` on the target and crashes on
+            // null-proto.
+            //
+            // We rewrite the re-export to a shape-wrapped const:
+            //     import * as __ns_re_Utils__ from './utils';
+            //     export const Utils = __NS_CJS_SHAPE__(__ns_re_Utils__);
+            // so the EXPORT itself is a plain object — visible to
+            // both ESM and CJS consumers consistently.
+            //
+            // We only pay the rewrite cost when the module actually
+            // contains namespace re-exports (i.e., the main
+            // `index.js`). Subpaths (`/utils`, `/http`, …) don't
+            // re-export via `export * as`; they expose named
+            // exports directly, so the rewrite is a no-op on them.
+            if (hasNamespaceReExport(rewritten)) {
+                rewritten = rewriteNamespaceReExportsForShape(rewritten);
+            }
+            // Prepend the build-time defines (__DEV__, __IOS__, __ANDROID__,
+            // __APPLE__, …) that @nativescript/core source references directly.
+            // Vite's `define` config substitutes these in user-code transforms but
+            // skips node_modules by default; since core is now external and served
+            // over HTTP from this endpoint, the served transformed code still has
+            // bare identifiers like `if (__DEV__) …`. Without these consts, V8
+            // hits `ReferenceError: __DEV__ is not defined` at module eval because
+            // globalThis.__DEV__ is set by bundle.mjs's body AFTER all static
+            // imports (including these core modules) have resolved.
+            //
+            // We inject LITERAL boolean values based on CLI flags + dev-server
+            // mode rather than reading from globalThis, so the defines are
+            // resolved even before bundle.mjs's body runs.
+            const __cliFlags = getCliFlags() || {};
+            const __platformIsAndroid = !!__cliFlags.android;
+            const __platformIsVisionOS = !!__cliFlags.visionos;
+            const __platformIsIOS = !__platformIsAndroid && !__platformIsVisionOS;
+            const preamble = [
+                `const __ANDROID__ = ${__platformIsAndroid ? 'true' : 'false'};`,
+                `const __IOS__ = ${__platformIsIOS ? 'true' : 'false'};`,
+                `const __VISIONOS__ = ${__platformIsVisionOS ? 'true' : 'false'};`,
+                `const __APPLE__ = __IOS__ || __VISIONOS__;`,
+                `const __DEV__ = ${server.config?.mode === 'development' ? 'true' : 'false'};`,
+                `const __COMMONJS__ = false;`,
+                `const __NS_WEBPACK__ = false;`,
+                `const __NS_ENV_VERBOSE__ = globalThis.__NS_ENV_VERBOSE__ !== undefined ? !!globalThis.__NS_ENV_VERBOSE__ : false;`,
+                `const __CSS_PARSER__ = 'css-tree';`,
+                `const __UI_USE_XML_PARSER__ = true;`,
+                `const __UI_USE_EXTERNAL_RENDERER__ = false;`,
+                `const __TEST__ = false;`,
+            ].join('\n');
+            // Boot-time instrumentation + module self-registration.
+            //
+            //   - URL canonicalization: the same logical module must
+            //     always resolve to byte-identical URLs across every
+            //     emitter. The /ns/core handler records the first URL
+            //     seen for each canonical sub (or '' for main) in
+            //     `globalThis.__NS_CORE_FIRST_URL__` and fails hard on
+            //     mismatch so drift in any emitter surfaces
+            //     immediately, before the realm splits.
+            //   - CJS/ESM boot order: CommonJS
+            //     `require('@nativescript/core/...')` calls from
+            //     vendor install() hooks must resolve to the SAME
+            //     ESM namespace that ran this side-effect preamble.
+            //     The registration below keys the namespace object
+            //     under BOTH the bare specifier and the canonical
+            //     subpath (and raw subpath for back-compat) so the
+            //     vendor shim's `createRequire` and the main-entry
+            //     `_nsReq` hit on any lookup form.
+            const rawSub = normalizedSub || sub || '';
+            const canonicalSub = normalizeCoreSubCanonical(rawSub);
+            const registrationKeySet = new Set();
+            registrationKeySet.add(canonicalSub ? `@nativescript/core/${canonicalSub}` : '@nativescript/core');
+            registrationKeySet.add(canonicalSub);
+            if (rawSub && rawSub !== canonicalSub) {
+                registrationKeySet.add(`@nativescript/core/${rawSub}`);
+                registrationKeySet.add(rawSub);
+            }
+            const registrationKeys = Array.from(registrationKeySet).map((k) => JSON.stringify(k));
+            const canonicalUrl = `${getServerOrigin(server)}` + (canonicalSub ? `/ns/core/${canonicalSub}` : '/ns/core');
+            const instrumentationHeader = [
+                `/* @nativescript/core bridge — canonical URL: ${canonicalUrl} */`,
+                `try { if (typeof globalThis !== 'undefined') {`,
+                `  const __nsFirst = globalThis.__NS_CORE_FIRST_URL__ || (globalThis.__NS_CORE_FIRST_URL__ = Object.create(null));`,
+                `  const __nsSeen = globalThis.__NS_CORE_FETCHED_URLS__ || (globalThis.__NS_CORE_FETCHED_URLS__ = []);`,
+                `  const __nsKey = ${JSON.stringify(canonicalSub)};`,
+                `  const __nsUrl = ${JSON.stringify(canonicalUrl)};`,
+                `  __nsSeen.push(__nsUrl);`,
+                `  if (typeof __nsFirst[__nsKey] === 'string' && __nsFirst[__nsKey] !== __nsUrl) {`,
+                `    throw new Error('[ns-core] URL drift for sub=' + __nsKey + ': first=' + __nsFirst[__nsKey] + ' now=' + __nsUrl);`,
+                `  }`,
+                `  if (!__nsFirst[__nsKey]) __nsFirst[__nsKey] = __nsUrl;`,
+                `  globalThis.__NS_CORE_EVAL_COUNT__ = (globalThis.__NS_CORE_EVAL_COUNT__ || 0) + 1;`,
+                `} } catch (e) { console.warn('[ns-core] instrumentation failed:', (e && e.message) || e); }`,
+            ].join('\n');
+            // CJS/ESM interop shape — REGISTRATION side.
+            //
+            // The actual shape installer runs earlier in the module
+            // body (between preamble and selfImport; see
+            // buildShapeInstallHeader). At this point we just read
+            // globalThis.__NS_CJS_SHAPE__ and apply it to the self
+            // namespace before registering under the CJS key space.
+            //
+            // Why shape self at registration: consumers that reach
+            // `@nativescript/core` via `require()` (legacy vendors,
+            // `globalThis.require` shim) look up the registry. They
+            // expect a plain object (Object.prototype in chain) so
+            // `.hasOwnProperty` / `.toString` work. Shaping once on
+            // registration — the shape function is identity-preserving
+            // via WeakMap — gives a stable, shared, CJS-compatible
+            // view without copying on every require.
+            const registrationFooter = [
+                `try { if (typeof globalThis !== 'undefined') {`,
+                `  const __nsReg = globalThis.__NS_CORE_MODULES__ || (globalThis.__NS_CORE_MODULES__ = Object.create(null));`,
+                `  const __nsShapeFn = typeof globalThis.__NS_CJS_SHAPE__ === 'function' ? globalThis.__NS_CJS_SHAPE__ : function (x) { return x; };`,
+                `  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) { 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
+            // the registry. Self-import is a no-op at eval time —
+            // V8 resolves it to the module record we're already
+            // evaluating and the final namespace is the same object
+            // the registry receives. We use the CANONICAL URL here
+            // so the self-import participates in Invariant A along
+            // with every other @nativescript/core URL.
+            const canonicalUrlForSelf = canonicalSub ? `/ns/core/${canonicalSub}` : '/ns/core';
+            const selfImport = `import * as __ns_core_self_ns__ from ${JSON.stringify(canonicalUrlForSelf)};`;
+            // Invariant D — SHAPE INSTALLER.
+            //
+            // Emits idempotent body-code that installs
+            // globalThis.__NS_CJS_SHAPE__ BEFORE `rewritten`'s body
+            // runs. This matters because the rewrite step above may
+            // have produced statements like
+            // `export const Utils = (typeof globalThis.__NS_CJS_SHAPE__ ...)(__ns_re_Utils__);`
+            // that execute during module evaluation. Without the
+            // installer running first, the ternary falls back to
+            // identity — still safe, but the null-proto namespace
+            // leaks through and consumers that expect a plain
+            // object would still crash.
+            //
+            // Placement is important: BEFORE selfImport in the
+            // concatenation. ESM imports are hoisted regardless of
+            // textual position, but body code executes in source
+            // order. Placing the installer first guarantees it
+            // runs before any body statement in `rewritten`.
+            //
+            // Install is idempotent: `|| (globalThis.X = ...)` so
+            // whichever /ns/core module evaluates first wins and
+            // every subsequent module becomes a no-op.
+            const shapeInstallHeader = buildShapeInstallHeader();
+            // Invariant D — DEFAULT EXPORT BRIDGE.
+            //
+            // See `buildDefaultExportFooter` in ns-core-cjs-shape.ts
+            // for the full rationale (consumer matrix, skip conditions,
+            // why the default isn't shaped). The short version:
+            // upstream rewrites turn `import { X } from '@nativescript/core'`
+            // into a DEFAULT import, and the bridge has to provide one.
+            const defaultExportFooter = buildDefaultExportFooter(rewritten);
+            const moduleCode = [instrumentationHeader, preamble, shapeInstallHeader, selfImport, rewritten, defaultExportFooter, registrationFooter].join('\n');
+            res.statusCode = 200;
+            res.end(moduleCode);
+        }
+        catch (e) {
+            console.warn('[ns-core-bridge] serve failed:', e?.message);
+            next();
+        }
+    });
+}
+//# sourceMappingURL=websocket-ns-core.js.map

package/hmr/server/websocket-ns-core.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-ns-core.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/server/websocket-ns-core.ts"],"names":[],"mappings":"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"}

package/hmr/server/websocket-ns-entry.d.ts

@@ -0,0 +1,21 @@
+import type { ViteDevServer } from 'vite';
+/**
+ * Dependencies the device-bootstrap routes need from the HMR plugin closure.
+ * The three project-path values are computed once in `websocket.ts`; injecting
+ * them (rather than recomputing) keeps a single source of truth.
+ */
+export interface RegisterNsEntryRoutesOptions {
+    verbose: boolean;
+    appRootDir: string;
+    defaultMainEntry: string;
+    defaultMainEntryVirtual: string;
+    getGraphVersion(): number;
+}
+/**
+ * Registers the device bootstrap endpoints:
+ *   - `GET /ns/entry-rt[?v=<ver>]` — serves the compiled entry runtime module
+ *     (built `entry-runtime.js`, or a transformed `entry-runtime.ts` fallback), and
+ *   - `GET /ns/entry[/<ver>]` — a script-safe wrapper that fetches the entry
+ *     runtime and starts the app with `{ origin, main, ver }`.
+ */
+export declare function registerNsEntryRoutes(server: ViteDevServer, options: RegisterNsEntryRoutesOptions): void;

package/hmr/server/websocket-ns-entry.js

@@ -0,0 +1,150 @@
+import { createRequire } from 'node:module';
+import { existsSync, readFileSync } from 'fs';
+import * as path from 'path';
+import babelCore from '@babel/core';
+import { getPackageJson, getProjectFilePath } from '../../helpers/project.js';
+import { REQUIRE_GUARD_SNIPPET } from './require-guard.js';
+import { setDeviceModuleHeaders } from './route-helpers.js';
+import { getServerOrigin } from './server-origin.js';
+// Lazily loaded only for the source-tree fallback below (transform
+// entry-runtime.ts on the fly when the built .js isn't present).
+const pluginTransformTypescript = (() => {
+    const requireFromHere = createRequire(import.meta.url);
+    const loaded = requireFromHere('@babel/plugin-transform-typescript');
+    return loaded?.default || loaded;
+})();
+/**
+ * Registers the device bootstrap endpoints:
+ *   - `GET /ns/entry-rt[?v=<ver>]` — serves the compiled entry runtime module
+ *     (built `entry-runtime.js`, or a transformed `entry-runtime.ts` fallback), and
+ *   - `GET /ns/entry[/<ver>]` — a script-safe wrapper that fetches the entry
+ *     runtime and starts the app with `{ origin, main, ver }`.
+ */
+export function registerNsEntryRoutes(server, options) {
+    const verbose = options.verbose;
+    const APP_ROOT_DIR = options.appRootDir;
+    const DEFAULT_MAIN_ENTRY = options.defaultMainEntry;
+    const DEFAULT_MAIN_ENTRY_VIRTUAL = options.defaultMainEntryVirtual;
+    const getGraphVersion = options.getGraphVersion;
+    // 2.6a) Serve compiled entry runtime module: GET /ns/entry-rt[?v=<ver>]
+    server.middlewares.use(async (req, res, next) => {
+        try {
+            const urlObj = new URL(req.url || '', 'http://localhost');
+            if (!(urlObj.pathname === '/ns/entry-rt'))
+                return next();
+            if (verbose) {
+                const ra = req.socket?.remoteAddress;
+                const rp = req.socket?.remotePort;
+                console.log('[hmr-http] GET /ns/entry-rt from', ra + (rp ? ':' + rp : ''));
+            }
+            setDeviceModuleHeaders(res);
+            let content = '';
+            try {
+                const _req = createRequire(import.meta.url);
+                const entryRtPath = _req.resolve('@nativescript/vite/hmr/entry-runtime.js');
+                content = readFileSync(entryRtPath, 'utf-8');
+            }
+            catch (e) {
+                // .js not found (source tree without build) — transform .ts on the fly
+                try {
+                    const tsPath = path.resolve(path.dirname(new URL(import.meta.url).pathname), '..', 'entry-runtime.ts');
+                    if (existsSync(tsPath)) {
+                        const tsSource = readFileSync(tsPath, 'utf-8');
+                        const result = babelCore.transformSync(tsSource, {
+                            filename: tsPath,
+                            plugins: [[pluginTransformTypescript, { isTSX: false, allowDeclareFields: true }]],
+                            sourceType: 'module',
+                        });
+                        if (result?.code) {
+                            content = result.code;
+                        }
+                    }
+                }
+                catch (e2) {
+                    if (verbose)
+                        console.warn('[hmr-http] entry-runtime.ts transform failed', e2);
+                }
+                if (!content) {
+                    content = 'export default async function start(){ console.error("[/ns/entry-rt] not found"); }\n';
+                }
+            }
+            if (verbose)
+                console.log('[hmr-http] /ns/entry-rt serving', content.length, 'bytes');
+            res.statusCode = 200;
+            res.end(content);
+        }
+        catch (e) {
+            console.warn('[hmr-http] /ns/entry-rt error', e);
+            next();
+        }
+    });
+    // 2.6b) HTTP-only app entry endpoint: GET /ns/entry[/<ver>]
+    // Thin wrapper that imports the compiled entry runtime and starts it with parameters.
+    server.middlewares.use(async (req, res, next) => {
+        try {
+            const urlObj = new URL(req.url || '', 'http://localhost');
+            if (!(urlObj.pathname === '/ns/entry' || /^\/ns\/entry\/[\d]+$/.test(urlObj.pathname)))
+                return next();
+            try {
+                if (verbose) {
+                    const ra = req.socket?.remoteAddress;
+                    const rp = req.socket?.remotePort;
+                    console.log('[hmr-http] GET /ns/entry from', ra + (rp ? ':' + rp : ''));
+                }
+            }
+            catch { }
+            const verSeg = urlObj.pathname.replace(/^\/ns\/entry\/?/, '');
+            // Resolve app main entry to an absolute path-like key used by /ns/m
+            res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0');
+            res.setHeader('Pragma', 'no-cache');
+            res.setHeader('Expires', '0');
+            const ver = /^[0-9]+$/.test(verSeg) ? verSeg : String(getGraphVersion() || 0);
+            const origin = getServerOrigin(server) || `${urlObj.protocol}//${urlObj.host}`;
+            // Resolve app main entry to an absolute path-like key used by /ns/m
+            let mainEntry = '/';
+            try {
+                const pkg = getPackageJson();
+                const main = pkg?.main || DEFAULT_MAIN_ENTRY;
+                const abs = getProjectFilePath(main).replace(/\\/g, '/');
+                // Normalize to '/app/...'
+                const marker = `/${APP_ROOT_DIR}/`;
+                const idx = abs.indexOf(marker);
+                mainEntry = idx >= 0 ? abs.substring(idx) : DEFAULT_MAIN_ENTRY_VIRTUAL;
+            }
+            catch { }
+            // Build a tiny wrapper that imports the compiled entry runtime from the dev server
+            let code = REQUIRE_GUARD_SNIPPET +
+                `// [ns-entry][v${ver}] wrapper (script-safe) bytes will follow\n` +
+                `(async function(){\n` +
+                `  let origin = ${JSON.stringify(origin)}; const main = ${JSON.stringify(mainEntry)}; const __ns_graph_ver = ${JSON.stringify(ver)};\n` +
+                `  try { const __b = (globalThis && globalThis.__NS_ENTRY_BASE__) ? String(globalThis.__NS_ENTRY_BASE__) : ''; if (__b) { try { const __o = new URL(__b).origin; if (__o) origin = __o; } catch {} } } catch {}\n` +
+                `  const __VERBOSE__ = (typeof __NS_ENV_VERBOSE__ !== 'undefined' && __NS_ENV_VERBOSE__) || (globalThis && globalThis.process && globalThis.process.env && globalThis.process.env.verbose) || (globalThis && globalThis.__NS_ENV_VERBOSE__) || ${JSON.stringify(!!verbose)};\n` +
+                `  if (__VERBOSE__) console.info('[ns-entry][wrapper] start', { origin, main, ver: __ns_graph_ver });\n` +
+                `  async function __ns_import_entry_rt(u){\n` +
+                `    // Prefer fetch+eval script transformation to avoid module import limitations on device\n` +
+                `    try { const r = await fetch(u); const t = await r.text(); if (__VERBOSE__) console.info('[ns-entry][wrapper] entry-rt fetched bytes', (t&&t.length)||0);\n` +
+                `      // Transform 'export default function' or 'export default async function' into global assignment\n` +
+                `      let s = t.replace(/export\\s+default\\s+async\\s+function\\s+([A-Za-z0-9_$]+)?/,'globalThis.__NS_START_ENTRY__=async function $1')\n` +
+                `               .replace(/export\\s+default\\s+function\\s+([A-Za-z0-9_$]+)?/,'globalThis.__NS_START_ENTRY__=function $1');\n` +
+                `      // Fallback: if function-form replacements didn't run, handle expression default export too\n` +
+                `      if (String(s).indexOf('__NS_START_ENTRY__') === -1) { s = 'globalThis.__NS_START_ENTRY__=' + s.replace(/export\\s+default\\s*/,''); }\n` +
+                `      try { (0,eval)(s); } catch (ee) { console.error('[ns-entry][wrapper] eval entry-rt failed', ee && (ee.message||ee)); throw ee; }\n` +
+                `      const fn = globalThis.__NS_START_ENTRY__; if (!fn) { throw new Error('entry-rt missing __NS_START_ENTRY__'); }\n` +
+                `      return { default: fn };\n` +
+                `    } catch(e) { console.error('[ns-entry][wrapper] entry-rt fetch/eval failed', e && (e.message||e)); throw e; }\n` +
+                `  }\n` +
+                `  const __entryRtUrl = '/ns/entry-rt?v=' + String(__ns_graph_ver);\n` +
+                `  let __mod; try { __mod = await __ns_import_entry_rt(__entryRtUrl); if (__VERBOSE__) console.info('[ns-entry][wrapper] entry-rt ready'); } catch (e) { console.error('[ns-entry][wrapper] failed to prepare entry-rt', e && (e.message||e)); throw e; }\n` +
+                `  const startEntry = (__mod && (__mod.default || __mod));\n` +
+                `  try { await startEntry({ origin, main, ver: __ns_graph_ver, verbose: !!__VERBOSE__ }); if (__VERBOSE__) console.info('[ns-entry][wrapper] startEntry() resolved'); } catch (e) { console.error('[ns-entry][wrapper] startEntry() failed', e && (e.message||e)); throw e; }\n` +
+                `})();\n`;
+            code = code + `\n//# sourceURL=${origin}/ns/entry`;
+            res.statusCode = 200;
+            res.end(code);
+        }
+        catch (e) {
+            next();
+        }
+    });
+}
+//# sourceMappingURL=websocket-ns-entry.js.map

package/hmr/server/websocket-ns-entry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-ns-entry.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/server/websocket-ns-entry.ts"],"names":[],"mappings":"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"}

package/hmr/server/websocket-ns-m-paths.d.ts

@@ -0,0 +1,3 @@
+export declare function formatNsMHmrServeTag(value: string | number): string;
+export declare function rewriteNsMImportPathForHmr(p: string, _ver: string | number, bootTaggedRequest: boolean): string;
+export declare function getNumericServeVersionTag(tag: string | null | undefined, fallback: number): number;

package/hmr/server/websocket-ns-m-paths.js

@@ -0,0 +1,92 @@
+// Stable URL + explicit invalidation contract for `/ns/m/...` modules.
+//
+// Older versions emitted `/ns/m/__ns_hmr__/v<N>/<rel>` URLs in every
+// served module so that V8's HTTP module cache (`g_moduleRegistry`)
+// would see a fresh URL on each save and re-fetch the dependency
+// closure. On every save the server also bumped a global `graphVersion`
+// counter, which propagated into every emitted URL — effectively
+// invalidating the ENTIRE cached graph on every save (Vite's
+// single-threaded transform pipeline became the wall-clock bottleneck).
+//
+// The current contract inverts that:
+//   - The runtime registers a canonical key for every URL via
+//     `CanonicalizeHttpUrlKey` (HMRSupport.mm), which strips
+//     `__ns_hmr__/<tag>/` and `__ns_boot__/b1/` segments before lookup.
+//   - The Angular HMR client receives an explicit `evictPaths` list in
+//     `ns:angular-update` and calls `__nsInvalidateModules` to drop only
+//     the modules that actually need re-evaluation.
+//   - The server emits STABLE URLs for app modules. No version segment.
+//
+// `rewriteNsMImportPathForHmr` collapses any inbound URL shape to the
+// canonical stable form. We still preserve `__ns_boot__/b1/` for
+// boot-tagged requests because that wrapper drives boot-progress
+// instrumentation (see `buildBootProgressSnippet`), and we still pass
+// `node_modules` through unchanged because vendor packages live on a
+// stable namespace already.
+export function formatNsMHmrServeTag(value) {
+    const raw = String(value ?? '').trim();
+    if (!raw) {
+        return 'v0';
+    }
+    if (raw === 'live' || /^n\d+$/i.test(raw) || /^v[^/]+$/i.test(raw)) {
+        return raw;
+    }
+    if (/^\d+$/.test(raw)) {
+        return `v${raw}`;
+    }
+    return raw;
+}
+export function rewriteNsMImportPathForHmr(p, _ver, bootTaggedRequest) {
+    if (!p || !p.startsWith('/ns/m/')) {
+        return p;
+    }
+    // Step 1: collapse any legacy boot+hmr or hmr-only prefix back to the
+    // canonical `/ns/m/<rest>` form. Inputs we may see in the wild include:
+    //   * `/ns/m/__ns_boot__/b1/__ns_hmr__/v<N>/<rest>` (legacy cold-boot
+    //     served code)
+    //   * `/ns/m/__ns_hmr__/v<N>/<rest>`               (legacy HMR served code)
+    //   * `/ns/m/__ns_boot__/b1/<rest>`                (current cold boot)
+    //   * `/ns/m/<rest>`                                (current HMR)
+    // We strip `__ns_hmr__/<tag>/` regardless of `<tag>` (handles `live`,
+    // `v<N>`, `n<N>`, anything matched by `formatNsMHmrServeTag`). The
+    // `__ns_boot__/b1/` segment is stripped here too — we'll re-add it
+    // below if `bootTaggedRequest` is set, so the canonicalization is
+    // idempotent (a boot URL that flows through twice ends up correct).
+    let canonical = p
+        .replace(/^\/ns\/m\/__ns_boot__\/b1\/__ns_hmr__\/[^/]+\//, '/ns/m/')
+        .replace(/^\/ns\/m\/__ns_hmr__\/[^/]+\//, '/ns/m/')
+        .replace(/^\/ns\/m\/__ns_boot__\/b1\//, '/ns/m/');
+    // Vendor packages: always serve under the canonical
+    // `/ns/m/node_modules/<rest>` path, never under the boot prefix. This
+    // preserves the longstanding invariant that node_modules paths are
+    // stable across boot and HMR (so V8 dedups them in the module
+    // registry regardless of which load triggered the fetch first).
+    if (canonical.startsWith('/ns/m/node_modules/')) {
+        return canonical;
+    }
+    // Boot-tagged request: app-module URL gets wrapped with the boot
+    // prefix. The runtime canonicalizer collapses this back to the same
+    // cache key as the unprefixed URL, so cold boot and HMR share module
+    // identity. The boot prefix is still useful at request time because
+    // the server detects it and injects the boot-progress snippet.
+    if (bootTaggedRequest) {
+        return `/ns/m/__ns_boot__/b1${canonical.slice('/ns/m'.length)}`;
+    }
+    // HMR / steady-state request: stable canonical URL.
+    return canonical;
+}
+export function getNumericServeVersionTag(tag, fallback) {
+    const raw = String(tag || '').trim();
+    if (!raw) {
+        return fallback;
+    }
+    const versionMatch = raw.match(/^v(\d+)$/);
+    if (versionMatch?.[1]) {
+        return Number(versionMatch[1]);
+    }
+    if (/^\d+$/.test(raw)) {
+        return Number(raw);
+    }
+    return fallback;
+}
+//# sourceMappingURL=websocket-ns-m-paths.js.map

package/hmr/server/websocket-ns-m-paths.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-ns-m-paths.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/server/websocket-ns-m-paths.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,EAAE;AACF,qEAAqE;AACrE,oEAAoE;AACpE,iEAAiE;AACjE,wEAAwE;AACxE,iEAAiE;AACjE,6DAA6D;AAC7D,wEAAwE;AACxE,EAAE;AACF,qCAAqC;AACrC,8DAA8D;AAC9D,6DAA6D;AAC7D,wEAAwE;AACxE,uEAAuE;AACvE,yEAAyE;AACzE,oDAAoD;AACpD,wEAAwE;AACxE,EAAE;AACF,sEAAsE;AACtE,iEAAiE;AACjE,iEAAiE;AACjE,sEAAsE;AACtE,qEAAqE;AACrE,4BAA4B;AAE5B,MAAM,UAAU,oBAAoB,CAAC,KAAsB;IAC1D,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACvC,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACb,CAAC;IACD,IAAI,GAAG,KAAK,MAAM,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACpE,OAAO,GAAG,CAAC;IACZ,CAAC;IACD,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,IAAI,GAAG,EAAE,CAAC;IAClB,CAAC;IACD,OAAO,GAAG,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,CAAS,EAAE,IAAqB,EAAE,iBAA0B;IACtG,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnC,OAAO,CAAC,CAAC;IACV,CAAC;IAED,sEAAsE;IACtE,wEAAwE;IACxE,sEAAsE;IACtE,mBAAmB;IACnB,4EAA4E;IAC5E,uEAAuE;IACvE,kEAAkE;IAClE,sEAAsE;IACtE,mEAAmE;IACnE,mEAAmE;IACnE,kEAAkE;IAClE,oEAAoE;IACpE,IAAI,SAAS,GAAG,CAAC;SACf,OAAO,CAAC,gDAAgD,EAAE,QAAQ,CAAC;SACnE,OAAO,CAAC,+BAA+B,EAAE,QAAQ,CAAC;SAClD,OAAO,CAAC,6BAA6B,EAAE,QAAQ,CAAC,CAAC;IAEnD,oDAAoD;IACpD,sEAAsE;IACtE,mEAAmE;IACnE,8DAA8D;IAC9D,gEAAgE;IAChE,IAAI,SAAS,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACjD,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,iEAAiE;IACjE,oEAAoE;IACpE,qEAAqE;IACrE,oEAAoE;IACpE,+DAA+D;IAC/D,IAAI,iBAAiB,EAAE,CAAC;QACvB,OAAO,uBAAuB,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;IACjE,CAAC;IAED,oDAAoD;IACpD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,GAA8B,EAAE,QAAgB;IACzF,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACrC,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,OAAO,QAAQ,CAAC;IACjB,CAAC;IACD,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC3C,IAAI,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvB,OAAO,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC;IACD,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC"}