fix: keep vendor ESM across reloadApplication

Flushing the whole module registry remints certain realms. Evict app chunks only; leave vendor/runtime, node_modules, and synthetic namespaces.

Author: NathanWalker

NativeScript/runtime/ModuleInternalCallbacks.h

@@ -14,6 +14,10 @@ extern std::unordered_map<std::string, v8::Global<v8::Module>> g_moduleRegistry;
 // fails
 void RemoveModuleFromRegistry(const std::string& canonicalPath);
 void ClearModuleRegistry();
+// Isolate reload must evict app ESM (bundle.mjs, lazy chunks) so OTA JS
+// re-evaluates, but keep webpack vendor/runtime (and node_modules) so
+// @angular/core is not minted into a second realm.
+void ClearModuleRegistryForApplicationReload();
 
 // Keep a fallback copy of the last evaluated module so could be served while
 // reloading if needed

NativeScript/runtime/ModuleInternalCallbacks.mm

@@ -316,6 +316,47 @@ void ClearModuleRegistry() {
   g_moduleFallbackByRelative.clear();
 }
 
+static std::string ModuleRegistryBasename(const std::string& key) {
+  auto pos = key.find_last_of("/\\");
+  std::string base = pos == std::string::npos ? key : key.substr(pos + 1);
+  auto query = base.find('?');
+  if (query != std::string::npos) {
+    base = base.substr(0, query);
+  }
+  return base;
+}
+
+static bool ShouldPreserveModuleOnApplicationReload(const std::string& key) {
+  if (key.rfind("node:", 0) == 0 || key.rfind("optional:", 0) == 0 || key.rfind("blob:", 0) == 0) {
+    return true;
+  }
+  if (key.find("/node_modules/") != std::string::npos ||
+      key.find("\\node_modules\\") != std::string::npos) {
+    return true;
+  }
+  const std::string base = ModuleRegistryBasename(key);
+  return base == "vendor.mjs" || base == "vendor.js" || base == "runtime.mjs" ||
+         base == "runtime.js";
+}
+
+static void ClearRegistryMapForApplicationReload(
+    std::unordered_map<std::string, v8::Global<v8::Module>>& registry) {
+  for (auto it = registry.begin(); it != registry.end();) {
+    if (ShouldPreserveModuleOnApplicationReload(it->first)) {
+      ++it;
+      continue;
+    }
+    it->second.Reset();
+    it = registry.erase(it);
+  }
+}
+
+void ClearModuleRegistryForApplicationReload() {
+  ClearRegistryMapForApplicationReload(g_moduleRegistry);
+  ClearRegistryMapForApplicationReload(g_moduleFallbackRegistry);
+  ClearRegistryMapForApplicationReload(g_moduleFallbackByRelative);
+}
+
 void RemoveModuleFromRegistry(const std::string& canonicalPath) {
   // Defensive: never operate on an anomalous/sentinel key.
   // This covers the bare "@" anomaly and the special invalid-at stub module used by the dev HTTP

NativeScript/runtime/Runtime.mm

@@ -459,7 +459,7 @@ void DisposeIsolateWhenPossible(Isolate* isolate) {
   if (this->moduleInternal_) {
     this->moduleInternal_->ClearLoadedModules();
   }
-  ClearModuleRegistry();
+  ClearModuleRegistryForApplicationReload();
   tns::InvokeApplicationReload(isolate);
 }
 

TestRunner/app/tests/ReloadApplicationTests.js

@@ -55,6 +55,24 @@ describe("reloadApplication", function () {
         expect(second.n).toBe(first.n + 1);
     });
 
+    it("preserves webpack vendor.mjs across reload so the Angular realm stays", function (done) {
+        global.__onApplicationReload = function () {};
+
+        import("~/vendor.mjs")
+            .then(function (first) {
+                expect(NativeScriptRuntime.reloadApplication()).toBe(true);
+                return import("~/vendor.mjs").then(function (second) {
+                    expect(second).toBe(first);
+                    expect(second.n).toBe(first.n);
+                    done();
+                });
+            })
+            .catch(function (error) {
+                fail("vendor.mjs should resolve before and after reload: " + error);
+                done();
+            });
+    });
+
     it("keeps JS UIApplicationDelegate IMPs callable from native after reload", function () {
         var AppDelegate = UIResponder.extend({
             get window() {

TestRunner/app/vendor.mjs

@@ -0,0 +1,3 @@
+// Basename vendor.mjs is preserved across reloadApplication so webpack
+// isolate-reload can keep @angular/core in the original realm.
+export const n = (globalThis.__tnsReloadVendorEvals = (globalThis.__tnsReloadVendorEvals || 0) + 1);