feat(HMR): Enables hot module reloading for ReactWindows

rozele · rozele · commit 783116e7aec6 · 2016-05-16T15:13:34.000-04:00
Minor issue with Chakra console polyfill (was missing 'info') and a minor change to the URI path sent to the HMRClient. Fixes microsoft#357 - Add Hot Module Replacement Option
diff --git a/ReactWindows/ReactNative/Chakra/Executor/ChakraJavaScriptExecutor.cs b/ReactWindows/ReactNative/Chakra/Executor/ChakraJavaScriptExecutor.cs
@@ -13,6 +13,7 @@ public class ChakraJavaScriptExecutor : IJavaScriptExecutor
     {
         private readonly JavaScriptRuntime _runtime;
 
+        private JavaScriptNativeFunction _consoleInfo;
         private JavaScriptNativeFunction _consoleLog;
         private JavaScriptNativeFunction _consoleWarn;
         private JavaScriptNativeFunction _consoleError;
@@ -158,10 +159,12 @@ private void InitializeChakra()
             var consoleObject = JavaScriptValue.CreateObject();
             EnsureGlobalObject().SetProperty(consolePropertyId, consoleObject, true);
 
+            _consoleInfo = ConsoleInfo;
             _consoleLog = ConsoleLog;
             _consoleWarn = ConsoleWarn;
             _consoleError = ConsoleError;
 
+            DefineHostCallback(consoleObject, "info", _consoleInfo);
             DefineHostCallback(consoleObject, "log", _consoleLog);
             DefineHostCallback(consoleObject, "warn", _consoleWarn);
             DefineHostCallback(consoleObject, "error", _consoleError);
@@ -217,6 +220,16 @@ private static void DefineHostCallback(
             obj.SetProperty(propertyId, function, true);
         }
 
+        private JavaScriptValue ConsoleInfo(
+            JavaScriptValue callee,
+            bool isConstructCall,
+            JavaScriptValue[] arguments,
+            ushort argumentCount,
+            IntPtr callbackData)
+        {
+            return ConsoleCallback("Info", callee, isConstructCall, arguments, argumentCount, callbackData);
+        }
+
         private JavaScriptValue ConsoleLog(
             JavaScriptValue callee,
             bool isConstructCall,
@@ -257,7 +270,7 @@ private JavaScriptValue ConsoleCallback(
         {
             try
             {
-                Debug.Write("Chakra " + kind + ">");
+                Debug.Write($"[JS {kind}]");
 
                 // First argument is this-context, ignore...
                 for (var i = 1; i < argumentCount; ++i)
diff --git a/ReactWindows/ReactNative/DevSupport/DevSupportManager.cs b/ReactWindows/ReactNative/DevSupport/DevSupportManager.cs
@@ -199,6 +199,15 @@ public void ShowDevOptionsDialog()
                             _isUsingJsProxy = !_isUsingJsProxy;
                             HandleReloadJavaScript();
                         }),
+                    new DevOptionHandler(
+                        _devSettings.IsHotModuleReplacementEnabled
+                            ? "Disable Hot Reloading"
+                            : "Enable Hot Reloading",
+                        () =>
+                        {
+                            _devSettings.IsHotModuleReplacementEnabled = !_devSettings.IsHotModuleReplacementEnabled;
+                            HandleReloadJavaScript();
+                        }),
                     new DevOptionHandler(
                         _devSettings.IsReloadOnJavaScriptChangeEnabled
                             ? "Disable Live Reload"
@@ -324,7 +333,7 @@ private void ResetCurrentContext(ReactContext context)
                 try
                 {
                     var uri = new Uri(SourceUrl);
-                    var path = uri.PathAndQuery.Substring(1); // strip initial slash in path
+                    var path = uri.LocalPath.Substring(1); // strip initial slash in path
                     var host = uri.Host;
                     var port = uri.Port;
                     context.GetJavaScriptModule<HMRClient>().enable("windows", path, host, port);
diff --git a/ReactWindows/js/Utilities/HMRLoadingView.windows.js b/ReactWindows/js/Utilities/HMRLoadingView.windows.js
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule HMRLoadingView
+ * @flow
+ */
+
+'use strict';
+
+class HMRLoadingView {
+  static showMessage(message: string) {
+    //noop
+  }
+
+  static hide() {
+    // noop
+  }
+}
+
+module.exports = HMRLoadingView;
