@nativescript/windows 0.1.0-alpha.12 → 0.1.0-alpha.14

package/framework/__PROJECT_NAME__/RuntimeHost.cs

@@ -36,6 +36,9 @@ namespace __PROJECT_NAME__
         [DllImport(NativeScriptLibrary, EntryPoint = nameof(runtime_free_js_error))]
         private static extern void runtime_free_js_error(IntPtr ptr);
 
+        [DllImport(NativeScriptLibrary, EntryPoint = nameof(runtime_has_devtools))]
+        private static extern bool runtime_has_devtools();
+
 #if DEBUG
         [DllImport(NativeScriptLibrary, EntryPoint = nameof(runtime_devtools_start))]
         private static extern IntPtr runtime_devtools_start(long runtime, ushort port);
@@ -48,17 +51,12 @@ namespace __PROJECT_NAME__
 
         public string DevtoolsFrontendUrl { get; private set; }
 
-        private bool _devtoolsPumpAvailable = true;
+        private bool _devtoolsAvailable;
 
         public void PumpDevtools()
         {
-            if (!_initialized || !_devtoolsPumpAvailable) return;
+            if (!_initialized || !_devtoolsAvailable) return;
             try { runtime_devtools_pump(_runtime); }
-            catch (System.EntryPointNotFoundException)
-            {
-                // DLL built without devtools feature — stop trying.
-                _devtoolsPumpAvailable = false;
-            }
             catch (Exception ex)
             {
                 System.Diagnostics.Debug.WriteLine($"[NativeScript DevTools] Pump failed: {ex.Message}");
@@ -67,6 +65,7 @@ namespace __PROJECT_NAME__
 
         private void StartDevtoolsSafely()
         {
+            if (!runtime_has_devtools()) return;
             IntPtr urlPtr = IntPtr.Zero;
             try
             {
@@ -77,7 +76,10 @@ namespace __PROJECT_NAME__
                     ? $"devtools://devtools/bundled/inspector.html?ws={wsUrl.Replace("ws://", "")}"
                     : null;
                 if (DevtoolsFrontendUrl != null)
+                {
+                    _devtoolsAvailable = true;
                     System.Diagnostics.Debug.WriteLine($"[NativeScript DevTools] {DevtoolsFrontendUrl}");
+                }
             }
             catch (Exception ex)
             {
@@ -135,16 +137,38 @@ namespace __PROJECT_NAME__
                 throw new InvalidOperationException("Runtime must be initialized before running scripts.");
 
             var entryPath = ResolveEntryScriptPath();
-            var script = File.ReadAllText(Path.GetFullPath(entryPath));
-            try
+            if (entryPath == null)
             {
-                runtime_runscript(_runtime, script, Path.GetFileName(entryPath));
+                System.Diagnostics.Debug.WriteLine("[NativeScript Runtime] No entry script found — bundle missing from app directory.");
+                return;
             }
-            catch (Exception ex)
+
+            var dir = Path.GetDirectoryName(Path.GetFullPath(entryPath));
+            var chunks = new List<string>();
+            foreach (var chunkName in new[] { "runtime.js", "vendor.js" })
             {
-                CrashDiagnostics.WriteExceptionReport("RuntimeHost.RunMainScript", ex, "EntryScript=" + entryPath);
-                System.Diagnostics.Debug.WriteLine($"[NativeScript Runtime] Script execution failed ({entryPath}): {ex}");
-                throw;
+                var chunkPath = Path.Combine(dir, chunkName);
+                if (File.Exists(chunkPath) &&
+                    !string.Equals(chunkPath, Path.GetFullPath(entryPath), StringComparison.OrdinalIgnoreCase))
+                {
+                    chunks.Add(chunkPath);
+                }
+            }
+            chunks.Add(entryPath);
+
+            foreach (var scriptPath in chunks)
+            {
+                var script = File.ReadAllText(Path.GetFullPath(scriptPath));
+                try
+                {
+                    runtime_runscript(_runtime, script, Path.GetFileName(scriptPath));
+                }
+                catch (Exception ex)
+                {
+                    CrashDiagnostics.WriteExceptionReport("RuntimeHost.RunMainScript", ex, "Script=" + scriptPath);
+                    System.Diagnostics.Debug.WriteLine($"[NativeScript Runtime] Script execution failed ({scriptPath}): {ex}");
+                    throw;
+                }
             }
         }
 
@@ -192,7 +216,9 @@ namespace __PROJECT_NAME__
             }
 
             string Fallback() =>
-                appDirCandidates.Select(d => Path.Combine(d, "bundle.js")).FirstOrDefault(File.Exists);
+                appDirCandidates
+                    .SelectMany(d => new[] { Path.Combine(d, "bundle.js"), Path.Combine(d, "bundle.mjs") })
+                    .FirstOrDefault(File.Exists);
 
             if (packageJsonPath == null)
                 return Fallback();
@@ -232,7 +258,7 @@ namespace __PROJECT_NAME__
         {
             if (string.IsNullOrWhiteSpace(scriptPath)) return null;
             var normalized = scriptPath.Replace('/', Path.DirectorySeparatorChar);
-            foreach (var candidate in new[] { normalized, normalized + ".js" })
+            foreach (var candidate in new[] { normalized, normalized + ".js", normalized + ".mjs" })
             {
                 var direct = Path.IsPathRooted(candidate) ? candidate : Path.Combine(baseDir, candidate);
                 if (File.Exists(direct)) return direct;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/windows",
-  "version": "0.1.0-alpha.12",
+  "version": "0.1.0-alpha.14",
   "description": "NativeScript for using Windows v8",
   "repository": {
         "type": "git",