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

package/hmr/server/websocket.js

@@ -1,5 +1,5 @@
 import { createRequire } from 'node:module';
-import { normalizeStrayCoreStringLiterals, fixDanglingCoreFrom, normalizeAnyCoreSpecToBridge, isDeepCoreSubpath, rewriteSpecifiersForDevice } from './core-sanitize.js';
+import { sanitizeStrayCoreReferences, isDeepCoreSubpath, rewriteSpecifiersForDevice } from './core-sanitize.js';
 import { buildDefaultExportFooter, buildShapeInstallHeader, hasNamespaceReExport, rewriteNamespaceReExportsForShape } from './ns-core-cjs-shape.js';
 // AST tooling for robust transformations
 import { parse as babelParse } from '@babel/parser';
@@ -33,10 +33,11 @@ import { astExtractImportsAndStripTypes } from '../helpers/ast-extract.js';
 import { getProjectAppPath, getProjectAppRelativePath, getProjectAppVirtualPath } from '../../helpers/utils.js';
 import { buildRuntimeConfig, generateImportMap } from './import-map.js';
 import { getCliFlags } from '../../helpers/cli-flags.js';
-import { normalizeCoreSub as normalizeCoreSubCanonical } from '../../helpers/ns-core-url.js';
+import { buildCoreUrl, buildCoreUrlPath, normalizeCoreSub as normalizeCoreSubCanonical } from '../../helpers/ns-core-url.js';
 import { isRuntimeGraphExcludedPath, matchesRuntimeGraphModuleId, normalizeRuntimeGraphPath, shouldIncludeRuntimeGraphFile, shouldSkipRuntimeGraphDirectoryName } from './runtime-graph-filter.js';
 import { resolveAngularCoreHmrImportSource, rewriteAngularEntryRegisterOnly } from './websocket-angular-entry.js';
 import { angularSourceHasSemanticDecorator, canonicalizeTransformRequestCacheKey, collectAngularEvictionUrls, collectAngularHotUpdateRoots, collectAngularTransformCacheInvalidationUrls, collectAngularTransitiveImportersForInvalidation, collectGraphUpdateModulesForHotUpdate, normalizeHotReloadMatchPath, shouldInvalidateAngularTransitiveImporters, shouldSuppressDefaultViteHotUpdate, shouldSuppressViteFullReloadPayload } from './websocket-angular-hot-update.js';
+import { collectCssHotUpdatePaths } from './websocket-css-hot-update.js';
 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';
@@ -55,6 +56,7 @@ export { rewriteAngularEntryRegisterOnly } from './websocket-angular-entry.js';
 // without churn while the implementation lives in a focused module.
 export { formatNsMHmrServeTag, rewriteNsMImportPathForHmr } from './websocket-ns-m-paths.js';
 export { angularSourceHasSemanticDecorator, canonicalizeTransformRequestCacheKey, collectAngularEvictionUrls, collectAngularHotUpdateRoots, collectAngularTransformCacheInvalidationUrls, collectAngularTransitiveImportersForInvalidation, collectGraphUpdateModulesForHotUpdate, createSharedTransformRequestRunner, normalizeHotReloadMatchPath, shouldInvalidateAngularTransitiveImporters, shouldSuppressDefaultViteHotUpdate, shouldSuppressViteFullReloadPayload, classifyGraphUpsert, shouldBroadcastGraphUpsertDelta, shouldBumpGraphVersion };
+export { collectCssHotUpdatePaths } from './websocket-css-hot-update.js';
 const pluginTransformTypescript = (() => {
     const requireFromHere = createRequire(import.meta.url);
     const loaded = requireFromHere('@babel/plugin-transform-typescript');
@@ -215,14 +217,13 @@ function hoistTopLevelStaticImports(code) {
     }
     return `${hoisted.join('\n')}\n${stripped.replace(/^\s*\n+/, '')}`;
 }
+// Duplicate of `websocket-served-module-helpers.ts::buildBootProgressSnippet`
+// — both copies must stay in lock-step. See the canonical doc there for
+// why the snippet must remain fully synchronous (top-level await on a
+// boot-tagged module trips the iOS 10 s async-module deadline).
 export function buildBootProgressSnippet(bootModuleLabel) {
     const normalizedLabel = JSON.stringify(String(bootModuleLabel || '').replace(/\\/g, '/'));
-    return [
-        `const __nsBootGlobal=globalThis;`,
-        `try{if(!__nsBootGlobal.__NS_HMR_BOOT_COMPLETE__){const __nsBootApi=__nsBootGlobal.__NS_HMR_DEV_OVERLAY__;if(__nsBootApi&&typeof __nsBootApi.setBootStage==='function'){const __nsBootCount=(__nsBootGlobal.__NS_HMR_BOOT_MODULE_COUNT__=Number(__nsBootGlobal.__NS_HMR_BOOT_MODULE_COUNT__||0)+1);__nsBootGlobal.__NS_HMR_BOOT_LAST_MODULE__=${normalizedLabel};const __nsBootNow=Date.now();const __nsBootLast=Number(__nsBootGlobal.__NS_HMR_BOOT_LAST_PROGRESS_AT__||0);if(__nsBootCount<=8||__nsBootCount%6===0||__nsBootNow-__nsBootLast>90){__nsBootGlobal.__NS_HMR_BOOT_LAST_PROGRESS_AT__=__nsBootNow;const __nsBootProgress=Math.min(94,82+Math.min(10,Math.round((Math.log(__nsBootCount+1)/Math.LN2)*2)));__nsBootApi.setBootStage('importing-main',{detail:'Evaluated '+__nsBootCount+' modules\\n'+__nsBootGlobal.__NS_HMR_BOOT_LAST_MODULE__,attempt:Number(__nsBootGlobal.__NS_HMR_BOOT_MAIN_ATTEMPT__||1),attempts:Number(__nsBootGlobal.__NS_HMR_BOOT_MAIN_ATTEMPTS__||6),progress:__nsBootProgress});}}}}catch(__nsBootErr){}`,
-        `if(!__nsBootGlobal.__NS_HMR_BOOT_COMPLETE__){const __nsBootCount=Number(__nsBootGlobal.__NS_HMR_BOOT_MODULE_COUNT__||0);if(__nsBootCount<=24||__nsBootCount%8===0){await new Promise((resolve)=>setTimeout(resolve,0));}}`,
-        '',
-    ].join('\n');
+    return [`const __nsBootGlobal=globalThis;`, `try{if(!__nsBootGlobal.__NS_HMR_BOOT_COMPLETE__){__nsBootGlobal.__NS_HMR_BOOT_MODULE_COUNT__=Number(__nsBootGlobal.__NS_HMR_BOOT_MODULE_COUNT__||0)+1;__nsBootGlobal.__NS_HMR_BOOT_LAST_MODULE__=${normalizedLabel};}}catch(__nsBootErr){}`, ''].join('\n');
 }
 function rewriteVitePrebundleImportsForDevice(code, preserveVendorImports) {
     const imports = collectTopLevelImportRecords(code);
@@ -1171,7 +1172,20 @@ function processCodeForDevice(code, isVitePreBundled, preserveVendorImports = fa
         // Minimal process shim — populated with CLI --env.* flags at module load time.
         // In production builds, Vite/Rollup replaces process.env.* statically.
         // In HMR dev mode the code runs as-is on device, so we need the shim.
-        `if (typeof process === "undefined") { globalThis.process = { env: ${__processEnvJson} }; } else if (!process.env) { process.env = ${__processEnvJson}; }`,
+        //
+        // IMPORTANT: every check goes through `globalThis.process` (a member
+        // expression), NEVER bare `typeof process` (an identifier reference).
+        // bare identifier resolution
+        // against runtime-added global object properties is not reliable in
+        // V8 module scope. `globalThis.process` is unambiguous: it always
+        // reads the `process` property off the (single) global object.
+        //
+        // The shim is also strictly additive — it only initializes
+        // `globalThis.process` and `globalThis.process.env` if they are
+        // missing. App code that pre-populates `process.env` (e.g. an Azure
+        // App Configuration boot module) is preserved; we never overwrite a
+        // populated env with the bare `{ NODE_ENV: 'development' }` stub.
+        `if (typeof globalThis.process === "undefined" || globalThis.process === null) { globalThis.process = { env: ${__processEnvJson} }; } else if (!globalThis.process.env) { globalThis.process.env = ${__processEnvJson}; }`,
         'const __ANDROID__ = globalThis.__ANDROID__ !== undefined ? globalThis.__ANDROID__ : false;',
         'const __IOS__ = globalThis.__IOS__ !== undefined ? globalThis.__IOS__ : false;',
         'const __VISIONOS__ = globalThis.__VISIONOS__ !== undefined ? globalThis.__VISIONOS__ : false;',
@@ -1423,21 +1437,11 @@ function processCodeForDevice(code, isVitePreBundled, preserveVendorImports = fa
         }
     }
     catch { }
-    // Normalize stray string-literal side-effect lines that still reference @nativescript/core
-    // into proper imports of the unified core bridge. This prevents the local-core-path
-    // fast-fail from triggering due to upstream transforms that emitted naked literals.
-    try {
-        result = normalizeStrayCoreStringLiterals(result);
-    }
-    catch { }
-    try {
-        result = fixDanglingCoreFrom(result);
-    }
-    catch { }
-    try {
-        result = normalizeAnyCoreSpecToBridge(result);
-    }
-    catch { }
+    // Apply the three-pass safety net for stray @nativescript/core references
+    // (naked string literals, dangling `from` merges, lingering resolved-path
+    // references). Centralised in core-sanitize.sanitizeStrayCoreReferences so
+    // every NS-M emitter applies the same passes in the same order.
+    result = sanitizeStrayCoreReferences(result);
     result = ensureVariableDynamicImportHelper(result);
     // Normalize any lingering @nativescript/core imports to the /ns/core bridge (non-destructive best-effort)
     try {
@@ -1869,10 +1873,30 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
     try {
         let coreAliasIdx = 0;
         const mkAlias = () => `__NSC${coreAliasIdx++}`;
-        const coreUrl = (sub) => {
-            const p = (sub || '').replace(/^\//, '');
-            return `${httpOriginSafe || ''}/ns/core` + (p ? `?p=${p}` : '');
-        };
+        // Use the canonical PATH form `/ns/core/<sub>` (NOT the legacy
+        // `/ns/core?p=<sub>` query form). The iOS HTTP ESM loader caches
+        // module records by URL string — if vendor.mjs's external imports
+        // resolve to `/ns/core/<sub>` (via the import map + buildCoreUrl()
+        // canonical generator) and the app's rewritten imports resolve to
+        // `/ns/core?p=<sub>`, V8 creates two distinct module records for
+        // the same logical core subpath. Each gets its own class
+        // identities (TextBase, View, etc.), and side-effect patches
+        // applied to one (e.g. @nativescript-community/text's
+        // `TextBase.prototype.setTextDecorationAndTransform` override
+        // installed when vendor.mjs evaluates `overrideSpanAndFormattedString()`
+        // from `@nativescript-community/ui-label/index-common.js`) are
+        // invisible to the other — manifesting as inconsistent line-height /
+        // letter-spacing rendering between HMR and no-HMR.
+        //
+        // Mirrors `normalizeCoreSub()` (helpers/ns-core-url.ts) so the URL
+        // produced here is byte-identical to what `buildCoreUrl()` produces
+        // for the bundle entry, import map, and external-urls plugin.
+        // Delegate to the ONE canonical URL builder so every emitter (this
+        // rewriter, core-sanitize, the runtime import map, the ns-core-external-urls
+        // build plugin, and main-entry) produces byte-identical URLs for
+        // the same logical core module. Any drift here would re-introduce
+        // the realm-split bug.
+        const coreUrl = (sub) => (httpOriginSafe ? buildCoreUrl(httpOriginSafe, sub) : buildCoreUrlPath(sub));
         // Case 1: import { A, B } from '@nativescript/core[/sub]'
         result = result.replace(/(^|\n)\s*import\s*\{\s*([^}]+?)\s*\}\s*from\s+["']@nativescript\/core([^"'\n]*)["'];?/g, (_m, pfx, names, sub) => {
             const alias = mkAlias();
@@ -3824,16 +3848,14 @@ export const piniaSymbol = p.piniaSymbol;
                         code = ensureGuardPlainDynamicImports(code, getServerOrigin(server));
                     }
                     catch { }
-                    // Extra hardening: normalize any remaining core references to the unified bridge
-                    // - Stray string-literals
-                    // - Dangling `from` merges
-                    // - Any spec (including /node_modules resolves) that still references '@nativescript/core'
-                    // Do this right before the final fast-fail assertion. If a rewrite occurred, add a small marker for diagnostics.
+                    // Extra hardening before the fast-fail assertion: run the
+                    // consolidated stray-core-reference safety net. If any
+                    // rewrite occurred, leave a diagnostic marker so the
+                    // pipeline review log explains why the served code carries
+                    // it.
                     try {
                         const __before = code;
-                        code = normalizeStrayCoreStringLiterals(code);
-                        code = fixDanglingCoreFrom(code);
-                        code = normalizeAnyCoreSpecToBridge(code);
+                        code = sanitizeStrayCoreReferences(code);
                         if (code !== __before) {
                             code = `// [hmr-sanitize] core-literal->bridge\n` + code;
                         }
@@ -4368,6 +4390,23 @@ export const piniaSymbol = p.piniaSymbol;
                     const coreRequest = parseCoreBridgeRequest(urlObj.pathname, urlObj.searchParams, Number(graphVersion || 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;
+                    }
                     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');
@@ -6460,6 +6499,51 @@ export const piniaSymbol = p.piniaSymbol;
                     console.warn('[hmr-ws][v2] failed graph update', e);
             }
             const root = server.config.root || process.cwd();
+            // CSS hot-update — handled BEFORE the project-scope filter
+            // because workspace `@import` deps live outside `<root>/`.
+            // The helper maps in-scope edits to their own path and
+            // out-of-scope edits to `app.css` (Vite re-runs PostCSS
+            // through the `@import` chain on the next fetch).
+            if (file.endsWith('.css')) {
+                const cssPaths = collectCssHotUpdatePaths({
+                    file,
+                    root,
+                    appRootDir: APP_ROOT_DIR,
+                    appEntryCss: path.resolve(root, APP_ROOT_DIR, 'app.css'),
+                });
+                if (cssPaths.length > 0) {
+                    updateMetrics.tAfterFramework = Date.now();
+                    try {
+                        const origin = getServerOrigin(server);
+                        const timestamp = Date.now();
+                        const msg = {
+                            type: 'ns:css-updates',
+                            origin,
+                            updates: cssPaths.map((cssPath) => ({
+                                type: 'css-update',
+                                path: cssPath,
+                                acceptedPath: cssPath,
+                                timestamp,
+                            })),
+                        };
+                        wss.clients.forEach((client) => {
+                            if (isSocketClientOpen(client)) {
+                                client.send(JSON.stringify(msg));
+                                updateMetrics.recipients += 1;
+                            }
+                        });
+                    }
+                    catch (error) {
+                        console.warn('[hmr-ws] CSS update failed:', error);
+                    }
+                    if (verbose)
+                        console.log(`[hmr-ws] Hot update for: ${file} → broadcast CSS paths: ${cssPaths.join(', ')}`);
+                    emitHmrUpdateSummary();
+                    return;
+                }
+                // CSS without a broadcast target (no appEntryCss
+                // configured) — fall through to the scope filter.
+            }
             const srcDir = `${root}/src`;
             const coreDir = `${root}/core`;
             const appDir = `${root}/${APP_ROOT_DIR}`;
@@ -6471,37 +6555,6 @@ export const piniaSymbol = p.piniaSymbol;
                 return;
             if (verbose)
                 console.log(`[hmr-ws] Hot update for: ${file}`);
-            // Handle CSS updates
-            if (file.endsWith('.css')) {
-                updateMetrics.tAfterFramework = Date.now();
-                try {
-                    let rel = '/' + path.posix.normalize(path.relative(root, file)).split(path.sep).join('/');
-                    const origin = getServerOrigin(server);
-                    const msg = {
-                        type: 'ns:css-updates',
-                        origin,
-                        updates: [
-                            {
-                                type: 'css-update',
-                                path: rel,
-                                acceptedPath: rel,
-                                timestamp: Date.now(),
-                            },
-                        ],
-                    };
-                    wss.clients.forEach((client) => {
-                        if (isSocketClientOpen(client)) {
-                            client.send(JSON.stringify(msg));
-                            updateMetrics.recipients += 1;
-                        }
-                    });
-                }
-                catch (error) {
-                    console.warn('[hmr-ws] CSS update failed:', error);
-                }
-                emitHmrUpdateSummary();
-                return;
-            }
             // Framework-specific hot update handling
             if (ACTIVE_STRATEGY.flavor === 'angular') {
                 // For Angular, react to component TS or external template HTML changes under /src