fix(Windows): Support for 0.63 (#216)

microsoft · Sep 16, 2020 · 86a3596 · 86a3596
1 parent 20e2ca0
commit 86a3596
Show file tree

Hide file tree

Showing 24 changed files with 388 additions and 207 deletions.
diff --git a/example/package.json b/example/package.json
@@ -16,7 +16,7 @@
     "react": "~16.8.6 || ~16.9.0 || ~16.11.0 || ~16.13.1",
     "react-native": "^0.60.6 || ^0.61.5 || ^0.62.2 || ^0.63.2 || 1000.0.0",
     "react-native-macos": "^0.60.0 || ^0.61.0 || ^0.62.0",
-    "react-native-windows": "^0.62.0"
+    "react-native-windows": "^0.62.0 || ^0.63.0"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0",

diff --git a/example/windows/ReactTestAppTests/ManifestTests.cpp b/example/windows/ReactTestAppTests/ManifestTests.cpp
@@ -1,3 +1,10 @@
+//
+// Copyright (c) Microsoft Corporation
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
 #include "pch.h"
 
 #include <CppUnitTest.h>

diff --git a/package.json b/package.json
@@ -46,12 +46,16 @@
     "yargs": "^16.0.0"
   },
   "peerDependencies": {
+    "mustache": "^4.0.0",
     "react": "~16.8.6 || ~16.9.0 || ~16.11.0 || ~16.13.1",
     "react-native": "^0.60.6 || ^0.61.5 || ^0.62.2 || ^0.63.2 || 1000.0.0",
     "react-native-macos": "^0.60.0 || ^0.61.0 || ^0.62.0",
-    "react-native-windows": "^0.62.0"
+    "react-native-windows": "^0.62.0 || ^0.63.0"
   },
   "peerDependenciesMeta": {
+    "mustache": {
+      "optional": true
+    },
     "react-native-macos": {
       "optional": true
     },
@@ -62,9 +66,10 @@
   "devDependencies": {
     "@babel/core": "^7.0.0",
     "@types/jest": "^26.0.0",
+    "@types/mustache": "^4.0.0",
     "@types/node": "^12.0.0",
     "eslint": "^7.9.0",
-    "eslint-plugin-jest": "^24.0.1",
+    "eslint-plugin-jest": "^24.0.0",
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-react": "^7.20.6",
     "jest": "^26.4.2",

diff --git a/plopfile.js b/plopfile.js
@@ -1,11 +1,9 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-const chalk = require("chalk");
+//
+// Copyright (c) Microsoft Corporation
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
 
 /**
  * Returns whether the specified package is installed.
@@ -70,6 +68,7 @@ module.exports = (plop) => {
         return [];
       }
 
+      const chalk = require("chalk");
       const path = require("path");
 
       const { name, platforms } = answers;
@@ -347,8 +346,9 @@ module.exports = (plop) => {
           }
         } else {
           console.warn(
-            chalk.yellow("[WARN] ") +
-              "Cannot find module 'react-native-macos'; skipping macOS target"
+            `${chalk.yellow(
+              "[WARN]"
+            )} Cannot find module 'react-native-macos'; skipping macOS target`
           );
         }
       }
@@ -378,8 +378,9 @@ module.exports = (plop) => {
           }
         } else {
           console.warn(
-            chalk.yellow("[WARN] ") +
-              "Cannot find module 'react-native-windows'; skipping Windows target"
+            `${chalk.yellow(
+              "[WARN]"
+            )} Cannot find module 'react-native-windows'; skipping Windows target`
           );
         }
       }

diff --git a/windows/ReactTestApp/App.cpp b/windows/ReactTestApp/App.cpp
@@ -1,3 +1,10 @@
+//
+// Copyright (c) Microsoft Corporation
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
 #include "pch.h"
 
 #include "App.h"

diff --git a/windows/ReactTestApp/App.h b/windows/ReactTestApp/App.h
@@ -1,3 +1,10 @@
+//
+// Copyright (c) Microsoft Corporation
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
 #pragma once
 
 #include "App.xaml.g.h"

diff --git a/windows/ReactTestApp/App.xaml b/windows/ReactTestApp/App.xaml
@@ -3,5 +3,4 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:ReactTestApp">
-
 </Application>
diff --git a/windows/ReactTestApp/MainPage.cpp b/windows/ReactTestApp/MainPage.cpp
@@ -1,3 +1,10 @@
+//
+// Copyright (c) Microsoft Corporation
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
 #include "pch.h"
 
 #include "MainPage.h"

diff --git a/windows/ReactTestApp/MainPage.h b/windows/ReactTestApp/MainPage.h
@@ -1,3 +1,10 @@
+//
+// Copyright (c) Microsoft Corporation
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
 #pragma once
 
 #include <any>

diff --git a/windows/ReactTestApp/MainPage.idl b/windows/ReactTestApp/MainPage.idl
@@ -1,4 +1,3 @@
-
 namespace ReactTestApp
 {
     [default_interface] runtimeclass MainPage : Windows.UI.Xaml.Controls.Page

diff --git a/windows/ReactTestApp/Manifest.cpp b/windows/ReactTestApp/Manifest.cpp
@@ -1,3 +1,10 @@
+//
+// Copyright (c) Microsoft Corporation
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
 #include "pch.h"
 
 #include "Manifest.h"

diff --git a/windows/ReactTestApp/Manifest.h b/windows/ReactTestApp/Manifest.h
@@ -1,3 +1,10 @@
+//
+// Copyright (c) Microsoft Corporation
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
 #pragma once
 
 #include <any>

diff --git a/windows/ReactTestApp/Package.appxmanifest b/windows/ReactTestApp/Package.appxmanifest
@@ -4,10 +4,9 @@
          xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
          xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
          IgnorableNamespaces="mp uap rescap">
-  <Identity
-    Name="40411fc5-8e92-4d46-b68d-b62df44b1366"
-    Publisher="CN=AnastasiaOrishchenko"
-    Version="1.0.0.0" />
+  <Identity Name="40411fc5-8e92-4d46-b68d-b62df44b1366"
+            Publisher="CN=AnastasiaOrishchenko"
+            Version="1.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="40411fc5-8e92-4d46-b68d-b62df44b1366" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
   <Properties>
     <DisplayName>ReactTestApp</DisplayName>
@@ -22,8 +21,11 @@
   </Resources>
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="ReactTestApp.App">
-      <uap:VisualElements DisplayName="ReactTestApp" Description="Project for a single page C++/WinRT Universal Windows Platform (UWP) app with no predefined layout"
-        Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="transparent">
+      <uap:VisualElements DisplayName="ReactTestApp"
+                          Description="React Native test app for C++/WinRT Universal Windows Platform (UWP)"
+                          Square150x150Logo="Assets\Square150x150Logo.png"
+                          Square44x44Logo="Assets\Square44x44Logo.png"
+                          BackgroundColor="transparent">
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
         </uap:DefaultTile>
         <uap:SplashScreen Image="Assets\SplashScreen.png" />

diff --git a/windows/ReactTestApp/ReactInstance.cpp b/windows/ReactTestApp/ReactInstance.cpp
@@ -1,3 +1,10 @@
+//
+// Copyright (c) Microsoft Corporation
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
 #include "pch.h"
 
 #include "ReactInstance.h"
@@ -6,62 +13,67 @@
 
 #include <winrt/Windows.Web.Http.Headers.h>
 
+#include "ReactPackageProvider.h"
+
+using ReactTestApp::ReactInstance;
+using winrt::ReactTestApp::implementation::ReactPackageProvider;
 using winrt::Windows::Foundation::IAsyncOperation;
 using winrt::Windows::Foundation::Uri;
 using winrt::Windows::Web::Http::HttpClient;
 
-namespace ReactTestApp
+ReactInstance::ReactInstance()
 {
-    void ReactInstance::LoadJSBundleFrom(JSBundleSource source)
-    {
-        auto instanceSettings = reactNativeHost_.InstanceSettings();
-        instanceSettings.UseLiveReload(source == JSBundleSource::DevServer);
-        instanceSettings.UseWebDebugger(source == JSBundleSource::DevServer);
-        instanceSettings.UseFastRefresh(source == JSBundleSource::DevServer);
+    reactNativeHost_.PackageProviders().Append(winrt::make<ReactPackageProvider>());
+}
 
-        switch (source) {
-            case JSBundleSource::DevServer:
-                instanceSettings.JavaScriptMainModuleName(L"index");
-                instanceSettings.JavaScriptBundleFile(L"");
-                break;
-            case JSBundleSource::Embedded:
-                winrt::hstring bundleFileName = winrt::to_hstring(GetBundleName());
-                instanceSettings.JavaScriptBundleFile(bundleFileName);
-                break;
-        }
+void ReactInstance::LoadJSBundleFrom(JSBundleSource source)
+{
+    auto instanceSettings = reactNativeHost_.InstanceSettings();
+    instanceSettings.UseLiveReload(source == JSBundleSource::DevServer);
+    instanceSettings.UseWebDebugger(source == JSBundleSource::DevServer);
+    instanceSettings.UseFastRefresh(source == JSBundleSource::DevServer);
 
-        reactNativeHost_.ReloadInstance();
+    switch (source) {
+        case JSBundleSource::DevServer:
+            instanceSettings.JavaScriptMainModuleName(L"index");
+            instanceSettings.JavaScriptBundleFile(L"");
+            break;
+        case JSBundleSource::Embedded:
+            winrt::hstring bundleFileName = winrt::to_hstring(GetBundleName());
+            instanceSettings.JavaScriptBundleFile(bundleFileName);
+            break;
     }
 
-    std::string GetBundleName()
-    {
-        std::vector entryFileNames = {"index.windows",
-                                      "main.windows",
-                                      "index.native",
-                                      "main.native",
-                                      "index"
-                                      "main"};
-
-        for (std::string &&n : entryFileNames) {
-            std::string path = "Bundle\\" + n + ".bundle";
-            if (std::filesystem::exists(path)) {
-                return n;
-            }
-        }
+    reactNativeHost_.ReloadInstance();
+}
 
-        return "";
-    }
+std::string ReactTestApp::GetBundleName()
+{
+    auto entryFileNames = {"index.windows",
+                           "main.windows",
+                           "index.native",
+                           "main.native",
+                           "index"
+                           "main"};
 
-    IAsyncOperation<bool> IsDevServerRunning()
-    {
-        Uri uri(L"http://localhost:8081/status");
-        HttpClient httpClient;
-        try {
-            auto r = co_await httpClient.GetAsync(uri);
-            co_return r.IsSuccessStatusCode();
-        } catch (winrt::hresult_error &) {
-            co_return false;
+    for (std::string main : entryFileNames) {
+        std::string path = "Bundle\\" + main + ".bundle";
+        if (std::filesystem::exists(path)) {
+            return main;
         }
     }
 
-}  // namespace ReactTestApp
+    return "";
+}
+
+IAsyncOperation<bool> ReactTestApp::IsDevServerRunning()
+{
+    Uri uri(L"http://localhost:8081/status");
+    HttpClient httpClient;
+    try {
+        auto r = co_await httpClient.GetAsync(uri);
+        co_return r.IsSuccessStatusCode();
+    } catch (winrt::hresult_error &) {
+        co_return false;
+    }
+}
diff --git a/windows/ReactTestApp/ReactInstance.h b/windows/ReactTestApp/ReactInstance.h
@@ -1,3 +1,10 @@
+//
+// Copyright (c) Microsoft Corporation
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
 #pragma once
 
 #include <string>
@@ -15,6 +22,8 @@ namespace ReactTestApp
     class ReactInstance
     {
     public:
+        ReactInstance();
+
         auto &ReactHost()
         {
             return reactNativeHost_;

diff --git a/windows/ReactTestApp/ReactPackageProvider.cpp b/windows/ReactTestApp/ReactPackageProvider.cpp
@@ -0,0 +1,20 @@
+//
+// Copyright (c) Microsoft Corporation
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
+#include "pch.h"
+
+#include "ReactPackageProvider.h"
+
+#include <NativeModules.h>
+
+using winrt::Microsoft::ReactNative::IReactPackageBuilder;
+using winrt::ReactTestApp::implementation::ReactPackageProvider;
+
+void ReactPackageProvider::CreatePackage(IReactPackageBuilder const &packageBuilder) noexcept
+{
+    AddAttributedModules(packageBuilder);
+}
diff --git a/windows/ReactTestApp/ReactPackageProvider.h b/windows/ReactTestApp/ReactPackageProvider.h
@@ -0,0 +1,19 @@
+//
+// Copyright (c) Microsoft Corporation
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
+#pragma once
+
+#include <winrt/Microsoft.ReactNative.h>
+
+namespace winrt::ReactTestApp::implementation
+{
+    struct ReactPackageProvider
+        : implements<ReactPackageProvider, Microsoft::ReactNative::IReactPackageProvider> {
+    public:
+        void CreatePackage(Microsoft::ReactNative::IReactPackageBuilder const &) noexcept;
+    };
+}  // namespace winrt::ReactTestApp::implementation