@nativescript/vite 8.0.0-alpha.4 → 8.0.0-alpha.40

package/hmr/frameworks/angular/server/strategy.js

@@ -1,9 +1,15 @@
 import * as path from 'path';
 import { readFileSync, readdirSync, statSync } from 'fs';
-import * as PAT from '../../../server/constants.js';
 import { linkAngularPartialsIfNeeded } from './linker.js';
+import { prepareAngularEntryForDevice } from '../../../server/rewrite-imports.js';
 import { getProjectAppPath, getProjectAppVirtualPath } from '../../../../helpers/utils.js';
 import { isRuntimeGraphExcludedPath, matchesRuntimeGraphModuleId, shouldIncludeRuntimeGraphFile, shouldSkipRuntimeGraphDirectoryName } from '../../../server/runtime-graph-filter.js';
+import { stripJsComments } from '../build/util.js';
+import { runHotUpdatePrologue } from '../../../server/websocket-hot-update.js';
+import { collectAngularEvictionUrls, collectAngularHotUpdateRoots, collectAngularTransformCacheInvalidationUrls, shouldInvalidateAngularTransitiveImporters, shouldSuppressDefaultViteHotUpdate } from './websocket-angular-hot-update.js';
+import { collectTransitiveImportersForInvalidation } from '../../../server/transform-cache-invalidation.js';
+import { getServerOrigin } from '../../../server/server-origin.js';
+import { isSameAngularModuleRel } from './angular-root-component.js';
 // Angular server strategy for NativeScript HMR.
 //
 // Responsibilities:
@@ -63,19 +69,453 @@ export const angularServerStrategy = {
         // Treat only application TS/JS as candidates for ordering/graph purposes
         return matchesRuntimeGraphModuleId(id, ANGULAR_APP_VIRTUAL_WITH_SLASH, ANGULAR_RUNTIME_FILE_PATTERN);
     },
-    preClean(code) {
-        return code;
+    // Defer the prologue's common-block delta broadcast: the Angular HMR client
+    // re-fetches the changed module, so the broadcast must come AFTER this
+    // strategy's hot-update tail purges its transform caches — otherwise the
+    // client's re-import races the server's invalidation and serves stale code.
+    deferDeltaBroadcast: true,
+    // Angular HTML templates skip the prologue's default module-graph delta
+    // upsert: the tail below re-queries the graph and drives Analog's in-place
+    // swap (or the NS reboot path) itself.
+    skipDefaultGraphUpdate(file) {
+        return /\.(html|htm)$/i.test(file);
     },
-    rewriteFrameworkImports(code) {
-        // Angular runtime imports are handled via the vendor bridge; no extra rewrite.
-        return code;
+    // With Analog `liveReload` active, component `styleUrls` edits are applied
+    // in place via `angular:component-update` → `ɵɵreplaceMetadata` →
+    // `@nativescript/angular`'s renderer re-applying the component's scoped
+    // styles. The prologue must NOT also broadcast `ns:css-updates` for them:
+    // the device's `?direct=1` fetch would create the css `?direct` module that
+    // makes Analog stop emitting `angular:component-update` on later edits (its
+    // css branch then takes the NativeScript-inert Vite css-update path). The
+    // presence of `analogjs-live-reload-plugin` is the clean signal that this
+    // in-place pipeline is wired up (it only registers when `liveReload: true`).
+    ownsComponentStyleHmr(server) {
+        return (server.config?.plugins ?? []).some((plugin) => plugin?.name === 'analogjs-live-reload-plugin');
     },
-    postClean(code) {
-        return code;
+    // Full Angular hot-update handler: shared prologue, then the Angular tail
+    // (TS/HTML + root-component detection, hot-update-root + transitive-importer
+    // invalidation, shared transform-cache purge, and the `ns:angular-update`
+    // reboot broadcast). Reached directly from the WebSocket plugin's
+    // handleHotUpdate hook.
+    async handleHotUpdate(ctx, deps) {
+        const state = await runHotUpdatePrologue(ctx, deps);
+        if (!state)
+            return;
+        const { root, updateRel, metrics: updateMetrics, emitSummary: emitHmrUpdateSummary } = state;
+        const { strategy, verbose, wss, moduleGraph, sharedTransformRequest, getBootstrapEntryRelPath, isSocketClientOpen, getHmrSocketRole, rememberAngularReloadSuppression, getRootComponentIdentity } = deps;
+        const { file, server } = ctx;
+        // For Angular, react to component TS or external template HTML changes under /src
+        const isHtml = file.endsWith('.html');
+        const isTs = file.endsWith('.ts');
+        // Web-style template HMR opt-in: when the user enables Angular's
+        // `liveReload` (Analog's flag, mirrored from `--hmr` in
+        // `configuration/angular.ts`), `.html` edits are owned by
+        // Analog's `handleHotUpdate` which sends
+        // `server.ws.send('angular:component-update', { id, timestamp })`.
+        // The runtime listener registered in each compiled component
+        // `.mjs` then dynamic-imports `/@ng/component?c=<id>&t=<ts>` and
+        // calls `ɵɵreplaceMetadata` on the live class — swapping the
+        // template definition AND walking live `LView`s to recreate
+        // matching views in-place. NO Angular reboot, NO route navigation.
+        //
+        // The NS reboot path (`ns:angular-update` → `__reboot_ng_modules__`)
+        // must be SKIPPED for HTML edits when this is on; otherwise both
+        // fire, the reboot wins, and we lose the in-place swap. The
+        // reboot path stays intact for `.ts` edits — those genuinely
+        // change module-level code (services, route configs, NgModule
+        // providers) that Angular's `ɵɵreplaceMetadata` can't reach.
+        //
+        // We detect "live reload mode is on" by checking that the
+        // `analogjs-live-reload-plugin` registered itself with the
+        // dev server. That plugin only exists when `liveReload: true`
+        // was passed to `angular()` in `configuration/angular.ts`,
+        // which gates on `hmrActive`. So this check is a clean
+        // boolean: true iff the in-place pipeline is wired up.
+        const angularLiveReloadActive = (server.config?.plugins ?? []).some((plugin) => plugin?.name === 'analogjs-live-reload-plugin');
+        // Root-component edits must NOT take Analog's in-place
+        // `ɵɵreplaceMetadata` path: the root component hosts the
+        // navigation `Frame` via `<page-router-outlet>`, and replacing
+        // its metadata recreates the root view without re-navigating,
+        // leaving a permanent white screen. We route the edit to the
+        // reboot broadcast below instead (which re-bootstraps and
+        // replays route state). The companion guard in the websocket
+        // bridge drops the in-place `angular:component-update` event for
+        // the root so the two paths don't race. `.ts` root edits already
+        // fall through to the reboot path; this only re-routes `.html`.
+        const rootComponent = getRootComponentIdentity();
+        // `isSameAngularModuleRel` normalizes separators + leading slash internally,
+        // so the raw project-relative path can be passed straight through.
+        const isRootComponentEdit = !!rootComponent && isSameAngularModuleRel(rootComponent.moduleRel, path.relative(root, file));
+        if (isHtml && angularLiveReloadActive && !isRootComponentEdit) {
+            updateMetrics.tAfterFramework = Date.now();
+            if (verbose) {
+                const rel = '/' + path.relative(root, file).split(path.sep).join('/');
+                console.info(`[ns-hmr][server] HTML edit handed off to Analog component-update path; skipping ns:angular-update broadcast (file=${rel})`);
+            }
+            // Re-query the moduleGraph for this file AFTER awaiting
+            // `graphInitialPopulationPromise` (done at the top of
+            // `handleHotUpdate`) and return the freshly-discovered
+            // modules so they propagate to Analog's `handleHotUpdate`
+            // in the same chain.
+            //
+            // Vite v8 builds the initial `mixedHmrContext.modules`
+            // from `mixedModuleGraph.getModulesByFile(file)` BEFORE
+            // any plugin runs. On the very first save after a cold
+            // dev-server start, the moduleGraph for the changed
+            // `.html` template has not yet been populated — that
+            // population happens lazily via `populateInitialGraph`
+            // → `transformRequest` → Analog's `transform` hook →
+            // `addWatchFile(htmlFile)` → `vite:import-analysis`
+            // consumes `_addedImports` and finally calls
+            // `moduleGraph.updateModuleInfo` which registers the
+            // `html → component.ts` importer relationship in
+            // `fileToModulesMap`. All of that work races against the
+            // file-watcher event for the `.html` edit, and the
+            // watcher event almost always wins — so `ctx.modules`
+            // arrives as `[]` even though the component is fully
+            // compiled and ready to receive an in-place template
+            // swap.
+            //
+            // Returning `undefined` here would propagate that empty
+            // `ctx.modules` to the next plugin (Analog's handler),
+            // which iterates with `ctx.modules.forEach(mod => mod
+            // .importers.forEach(imp => …))` — a no-op when
+            // `ctx.modules` is empty. Analog never broadcasts
+            // `angular:component-update`, never marks anything
+            // self-accepting, and Vite falls back to a `full-reload`
+            // payload that the device runtime cannot honor (NS apps
+            // don't have a browser-style page reload). The
+            // user-visible symptom is exactly the "first save logs
+            // `(client) page reload` and the simulator gets stuck
+            // on the HMR-applying overlay forever" failure we hit
+            // before this re-query was added.
+            //
+            // Since we already `await graphInitialPopulationPromise`
+            // at the top of this function, by this point the
+            // moduleGraph IS populated (every component file in
+            // `src/` has been transformed and `addWatchFile` has
+            // been consumed by `import-analysis`). A fresh
+            // `getModulesByFile(file)` call now returns the template
+            // module with the importing component's module in
+            // `.importers`. Returning that array overwrites
+            // `mixedHmrContext.modules` so Analog's handler — which
+            // runs RIGHT AFTER us in the same chain — sees the
+            // populated importer graph, identifies the component
+            // class via `classNames.get(imp.id)`, and broadcasts
+            // `angular:component-update` for `ɵɵreplaceMetadata`.
+            //
+            // We still skip the reboot path (`ns:angular-update`)
+            // for HTML edits — control never reaches the
+            // reboot-broadcast block below because of the `return`
+            // here. The default-Vite-full-reload suppression is now
+            // Analog's responsibility: it marks the changed module
+            // self-accepting, which tells Vite the update is
+            // handled and prevents the fallback.
+            let resolvedModules = ctx.modules;
+            try {
+                const fresh = server.moduleGraph?.getModulesByFile?.(file);
+                if (fresh && fresh.size > 0) {
+                    resolvedModules = [...fresh];
+                    if (verbose) {
+                        console.info(`[ns-hmr][server] re-queried modules after graph population: count=${resolvedModules.length} (was ${ctx.modules?.length ?? 0})`);
+                    }
+                }
+            }
+            catch (refetchErr) {
+                if (verbose) {
+                    console.warn('[ns-hmr][server] failed to re-query moduleGraph for html update', refetchErr);
+                }
+            }
+            emitHmrUpdateSummary();
+            return resolvedModules;
+        }
+        const angularHotUpdateRoots = collectAngularHotUpdateRoots({
+            file,
+            modules: ctx.modules,
+            getModuleById: (id) => server.moduleGraph.getModuleById(id),
+            getModulesByFile: (targetFile) => server.moduleGraph.getModulesByFile?.(targetFile),
+        });
+        if (verbose) {
+            console.info(`[ns-hmr][server] hot-update file=${file} isHtml=${isHtml} isTs=${isTs} ctxModules=${Array.from(ctx.modules || []).length} hotUpdateRoots=${angularHotUpdateRoots.length} (${angularHotUpdateRoots
+                .map((m) => m?.id ?? '(none)')
+                .slice(0, 8)
+                .join(', ')}${angularHotUpdateRoots.length > 8 ? ', …' : ''})`);
+        }
+        if (!(isHtml || isTs))
+            return;
+        updateMetrics.invalidated += angularHotUpdateRoots.length;
+        if (angularHotUpdateRoots.length) {
+            for (const mod of angularHotUpdateRoots) {
+                try {
+                    server.moduleGraph.invalidateModule(mod);
+                }
+                catch (invalidationError) {
+                    if (verbose) {
+                        console.warn('[hmr-ws][angular] hot-update root invalidation failed', mod?.id, invalidationError);
+                    }
+                }
+            }
+            if (verbose) {
+                console.log('[hmr-ws][angular] invalidated hot-update root modules:', angularHotUpdateRoots.length);
+            }
+        }
+        const angularTransitiveInvalidationRoots = (angularHotUpdateRoots.length ? angularHotUpdateRoots : ctx.modules);
+        // Read the source for `.ts/.tsx/.js/.jsx` edits so
+        // `shouldInvalidateAngularTransitiveImporters` can
+        // distinguish leaf modules (constants/utils) from real
+        // Angular files. If `ctx.read()` throws (file deleted, race
+        // against the watcher), `angularChangedSource` stays
+        // undefined and we fall back to the conservative "always
+        // invalidate transitively" behavior.
+        let angularChangedSource;
+        if (isTs) {
+            try {
+                angularChangedSource = await ctx.read();
+            }
+            catch {
+                angularChangedSource = undefined;
+            }
+        }
+        const angularNeedsTransitive = shouldInvalidateAngularTransitiveImporters({
+            flavor: strategy.flavor,
+            file,
+            source: angularChangedSource,
+        });
+        // Surface the narrowing decision on every `.ts` Angular hot
+        // update (HTML routes always invalidate transitively and
+        // aren't subject to narrowing, so we leave them as
+        // `undefined` — the field is omitted from the summary line).
+        // The boolean is the inverse of `angularNeedsTransitive`
+        // because "needs transitive" is the broad (un-narrowed)
+        // behavior.
+        if (isTs) {
+            updateMetrics.narrowed = !angularNeedsTransitive;
+        }
+        // Stable URL + Explicit Invalidation:
+        //
+        // Compute the transitive importer closure ONCE here and reuse
+        // it for (a) `server.moduleGraph.invalidateModule` (so Vite's
+        // transform pipeline re-runs on next request), (b) the shared
+        // transform-request cache, and (c) the runtime eviction set
+        // we broadcast in `ns:angular-update`. Consolidating this
+        // removes a redundant graph walk and guarantees the three
+        // consumers see the exact same set of importers (otherwise a
+        // late module-graph mutation between calls could leave an
+        // asymmetric narrowed/broad mix).
+        //
+        // We separate Vite-transform narrowing from runtime eviction:
+        // `angularNeedsTransitive` answers the question "does the
+        // changed file's symbol shape change such that importers
+        // must be re-transformed by Vite?". The runtime, however,
+        // has a stricter requirement: ESM live bindings only refresh
+        // if the importing module re-evaluates inside V8. A
+        // constants file with no Angular decorator does NOT need a
+        // Vite re-transform of its importers (their compiled JS is
+        // identical), but its importers still hold stale bindings to
+        // the OLD constants Module record. After eviction + re-import
+        // of `main.ts`, V8 sees the cached importers, returns them
+        // unchanged, and they continue to read the OLD values. The
+        // user-visible symptom: HMR completes successfully, logs are
+        // clean, but the simulator does not reflect the change.
+        //
+        // The fix: ALWAYS compute the transitive importer closure
+        // for runtime eviction. Only skip Vite's
+        // `moduleGraph.invalidate` + transform-cache purge when
+        // `angularNeedsTransitive` is false — those are the genuine
+        // narrowing wins (saves re-transform work on the server).
+        // The eviction set always includes importers so V8 re-fetches
+        // and re-binds them.
+        if (verbose) {
+            console.info(`[ns-hmr][server] angularNeedsTransitive=${angularNeedsTransitive} (file=${path.basename(file)})`);
+        }
+        let transitiveImporters = [];
+        try {
+            transitiveImporters = collectTransitiveImportersForInvalidation({
+                modules: angularTransitiveInvalidationRoots,
+                isExcluded: (id) => id.includes('/node_modules/'),
+                maxDepth: 16,
+            });
+            if (verbose) {
+                console.info(`[ns-hmr][server] transitiveImporters count=${transitiveImporters.length} firstN=`, transitiveImporters.slice(0, 16).map((m) => m?.id ?? '(none)'));
+            }
+            if (angularNeedsTransitive) {
+                updateMetrics.invalidated += transitiveImporters.length;
+                for (const mod of transitiveImporters) {
+                    try {
+                        server.moduleGraph.invalidateModule(mod);
+                    }
+                    catch (invalidationError) {
+                        if (verbose) {
+                            console.warn('[hmr-ws][angular] transitive importer invalidation failed', mod?.id, invalidationError);
+                        }
+                    }
+                }
+                if (verbose && transitiveImporters.length) {
+                    console.log('[hmr-ws][angular] invalidated transitive importers:', transitiveImporters.length);
+                }
+            }
+            else if (isTs && typeof angularChangedSource === 'string') {
+                // Surfacing this log unconditionally lets the user
+                // immediately confirm whether narrowing fired for a
+                // given `.ts` edit (the summary line below still
+                // emits `narrowed=yes`/`no`, but having both makes
+                // the decision easier to spot in noisy logs and lets
+                // the user diff scenarios without flipping
+                // `NS_HMR_VERBOSE=true`).
+                //
+                // Narrowing means "skip Vite re-transform" (the
+                // importers still get evicted from the V8 module
+                // registry so live bindings refresh). The importer
+                // count is appended so the distinction is visible.
+                if (verbose && transitiveImporters.length) {
+                    console.log(`[hmr-ws][angular] narrowed transitive invalidation (no @Component/@Directive/@Pipe/@Injectable/@NgModule): ${updateRel} — Vite transform skipped, runtime eviction includes ${transitiveImporters.length} importer(s)`);
+                }
+            }
+        }
+        catch (error) {
+            if (verbose)
+                console.warn('[hmr-ws][angular] transitive importer collection failed', error);
+        }
+        try {
+            // Purge shared transform cache for the changed file +
+            // hot-update roots unconditionally (their transform
+            // output IS different now). Transitive importers are
+            // only purged when narrowing decides their output may
+            // have changed; otherwise their cached transforms are
+            // still valid (compiled JS is identical even though the
+            // runtime must re-evaluate them to refresh ESM bindings).
+            const transformCacheInvalidationUrls = new Set(collectAngularTransformCacheInvalidationUrls({
+                file,
+                isTs,
+                hotUpdateRoots: angularHotUpdateRoots,
+                transitiveImporters: angularNeedsTransitive ? transitiveImporters : [],
+                projectRoot: server.config.root || process.cwd(),
+            }));
+            if (transformCacheInvalidationUrls.size) {
+                sharedTransformRequest.invalidateMany(transformCacheInvalidationUrls);
+                if (verbose) {
+                    console.log('[hmr-ws][angular] purged shared transform cache entries:', transformCacheInvalidationUrls.size);
+                }
+            }
+        }
+        catch (error) {
+            if (verbose)
+                console.warn('[hmr-ws][angular] shared transform cache purge failed', error);
+        }
+        updateMetrics.tAfterFramework = Date.now();
+        try {
+            const root = server.config.root || process.cwd();
+            const rel = '/' + path.posix.normalize(path.relative(root, file)).split(path.sep).join('/');
+            rememberAngularReloadSuppression(root, file);
+            const origin = getServerOrigin(server);
+            const bootstrapEntryRel = getBootstrapEntryRelPath();
+            // Stable URL + Explicit Invalidation:
+            //
+            // `evictPaths` is the canonical list of `/ns/m/<rel>` URLs
+            // the runtime must drop from `g_moduleRegistry` before
+            // re-importing `importerEntry`. Older versions of the
+            // server signaled invalidation by bumping a global
+            // `graphVersion` counter and embedding it in every URL —
+            // but V8 keys the module registry by full URL, so a v1 →
+            // v2 bump effectively flushed the entire dependency
+            // graph from the cache and forced the runtime to
+            // re-fetch + re-eval every transitively-imported module
+            // on each save (~3s HMR cycles, dominated by Vite's
+            // single-threaded transform pipeline). The new model:
+            //
+            //   1. URLs are stable: `/ns/m/<rel>` everywhere, no `vN`.
+            //   2. The server walks the inverse-dependency closure and
+            //      sends only the modules that actually need to be
+            //      re-evaluated (typically O(1) for component edits,
+            //      or the changed file + entry for narrowed edits).
+            //   3. The client calls `__nsInvalidateModules(evictPaths)`
+            //      and re-imports `importerEntry`, which causes V8 to
+            //      refetch ONLY those modules. Everything else stays
+            //      hot in the registry.
+            //
+            // Invariants enforced by `collectAngularEvictionUrls`:
+            //   - Always includes the changed file (so the new source
+            //     is fetched).
+            //   - Always includes `importerEntry` (so re-import
+            //     re-evaluates).
+            //   - Excludes node_modules (vendor packages are stable).
+            //   - Excludes virtual / runtime-graph-excluded ids.
+            //   - Origin-prefixed: `http://host:port/ns/m/<rel>`.
+            let evictPaths = [];
+            try {
+                evictPaths = collectAngularEvictionUrls({
+                    file,
+                    hotUpdateRoots: angularHotUpdateRoots,
+                    transitiveImporters,
+                    projectRoot: root,
+                    origin,
+                    bootstrapEntry: bootstrapEntryRel,
+                });
+            }
+            catch (error) {
+                if (verbose) {
+                    console.warn('[ns-hmr][server] eviction set computation failed', error);
+                }
+            }
+            if (verbose) {
+                try {
+                    const tsRel = rel.replace(/\.(html|htm)$/i, '.ts');
+                    const jsRel = rel.replace(/\.(html|htm)$/i, '.js');
+                    const containsRelatedTs = evictPaths.some((u) => u.endsWith(tsRel));
+                    const containsRelatedJs = evictPaths.some((u) => u.endsWith(jsRel));
+                    const sample = evictPaths.slice(0, 32);
+                    console.info(`[ns-hmr][server] evict-set count=${evictPaths.length} importerEntry=${bootstrapEntryRel ?? '(none)'} containsRelatedTs=${containsRelatedTs} containsRelatedJs=${containsRelatedJs} firstN=`, sample);
+                    if (evictPaths.length > sample.length) {
+                        console.info(`[ns-hmr][server] evict-set hidden=${evictPaths.length - sample.length} (showed first ${sample.length})`);
+                    }
+                }
+                catch { }
+            }
+            const msg = {
+                type: 'ns:angular-update',
+                origin,
+                path: rel,
+                version: moduleGraph.version,
+                timestamp: Date.now(),
+                evictPaths,
+                importerEntry: bootstrapEntryRel,
+            };
+            if (verbose) {
+                console.log('[hmr-ws][angular] broadcasting update', Array.from(wss.clients || []).map((client) => ({
+                    role: getHmrSocketRole(client),
+                    readyState: client.readyState,
+                    openState: client.OPEN,
+                })));
+            }
+            wss.clients.forEach((client) => {
+                if (isSocketClientOpen(client)) {
+                    client.send(JSON.stringify(msg));
+                    updateMetrics.recipients += 1;
+                }
+            });
+        }
+        catch (error) {
+            console.warn('[hmr-ws][angular] update failed:', error);
+        }
+        emitHmrUpdateSummary();
+        if (shouldSuppressDefaultViteHotUpdate({ flavor: strategy.flavor, file })) {
+            return [];
+        }
+        return;
+    },
+    // preClean/rewriteFrameworkImports/postClean/ensureVersionedImports default to
+    // identity: Angular runtime imports go through the vendor bridge and there are
+    // no Angular-specific HTTP endpoints to version.
+    //
+    // Override the `/ns/m` served-module rewrite: Angular entries need the
+    // register-only entry-preparation pass (`prepareAngularEntryForDevice`)
+    // instead of the shared `rewriteImports` default the other flavors use.
+    rewriteServedModule(code, ctx) {
+        return prepareAngularEntryForDevice(code, ctx.moduleId, ctx.sfcFileMap, ctx.depFileMap, ctx.projectRoot, ctx.verbose, undefined, ctx.serverOrigin, true);
     },
-    ensureVersionedImports(code, _origin, _version) {
-        // No Angular-specific HTTP endpoints yet; leave imports as-is.
-        return code;
+    // ── Angular template/style asset URLs are volatile ───────────────────
+    volatilePatterns() {
+        return ['/@ns/asm/'];
     },
     async processFile(ctx) {
         // Ensure any Angular code the HMR server assembles for HTTP consumption is fully linked.
@@ -131,7 +571,15 @@ export const angularServerStrategy = {
                 }
                 else if (st.isFile() && shouldIncludeRuntimeGraphFile(full, /\.ts$/i)) {
                     try {
-                        const code = readFileSync(full, 'utf8');
+                        const rawCode = readFileSync(full, 'utf8');
+                        // Blank out `//` and `/* */` comments before regex
+                        // scanning so a commented-out `templateUrl` /
+                        // `styleUrls` line doesn't enroll the watcher (and
+                        // therefore the import graph) for a non-existent
+                        // asset. See note in
+                        // `extractComponentAssetPaths` for the failure
+                        // mode this avoids in current Rolldown-Vite.
+                        const code = stripJsComments(rawCode);
                         if (/\@Component\s*\(/.test(code) && /templateUrl\s*:\s*["']\.\//.test(code)) {
                             const m = code.match(/templateUrl\s*:\s*["']\.\/(.*?\.html)["']/);
                             if (m && m[1]) {

package/hmr/frameworks/angular/server/strategy.js.map

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

package/hmr/{server → frameworks/angular/server}/websocket-angular-entry.js

@@ -1,7 +1,7 @@
 import { parse as babelParse } from '@babel/parser';
 import * as t from '@babel/types';
-import { genCode } from '../helpers/babel.js';
-const MODULE_IMPORT_ANALYSIS_PLUGINS = ['typescript', 'jsx', 'importMeta', 'topLevelAwait', 'classProperties', 'classPrivateProperties', 'classPrivateMethods', 'decorators-legacy'];
+import { genCode } from '../../../helpers/babel.js';
+import { MODULE_IMPORT_ANALYSIS_PLUGINS } from '../../../server/websocket-served-module-helpers.js';
 function shouldGuardAngularEntryStatement(node) {
     if (t.isImportDeclaration(node) || t.isExportDeclaration(node) || t.isFunctionDeclaration(node) || t.isClassDeclaration(node) || t.isVariableDeclaration(node)) {
         return false;

package/hmr/frameworks/angular/server/websocket-angular-entry.js.map

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

package/hmr/{server → frameworks/angular/server}/websocket-angular-hot-update.d.ts

@@ -5,12 +5,12 @@ export type HotUpdateGraphModuleLike = {
     }>;
     importers?: Iterable<HotUpdateGraphModuleLike>;
 };
-export declare function canonicalizeTransformRequestCacheKey(url: string, projectRoot: string): string;
 export declare function collectGraphUpdateModulesForHotUpdate(options: {
     file: string;
     flavor: string;
     modules?: Iterable<HotUpdateGraphModuleLike>;
     getModuleById: (id: string) => HotUpdateGraphModuleLike | undefined;
+    verbose?: boolean;
 }): HotUpdateGraphModuleLike[];
 export declare function collectAngularHotUpdateRoots(options: {
     file: string;
@@ -18,19 +18,11 @@ export declare function collectAngularHotUpdateRoots(options: {
     getModuleById: (id: string) => HotUpdateGraphModuleLike | undefined;
     getModulesByFile?: (file: string) => Iterable<HotUpdateGraphModuleLike> | undefined | null;
 }): HotUpdateGraphModuleLike[];
-export type TransitiveImporterModuleLike = {
-    id?: string | null;
-    file?: string | null;
-    importers?: Iterable<TransitiveImporterModuleLike> | null;
-};
-export declare function collectAngularTransitiveImportersForInvalidation(options: {
-    modules: Iterable<TransitiveImporterModuleLike> | undefined | null;
-    isExcluded?: (id: string) => boolean;
-    maxDepth?: number;
-}): TransitiveImporterModuleLike[];
+export declare function angularSourceHasSemanticDecorator(source: string): boolean;
 export declare function shouldInvalidateAngularTransitiveImporters(options: {
     flavor: string;
     file: string;
+    source?: string | null;
 }): boolean;
 export declare function collectAngularTransformCacheInvalidationUrls(options: {
     file: string;
@@ -43,6 +35,20 @@ export declare function collectAngularTransformCacheInvalidationUrls(options: {
     }>;
     projectRoot?: string;
 }): string[];
+export declare function collectAngularEvictionUrls(options: {
+    file: string;
+    hotUpdateRoots?: Iterable<{
+        id?: string | null;
+        file?: string | null;
+    }>;
+    transitiveImporters?: Iterable<{
+        id?: string | null;
+        file?: string | null;
+    }>;
+    projectRoot: string;
+    origin: string;
+    bootstrapEntry?: string | null;
+}): string[];
 export declare function shouldSuppressDefaultViteHotUpdate(options: {
     flavor: string;
     file: string;