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

package/hmr/client/css-handler.js

@@ -1,7 +1,13 @@
-const VERBOSE = !!globalThis.__NS_ENV_VERBOSE__;
+import { getCore } from './utils.js';
+import { getGlobalScope } from '../shared/runtime/global-scope.js';
+const VERBOSE = !!getGlobalScope().__NS_ENV_VERBOSE__;
+// Must match the tag used by the boot virtual `app.css` emitter in
+// `helpers/main-entry.ts` and `entry-runtime.ts::APP_CSS_TAG` so HMR's
+// remove/add pair replaces the boot-time selectors instead of stacking.
+export const APP_CSS_TAG = 'app.css';
 function getPreferredCssApplier() {
     try {
-        const applier = globalThis.__NS_HMR_APPLY_CSS__;
+        const applier = getGlobalScope().__NS_HMR_APPLY_CSS__;
         if (typeof applier === 'function') {
             return applier;
         }
@@ -9,50 +15,71 @@ function getPreferredCssApplier() {
     catch { }
     return null;
 }
-function getCore(name) {
-    try {
-        const g = globalThis;
-        const reg = g.__nsVendorRegistry;
-        if (reg && reg.has('@nativescript/core')) {
-            const ns = reg.get('@nativescript/core');
-            return ns?.[name] || (ns?.default ?? ns)?.[name];
-        }
-        const req = g.__nsVendorRequire || g.__nsRequire || g.require;
-        if (typeof req === 'function') {
-            const ns = req('@nativescript/core');
-            return ns?.[name] || (ns?.default ?? ns)?.[name];
-        }
+function resolveTaggedCssApi() {
+    const add = getCore('addTaggedAdditionalCSS');
+    const remove = getCore('removeTaggedAdditionalCSS');
+    if (typeof add === 'function' && typeof remove === 'function') {
+        return { add, remove };
     }
-    catch { }
-    return globalThis[name];
+    return {};
 }
-// CSS helper: apply CSS and refresh the current page so new styles render
-export function applyCssText(cssText) {
+// CSS helper: apply CSS and refresh the current page so new styles render.
+//
+// `tag` scopes the remove+add tagged pair. It defaults to {@link APP_CSS_TAG}
+// (`'app.css'`) so a global stylesheet edit replaces the boot-time selectors.
+// Component `styleUrls` edits pass the style file's own path as the tag so a
+// component's rules replace independently — applying a component's CSS under
+// the shared `app.css` tag would otherwise wipe the global stylesheet.
+export function applyCssText(cssText, tag = APP_CSS_TAG) {
     if (typeof cssText !== 'string' || !cssText.length)
         return;
     try {
-        const applyInHttpCoreRealm = getPreferredCssApplier();
-        if (applyInHttpCoreRealm) {
-            applyInHttpCoreRealm(cssText, true);
-            if (VERBOSE)
-                console.info('[ns-hmr] CSS applied through HTTP core realm');
-            return;
+        // The HTTP-core-realm applier (entry-runtime's `__NS_HMR_APPLY_CSS__`)
+        // always replaces under the global `app.css` tag, so it is only correct
+        // for GLOBAL stylesheet updates — routing a component-tagged update
+        // through it would wipe the global stylesheet and install the
+        // component's rules in its place. Component tags take the tagged
+        // remove+add path below.
+        if (tag === APP_CSS_TAG) {
+            const applyInHttpCoreRealm = getPreferredCssApplier();
+            if (applyInHttpCoreRealm) {
+                applyInHttpCoreRealm(cssText, true);
+                if (VERBOSE)
+                    console.info('[ns-hmr] CSS applied through HTTP core realm');
+                return;
+            }
         }
+        // Replace selectors via remove + add tagged pair so deleted
+        // rules disappear (the additive `Application.addCss` cannot
+        // undo previously installed selectors).
+        const taggedCss = resolveTaggedCssApi();
         const Application = getCore('Application');
-        if (Application && Application.addCss) {
+        let appliedTagged = false;
+        if (taggedCss.add && taggedCss.remove) {
+            try {
+                taggedCss.remove(tag);
+                taggedCss.add(cssText, tag);
+                appliedTagged = true;
+                if (VERBOSE)
+                    console.info(`[ns-hmr] CSS applied via tagged replace (tag=${tag})`);
+            }
+            catch (taggedError) {
+                console.warn('[ns-hmr] tagged CSS replace failed, falling back to addCss:', taggedError?.message || String(taggedError));
+            }
+        }
+        if (!appliedTagged && Application && Application.addCss) {
             Application.addCss(cssText);
             if (VERBOSE)
-                console.info('[ns-hmr] CSS applied, refreshing view');
+                console.info('[ns-hmr] CSS applied via addCss (additive fallback)');
         }
-        // Trigger a view refresh so the new styles are rendered.
-        // NativeScript caches computed styles — addCss alone won't repaint.
+        // NS caches computed styles — re-trigger styling on the root
+        // (propagates to descendants via `eachDescendant`).
         try {
             const rootView = Application?.getRootView?.();
             if (rootView && typeof rootView._onCssStateChange === 'function') {
                 rootView._onCssStateChange();
             }
             else if (rootView) {
-                // Force a style recalculation by toggling the root's class
                 const cls = rootView.className || '';
                 rootView.className = cls + ' ';
                 rootView.className = cls;
@@ -67,7 +94,7 @@ export function applyCssText(cssText) {
 // Fetch helper
 export async function fetchText(url) {
     try {
-        const g = globalThis;
+        const g = getGlobalScope();
         if (typeof g.fetch === 'function') {
             const res = await g.fetch(url);
             return await res.text();
@@ -102,7 +129,11 @@ export async function handleCssUpdates(cssUpdates, httpOrigin) {
                 console.info('[ns-hmr] Fetching CSS:', url);
             const cssText = await fetchText(url);
             if (cssText) {
-                applyCssText(cssText);
+                // `tag` scopes the replace: app entry CSS (no tag) uses the
+                // default `app.css` tag; component `styleUrls` edits carry their
+                // own path so they replace independently of the global stylesheet.
+                const tag = typeof update.tag === 'string' && update.tag ? update.tag : undefined;
+                applyCssText(cssText, tag);
             }
         }
         catch (e) {

package/hmr/client/css-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"css-handler.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/client/css-handler.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG,CAAC,CAAE,UAAkB,CAAC,kBAAkB,CAAC;AAEzD,SAAS,sBAAsB;IAC9B,IAAI,CAAC;QACJ,MAAM,OAAO,GAAI,UAAkB,CAAC,oBAAoB,CAAC;QACzD,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE,CAAC;YACnC,OAAO,OAAO,CAAC;QAChB,CAAC;IACF,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IACV,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAS,OAAO,CAAC,IAAY;IAC5B,IAAI,CAAC;QACJ,MAAM,CAAC,GAAG,UAAiB,CAAC;QAC5B,MAAM,GAAG,GAAG,CAAC,CAAC,kBAAkB,CAAC;QACjC,IAAI,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAC1C,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;YACzC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,GAAG,GAAG,CAAC,CAAC,iBAAiB,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,OAAO,CAAC;QAC9D,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE,CAAC;YAC/B,MAAM,EAAE,GAAG,GAAG,CAAC,oBAAoB,CAAC,CAAC;YACrC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAClD,CAAC;IACF,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IACV,OAAQ,UAAkB,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC;AAED,0EAA0E;AAC1E,MAAM,UAAU,YAAY,CAAC,OAAe;IAC3C,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO;IAE3D,IAAI,CAAC;QACJ,MAAM,oBAAoB,GAAG,sBAAsB,EAAE,CAAC;QACtD,IAAI,oBAAoB,EAAE,CAAC;YAC1B,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACpC,IAAI,OAAO;gBAAE,OAAO,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;YAC1E,OAAO;QACR,CAAC;QAED,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;QAC3C,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;YACvC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC5B,IAAI,OAAO;gBAAE,OAAO,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QACpE,CAAC;QACD,yDAAyD;QACzD,oEAAoE;QACpE,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,WAAW,EAAE,WAAW,EAAE,EAAE,CAAC;YAC9C,IAAI,QAAQ,IAAI,OAAO,QAAQ,CAAC,iBAAiB,KAAK,UAAU,EAAE,CAAC;gBAClE,QAAQ,CAAC,iBAAiB,EAAE,CAAC;YAC9B,CAAC;iBAAM,IAAI,QAAQ,EAAE,CAAC;gBACrB,2DAA2D;gBAC3D,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC;gBACrC,QAAQ,CAAC,SAAS,GAAG,GAAG,GAAG,GAAG,CAAC;gBAC/B,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC;YAC1B,CAAC;QACF,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACX,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC,EAAE,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC;AACF,CAAC;AAED,eAAe;AACf,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,GAAW;IAC1C,IAAI,CAAC;QACJ,MAAM,CAAC,GAAG,UAAiB,CAAC;QAC5B,IAAI,OAAO,CAAC,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YACnC,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,OAAO,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QACzB,CAAC;QACD,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;QACpB,IAAI,IAAI,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC5B,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,OAAO;YAAE,OAAO,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;QAChE,OAAO,EAAE,CAAC;IACX,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,EAAE,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAChE,OAAO,EAAE,CAAC;IACX,CAAC;AACF,CAAC;AAED,+BAA+B;AAC/B,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,UAAiB,EAAE,UAAkB;IAC3E,IAAI,OAAO;QAAE,OAAO,CAAC,IAAI,CAAC,4CAA4C,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IACnH,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;QACjC,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;YACzD,IAAI,CAAC,OAAO,IAAI,CAAC,UAAU;gBAAE,SAAS;YAEtC,qDAAqD;YACrD,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACjD,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;YAC9C,MAAM,GAAG,GAAG,GAAG,UAAU,GAAG,OAAO,GAAG,GAAG,cAAc,SAAS,EAAE,CAAC;YAEnE,IAAI,OAAO;gBAAE,OAAO,CAAC,IAAI,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;YACzD,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;YACrC,IAAI,OAAO,EAAE,CAAC;gBACb,YAAY,CAAC,OAAO,CAAC,CAAC;YACvB,CAAC;QACF,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,OAAO,CAAC,IAAI,CAAC,yCAAyC,EAAE,CAAC,EAAE,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAClF,CAAC;IACF,CAAC;AACF,CAAC;AAED,2BAA2B;AAC3B,MAAM,UAAU,eAAe,CAAC,OAAe;IAC9C,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnD,YAAY,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;AACF,CAAC"}
+{"version":3,"file":"css-handler.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/client/css-handler.ts"],"names":[],"mappings":"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"}

package/hmr/client/css-update-overlay.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Detail strings for the HMR-applying overlay's CSS update frames.
+ *
+ * The overlay uses generic per-stage `phase` labels ("Re-importing
+ * entry", "Update applied"). These pure helpers produce the matching
+ * `detail` line so a CSS-only HMR cycle has a sensible progression
+ * from 'received' → 'reimporting' → 'complete' rather than getting
+ * stuck on the 'received' (5%) frame.
+ *
+ * Path-specific detail is intentionally omitted: the broadcast path
+ * for an out-of-scope `@import` edit is rewritten to `/src/app.css`
+ * (so Vite's PostCSS pipeline re-resolves the import chain), which
+ * doesn't match the file the user actually edited. The 'received'
+ * frame already surfaces the original edited path via the
+ * `ns:hmr-pending` payload, so the later frames don't need to.
+ */
+export declare function buildCssApplyingDetail(count: number): string;
+export declare function buildCssAppliedDetail(count: number): string;

package/hmr/client/css-update-overlay.js

@@ -0,0 +1,27 @@
+/**
+ * Detail strings for the HMR-applying overlay's CSS update frames.
+ *
+ * The overlay uses generic per-stage `phase` labels ("Re-importing
+ * entry", "Update applied"). These pure helpers produce the matching
+ * `detail` line so a CSS-only HMR cycle has a sensible progression
+ * from 'received' → 'reimporting' → 'complete' rather than getting
+ * stuck on the 'received' (5%) frame.
+ *
+ * Path-specific detail is intentionally omitted: the broadcast path
+ * for an out-of-scope `@import` edit is rewritten to `/src/app.css`
+ * (so Vite's PostCSS pipeline re-resolves the import chain), which
+ * doesn't match the file the user actually edited. The 'received'
+ * frame already surfaces the original edited path via the
+ * `ns:hmr-pending` payload, so the later frames don't need to.
+ */
+export function buildCssApplyingDetail(count) {
+    if (!Number.isFinite(count) || count <= 1)
+        return 'Applying CSS update';
+    return `Applying ${count} CSS updates`;
+}
+export function buildCssAppliedDetail(count) {
+    if (!Number.isFinite(count) || count <= 1)
+        return 'CSS update applied';
+    return `${count} CSS updates applied`;
+}
+//# sourceMappingURL=css-update-overlay.js.map

package/hmr/client/css-update-overlay.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"css-update-overlay.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/client/css-update-overlay.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,UAAU,sBAAsB,CAAC,KAAa;IACnD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC;QAAE,OAAO,qBAAqB,CAAC;IACxE,OAAO,YAAY,KAAK,cAAc,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAa;IAClD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC;QAAE,OAAO,oBAAoB,CAAC;IACvE,OAAO,GAAG,KAAK,sBAAsB,CAAC;AACvC,CAAC"}

package/hmr/client/framework-client-strategy.d.ts

@@ -0,0 +1,87 @@
+/**
+ * Client-side framework strategy contract (device HMR runtime).
+ *
+ * The server-side seam (`hmr/server/framework-strategy.ts`) has a mirror here:
+ * each framework that needs bespoke on-device HMR behavior implements this and
+ * is selected by `TARGET_FLAVOR` (Vue, Angular, Solid, TypeScript, React all
+ * ship one under `hmr/frameworks/<flavor>/client/`).
+ *
+ * All members are optional except `install`. A missing hook means "use the
+ * shared default".
+ *
+ * Keeping this file free of any framework import is deliberate: it lets the
+ * shared client depend only on the contract, so the concrete per-flavor module
+ * can later be loaded through a single dynamic `import()` (the device-bundle
+ * win) without the shared client statically pulling in every framework client.
+ */
+export interface ClientGraphModule {
+    id: string;
+    deps: string[];
+    hash: string;
+}
+/** Shared state handed to {@link FrameworkClientStrategy.selectMountCandidate}. */
+export interface FrameworkClientMountContext {
+    graph: Map<string, ClientGraphModule>;
+    appMainEntrySpec: string;
+}
+/** Shared helpers handed to {@link FrameworkClientStrategy.refreshAfterBatch}. */
+export interface FrameworkClientBatchContext {
+    setUpdateOverlayStage: (stage: any, opts?: any) => void;
+    /** Wall-clock (ms) when the queue drain started, for "Updated … in Nms". */
+    startedAt: number;
+    /** Live client module graph (id → {id, deps, hash}) for reverse-import propagation. */
+    graph?: Map<string, ClientGraphModule>;
+    /** Swap the live root view to a freshly loaded component (resolves true on success). */
+    performResetRoot?: (component: any) => Promise<boolean> | any;
+    /** Resolves the live dev-overlay API (null/undefined when not installed). */
+    getOverlay?: () => any;
+}
+/** Shared helpers handed to the framework message hooks. */
+export interface FrameworkClientMessageContext {
+    getCore: (name: string) => any;
+    verbose: boolean;
+    performResetRoot: (component: any) => any;
+    getOverlay: () => any;
+}
+export interface FrameworkClientStrategy {
+    readonly flavor: string;
+    /**
+     * When false, the in-place authoritative-frame `navigate()` fast path is
+     * skipped in favor of a full `resetRootView`. Vue requires this. Absent
+     * strategy/flag defaults to `true` (the legacy `flavor !== 'vue'` behavior).
+     */
+    readonly allowNavigateFastPath?: boolean;
+    /**
+     * When true, the shared queue drives the apply-progress overlay's
+     * 'evicting'/'reimporting' frames around its drain (Solid). Frameworks that
+     * drive the overlay from their own update path (Angular, Vue) leave this
+     * unset so the queue stays silent.
+     */
+    readonly drivesQueueOverlayStages?: boolean;
+    /** One-time client install (dev shims / HMR hooks). Runs at strategy resolve. */
+    install(): void;
+    /** Install the hardware-back wrapper once a resetRoot fn + core accessor exist. */
+    installBackWrapper?(performResetRoot: (comp: any) => void, getCore: (name: string) => any): void;
+    /** Pick the initial/rescue mount component id from the module graph (+ registry). */
+    selectMountCandidate?(ctx: FrameworkClientMountContext): string | null;
+    /** Load the component to mount for `candidate` (e.g. Vue SFC assembly). */
+    loadComponentForMount?(candidate: string): Promise<any>;
+    /** Build the NS root view for `newComponent` (framework-specific mount). */
+    createRoot?(newComponent: any, state: any): any;
+    /** Record changed-module metadata from a delta payload (framework bookkeeping). */
+    recordPayloadChanges?(changed: any[], graphVersion: number): void;
+    /**
+     * Post-process one freshly re-imported module during the queue drain
+     * (TypeScript/React: refresh the bundled module registry so Builder /
+     * `loadModule` resolves the NEW code-behind instead of the boot-bundle copy).
+     */
+    afterModuleReimport?(id: string, mod: any): void;
+    /** Framework UI refresh after a re-import batch drains. */
+    refreshAfterBatch?(drained: string[], ctx: FrameworkClientBatchContext): void | Promise<void>;
+    /** Handle a framework hot-update protocol message (resolves true if consumed). */
+    handleHotUpdateMessage?(msg: any, ctx: FrameworkClientMessageContext): Promise<boolean>;
+    /** Handle the framework SFC registry message. */
+    handleSfcRegistry?(msg: any): void;
+    /** Handle the framework SFC registry-update message (drives its own overlay). */
+    handleSfcRegistryUpdate?(msg: any, graphVersion: number, ctx: FrameworkClientMessageContext): Promise<void>;
+}

package/hmr/client/framework-client-strategy.js

@@ -0,0 +1,18 @@
+/**
+ * Client-side framework strategy contract (device HMR runtime).
+ *
+ * The server-side seam (`hmr/server/framework-strategy.ts`) has a mirror here:
+ * each framework that needs bespoke on-device HMR behavior implements this and
+ * is selected by `TARGET_FLAVOR` (Vue, Angular, Solid, TypeScript, React all
+ * ship one under `hmr/frameworks/<flavor>/client/`).
+ *
+ * All members are optional except `install`. A missing hook means "use the
+ * shared default".
+ *
+ * Keeping this file free of any framework import is deliberate: it lets the
+ * shared client depend only on the contract, so the concrete per-flavor module
+ * can later be loaded through a single dynamic `import()` (the device-bundle
+ * win) without the shared client statically pulling in every framework client.
+ */
+export {};
+//# sourceMappingURL=framework-client-strategy.js.map

package/hmr/client/framework-client-strategy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"framework-client-strategy.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/client/framework-client-strategy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG"}

package/hmr/client/hmr-pending-overlay.d.ts

@@ -1,17 +1,3 @@
-/**
- * Client-side helper for `ns:hmr-pending`.
- *
- * Server emits `ns:hmr-pending` immediately when `handleHotUpdate`
- * fires, BEFORE doing any graph upserts / transforms / dependency
- * analysis. The client uses that hint to drive the HMR-applying
- * overlay's 'received' frame so the user sees an instant reaction
- * to their save instead of waiting ~7–200ms for the framework
- * payload (`ns:angular-update` / `ns:css-updates`) to arrive.
- *
- * This module is intentionally a tiny pure helper so the gating
- * (`__NS_HMR_PROGRESS_OVERLAY_ENABLED__`) and detail-string formatting
- * can be unit-tested without booting the full HMR client.
- */
 export type HmrOverlayApiLike = {
     setUpdateStage?: (stage: string, info?: {
         detail?: string;

package/hmr/client/hmr-pending-overlay.js

@@ -12,23 +12,14 @@
  * (`__NS_HMR_PROGRESS_OVERLAY_ENABLED__`) and detail-string formatting
  * can be unit-tested without booting the full HMR client.
  */
+import { resolveOverlayEnabled } from './overlay-driver.js';
 export function buildHmrPendingDetail(filePath) {
     if (!filePath || filePath === '<unknown>')
         return 'Preparing update';
     return `Updating ${filePath}`;
 }
 export function applyHmrPendingFrame(filePath, deps) {
-    const enabled = typeof deps.overlayEnabled === 'boolean'
-        ? deps.overlayEnabled
-        : (() => {
-            try {
-                return typeof __NS_HMR_PROGRESS_OVERLAY_ENABLED__ === 'boolean' ? __NS_HMR_PROGRESS_OVERLAY_ENABLED__ : true;
-            }
-            catch {
-                return true;
-            }
-        })();
-    if (!enabled)
+    if (!resolveOverlayEnabled(deps.overlayEnabled))
         return false;
     let api;
     try {

package/hmr/client/hmr-pending-overlay.js.map

@@ -1 +1 @@
-{"version":3,"file":"hmr-pending-overlay.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/client/hmr-pending-overlay.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAkBH,MAAM,UAAU,qBAAqB,CAAC,QAA4B;IACjE,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,WAAW;QAAE,OAAO,kBAAkB,CAAC;IACrE,OAAO,YAAY,QAAQ,EAAE,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAA4B,EAAE,IAA2B;IAC7F,MAAM,OAAO,GACZ,OAAO,IAAI,CAAC,cAAc,KAAK,SAAS;QACvC,CAAC,CAAC,IAAI,CAAC,cAAc;QACrB,CAAC,CAAC,CAAC,GAAG,EAAE;YACN,IAAI,CAAC;gBACJ,OAAO,OAAO,mCAAmC,KAAK,SAAS,CAAC,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAC,IAAI,CAAC;YAC9G,CAAC;YAAC,MAAM,CAAC;gBACR,OAAO,IAAI,CAAC;YACb,CAAC;QACF,CAAC,CAAC,EAAE,CAAC;IACR,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3B,IAAI,GAAsB,CAAC;IAC3B,IAAI,CAAC;QACJ,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;IACD,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,CAAC,cAAc,KAAK,UAAU;QAAE,OAAO,KAAK,CAAC;IACnE,IAAI,CAAC;QACJ,GAAG,CAAC,cAAc,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC5E,OAAO,IAAI,CAAC;IACb,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC"}
+{"version":3,"file":"hmr-pending-overlay.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/client/hmr-pending-overlay.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAgB5D,MAAM,UAAU,qBAAqB,CAAC,QAA4B;IACjE,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,WAAW;QAAE,OAAO,kBAAkB,CAAC;IACrE,OAAO,YAAY,QAAQ,EAAE,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAA4B,EAAE,IAA2B;IAC7F,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,cAAc,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9D,IAAI,GAAsB,CAAC;IAC3B,IAAI,CAAC;QACJ,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;IACD,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,CAAC,cAAc,KAAK,UAAU;QAAE,OAAO,KAAK,CAAC;IACnE,IAAI,CAAC;QACJ,GAAG,CAAC,cAAc,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC5E,OAAO,IAAI,CAAC;IACb,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC"}

package/hmr/client/hot-context.d.ts

@@ -0,0 +1,67 @@
+/**
+ * JS-owned `import.meta.hot` implementation (Vite-style injected hot contexts).
+ *
+ * `import.meta.hot` is HMR *policy* and lives entirely in this package — the
+ * native runtimes expose no hot API. The dev server injects
+ *
+ *   import.meta.hot = globalThis.__NS_HOT_REGISTRY__?.createHotContext('<canonical-id>')
+ *
+ * at the top of every served app module (see `processCodeForDevice`), and this
+ * module owns every registry the hot API needs. The registry is installed on
+ * `globalThis.__NS_HOT_REGISTRY__` by `installNsHotRegistry()`, which the
+ * `/__ns_dev__/client` bootstrap runs before the entry graph evaluates.
+ *
+ * Process-wide singleton: state is stashed on globalThis so that a second
+ * copy of this module (e.g. loaded under a different URL) shares the same
+ * registries instead of splitting them.
+ *
+ * No circulars — don't import from other hmr/client/* modules here.
+ */
+export interface NsHotEventPayload {
+    [key: string]: unknown;
+}
+type HotCallback = (...args: unknown[]) => unknown;
+export interface NsHotRegistry {
+    createHotContext(ownerId: string): NsHotContext;
+    canonicalHotKey(id: string): string;
+    /** Drain `hot.dispose(cb)` callbacks (all modules, or a key subset). Returns count executed. */
+    runDispose(keys?: readonly string[]): number;
+    /** Drain `hot.prune(cb)` callbacks (all modules, or a key subset). Returns count executed. */
+    runPrune(keys?: readonly string[]): number;
+    /** True when any module (or any module in the key subset) called `hot.decline()`. */
+    hasDeclined(keys?: readonly string[]): boolean;
+    /** Fire `hot.on(event, cb)` listeners. Returns the number of listeners invoked. */
+    dispatchHotEvent(event: string, payload?: unknown): number;
+    listHotEventListeners(): Record<string, number>;
+    /** Wire `hot.send(...)` to the active WebSocket (installed by the full client). */
+    setSendToServer(fn: ((event: string, data?: unknown) => void) | null): void;
+    /** Override the full-reload behavior (`hot.invalidate()`, declined modules). */
+    setFullReloadHandler(fn: ((message?: string) => void) | null): void;
+    requestFullReload(message?: string): void;
+}
+export interface NsHotContext {
+    readonly data: Record<string, unknown>;
+    accept(...args: unknown[]): void;
+    acceptExports(exportNames: string[], cb?: HotCallback): void;
+    dispose(cb: HotCallback): void;
+    prune(cb: HotCallback): void;
+    decline(): void;
+    invalidate(message?: string): void;
+    on(event: string, cb: HotCallback): void;
+    off(event: string, cb: HotCallback): void;
+    send(event: string, data?: unknown): void;
+}
+declare global {
+    var __NS_HOT_REGISTRY__: NsHotRegistry | undefined;
+    var __NS_DEV_ENTRY_URL__: string | undefined;
+}
+/**
+ * Install (or return the already-installed) process-wide hot registry.
+ * Idempotent — safe to call from the bootstrap client, the full client and
+ * tests; the first installation wins.
+ */
+export declare function installNsHotRegistry(): NsHotRegistry;
+/** Read the installed registry (installing lazily so callers never race). */
+export declare function getNsHotRegistry(): NsHotRegistry;
+export declare function createHotContext(ownerId: string): NsHotContext;
+export {};