@nativescript/windows-hermes 1.0.0-beta.13 → 1.0.0-beta.17

package/framework/__PROJECT_NAME__/App.xaml.cs

@@ -98,6 +98,9 @@ namespace __PROJECT_NAME__
             void ShowMainWindow()
             {
                 StartPump();
+#if DEBUG
+                _runtimeHost.WatchLiveSync(DispatcherQueue.GetForCurrentThread());
+#endif
 
                 try
                 {

package/framework/__PROJECT_NAME__/RuntimeHost.cs

@@ -123,8 +123,60 @@ namespace __PROJECT_NAME__
         private const string InspectorMarker = "ns-inspector";
         private const string DebugBreakMarker = "ns-debugbreak";
         private const string DebuggerStartedMarker = "ns-debugger-started";
+        // The CLI writes LiveSyncMarker after syncing files into app\ (webpack HMR), but only
+        // while LiveSyncReadyMarker says this host is watching for it.
+        private const string LiveSyncMarker = "ns-livesync";
+        private const string LiveSyncReadyMarker = "ns-livesync-ready";
 
         private bool _waitForDebugger;
+        private FileSystemWatcher _liveSyncWatcher;
+
+        /// Applies CLI file syncs while the app runs, by calling global.__onLiveSync() on the UI
+        /// thread, as the Android and iOS runtimes do after a LiveSync.
+        public void WatchLiveSync(Microsoft.UI.Dispatching.DispatcherQueue dispatcherQueue)
+        {
+            if (!_initialized || _liveSyncWatcher != null || dispatcherQueue == null) return;
+            try
+            {
+                DeleteMarker(LiveSyncMarker);
+                var watcher = new FileSystemWatcher(LocalFolderPath, LiveSyncMarker)
+                {
+                    NotifyFilter = NotifyFilters.FileName | NotifyFilters.LastWrite,
+                };
+                FileSystemEventHandler onMarker = (_, _) => dispatcherQueue.TryEnqueue(ApplyLiveSync);
+                watcher.Created += onMarker;
+                watcher.Changed += onMarker;
+                watcher.EnableRaisingEvents = true;
+                _liveSyncWatcher = watcher;
+                WriteMarker(LiveSyncReadyMarker, "");
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[NativeScript LiveSync] Watch failed: {ex.Message}");
+            }
+        }
+
+        private void ApplyLiveSync()
+        {
+            // One write raises several events; the first one consumes the marker.
+            if (!_initialized || !ConsumeMarker(LiveSyncMarker)) return;
+            try
+            {
+                runtime_runscript(_runtime, "typeof __onLiveSync === 'function' && __onLiveSync();", "ns-livesync.js");
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[NativeScript LiveSync] Apply failed: {ex.Message}");
+            }
+        }
+
+        private void StopWatchingLiveSync()
+        {
+            if (_liveSyncWatcher == null) return;
+            _liveSyncWatcher.Dispose();
+            _liveSyncWatcher = null;
+            DeleteMarker(LiveSyncReadyMarker);
+        }
 
         public string DevtoolsFrontendUrl { get; private set; }
 
@@ -235,6 +287,7 @@ namespace __PROJECT_NAME__
             }
             catch { }
             DeleteMarker(DebuggerStartedMarker);
+            DeleteMarker(LiveSyncReadyMarker);
             var debugBreak = ConsumeMarker(DebugBreakMarker);
             if (ConsumeMarker(InspectorMarker) || debugBreak)
             {
@@ -476,6 +529,9 @@ namespace __PROJECT_NAME__
         public void Dispose()
         {
             if (!_initialized) return;
+#if DEBUG
+            StopWatchingLiveSync();
+#endif
             runtime_deinit(_runtime);
             _runtime = 0;
             _initialized = false;

package/framework/__PROJECT_NAME__/__PROJECT_NAME__.csproj

@@ -154,12 +154,31 @@
   <!--
     Publishes DotNetBridge.dll before the app build.
     Inputs/Outputs make this incremental: MSBuild skips the Exec when DotNetBridge.dll
-    is already newer than both source files.
+    is already newer than the project and every bridge source file.
   -->
+  <ItemGroup>
+    <_DotNetBridgeSources Include="$(NSWindowsRoot)\dotnet-bridge\*.cs" />
+  </ItemGroup>
+
+  <!--
+    @nativescript/windows-hermes: Release builds compile the app's JavaScript to Hermes bytecode
+    (tools\hermes-precompile.ps1), so a launch doesn't compile the bundle again. Only that
+    framework ships tools\hermesc.exe.
+  -->
+  <Target Name="PrecompileHermesBytecode"
+          BeforeTargets="AssignTargetPaths"
+          Condition="'$(Configuration)' == 'Release' and Exists('$(NSWindowsRoot)\tools\hermesc.exe') and Exists('app') and !Exists('app.nsbundle')">
+    <Exec Command="powershell.exe -NoProfile -ExecutionPolicy Bypass -File &quot;$(NSWindowsRoot)\tools\hermes-precompile.ps1&quot; -AppDir &quot;$(MSBuildProjectDirectory)\app&quot; -Hermesc &quot;$(NSWindowsRoot)\tools\hermesc.exe&quot; -Optimize" />
+    <ItemGroup>
+      <Content Include="app\**\*.hbc" Exclude="@(Content)">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
+    </ItemGroup>
+  </Target>
   <Target Name="PublishDotNetBridge"
           BeforeTargets="Build"
           Inputs="$(NSWindowsRoot)\dotnet-bridge\DotNetBridge.csproj;
-                  $(NSWindowsRoot)\dotnet-bridge\Bridge.cs"
+                  @(_DotNetBridgeSources)"
           Outputs="$(NSWindowsRoot)\dotnet-bridge\publish\DotNetBridge.dll"
           Condition="Exists('$(NSWindowsRoot)\dotnet-bridge\DotNetBridge.csproj')">
     <Message Text="[NativeScript] Publishing DotNetBridge..." Importance="low" />

package/framework/tools/hermes-precompile.ps1

@@ -0,0 +1,62 @@
+# Compiles the app's JavaScript to Hermes bytecode beside each file, for Release builds of
+# @nativescript/windows-hermes apps: <file>.hbc for scripts the host runs as is (runtime.js,
+# vendor.js, bundle.js, the package.json "main"), <file>.cjs.hbc for modules, compiled inside the
+# runtime's CommonJS wrapper. Up-to-date files are skipped; the runtime ignores bytecode older
+# than its source. Runs on Windows PowerShell 5.1.
+param(
+    [Parameter(Mandatory = $true)][string]$AppDir,
+    [Parameter(Mandatory = $true)][string]$Hermesc,
+    [switch]$Optimize
+)
+
+$ErrorActionPreference = 'Stop'
+if (-not (Test-Path $AppDir)) { return }
+$AppDir = (Resolve-Path $AppDir).Path
+
+$entries = @('runtime.js', 'vendor.js', 'bundle.js')
+$packageJson = Join-Path $AppDir 'package.json'
+if (Test-Path $packageJson) {
+    try {
+        $package = Get-Content -Raw $packageJson | ConvertFrom-Json
+        if ($package.main) { $entries += [IO.Path]::GetFileName([string]$package.main) }
+    } catch { }
+}
+
+$wrapperHead = '(function (module, exports, require, __filename, __dirname) {'
+$utf8 = New-Object System.Text.UTF8Encoding($false)
+$scratch = Join-Path ([IO.Path]::GetTempPath()) ("ns-hermes-" + [Guid]::NewGuid().ToString('N'))
+$compiled = 0
+
+try {
+    Get-ChildItem -Path $AppDir -Recurse -File -Filter *.js |
+        Where-Object { $_.FullName -notmatch '\\node_modules\\' } |
+        ForEach-Object {
+            $isEntry = ($_.DirectoryName -eq $AppDir) -and ($entries -contains $_.Name)
+            $out = $_.FullName + $(if ($isEntry) { '.hbc' } else { '.cjs.hbc' })
+            if ((Test-Path $out) -and ((Get-Item $out).LastWriteTimeUtc -ge $_.LastWriteTimeUtc)) { return }
+
+            $source = $_.FullName
+            if (-not $isEntry) {
+                # Same file name in a scratch folder, so the bytecode's debug info names the module.
+                $dir = Join-Path $scratch ([Guid]::NewGuid().ToString('N'))
+                $null = New-Item -ItemType Directory -Force -Path $dir
+                $source = Join-Path $dir $_.Name
+                $text = [IO.File]::ReadAllText($_.FullName)
+                [IO.File]::WriteAllText($source, $wrapperHead + $text + "`n})", $utf8)
+            }
+
+            $hermescArgs = @('-emit-binary', '-w', '-out', $out, $source)
+            if ($Optimize) { $hermescArgs = @('-O') + $hermescArgs }
+            & $Hermesc @hermescArgs
+            if ($LASTEXITCODE -ne 0) {
+                Remove-Item -Force -ErrorAction SilentlyContinue $out
+                Write-Warning "hermesc could not compile $($_.FullName); it will be compiled at run time"
+            } else {
+                $compiled++
+            }
+        }
+} finally {
+    if (Test-Path $scratch) { Remove-Item -Recurse -Force $scratch }
+}
+
+Write-Host "[NativeScript] Hermes bytecode: $compiled file(s) compiled"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/windows-hermes",
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.17",
   "description": "NativeScript Windows runtime (Hermes engine) with a WinUI 3 app template",
   "keywords": [
     "NativeScript",