fix(windows): declare support for 0.82 (#2739)

tido64 · web-flow · commit b1758a69f99a · 2026-04-15T20:19:34.000+02:00
diff --git a/package.json b/package.json
@@ -109,7 +109,6 @@
       "lockfile": {
         "noDuplicates": {
           "packages": [
-            "#react-native",
             "@babel/core"
           ]
         }
diff --git a/packages/app/example/package.json b/packages/app/example/package.json
@@ -23,8 +23,7 @@
     "react": "19.1.4",
     "react-native": "^0.81.6",
     "react-native-macos": "^0.81.0",
-    "react-native-safe-area-context": "^5.6.0",
-    "react-native-windows": "^0.81.0"
+    "react-native-safe-area-context": "^5.6.0"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
@@ -93,7 +92,6 @@
         "core-android",
         "core-ios",
         "core-macos",
-        "core-windows",
         "babel-preset-react-native",
         "safe-area"
       ]
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -119,7 +119,6 @@
     "react": "19.1.4",
     "react-native": "^0.81.6",
     "react-native-macos": "^0.81.0",
-    "react-native-windows": "^0.81.0",
     "suggestion-bot": "^4.0.0"
   },
   "peerDependencies": {
@@ -128,7 +127,7 @@
     "react": "18.2 - 19.2",
     "react-native": "0.76 - 0.85 || >=0.85.0-0 <0.86.0",
     "react-native-macos": "^0.0.0-0 || 0.76 - 0.81",
-    "react-native-windows": "^0.0.0-0 || 0.76 - 0.81"
+    "react-native-windows": "^0.0.0-0 || 0.76 - 0.82"
   },
   "peerDependenciesMeta": {
     "@callstack/react-native-visionos": {
diff --git a/packages/app/test/helpers.test.mts b/packages/app/test/helpers.test.mts
@@ -1,5 +1,4 @@
-import type Mustache from "mustache";
-import { equal, fail, notEqual } from "node:assert/strict";
+import { equal, fail, ok } from "node:assert/strict";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { describe, it } from "node:test";
@@ -57,27 +56,24 @@ describe("getPackageVersion()", () => {
 
 describe("requireTransitive()", () => {
   it("imports transitive dependencies", () => {
-    const mustache = requireTransitive<typeof Mustache>([
-      "react-native-windows",
-      "@react-native-windows/cli",
-      "mustache",
-    ]);
-    notEqual(mustache, null);
-    equal(typeof mustache.parse, "function");
+    const chain = [
+      "react-native",
+      "@react-native/community-cli-plugin",
+      "metro",
+    ];
+
+    ok(requireTransitive(chain));
   });
 
   it("imports transitive dependencies given a start path", () => {
-    const rnwDir = findNearest("node_modules/react-native-windows");
-    if (!rnwDir) {
-      fail("Failed to resolve 'react-native-windows'");
+    const rnDir = findNearest("node_modules/react-native");
+    if (!rnDir) {
+      fail("Failed to resolve 'react-native'");
     }
 
-    const mustache = requireTransitive<typeof Mustache>(
-      ["@react-native-windows/cli", "mustache"],
-      fs.realpathSync(rnwDir)
-    );
-    notEqual(mustache, null);
-    equal(typeof mustache.parse, "function");
+    const chain = ["@react-native/community-cli-plugin", "metro"];
+
+    ok(requireTransitive(chain, fs.realpathSync(rnDir)));
   });
 });
 
diff --git a/packages/app/windows/Shared/ReactInstance.cpp b/packages/app/windows/Shared/ReactInstance.cpp
@@ -17,6 +17,8 @@
 #endif  // __has_include("AppRegistry.h")
 #include "AutolinkedNativeModules.g.h"
 
+#define USE_WEB_DEBUGGER RNW_VERSION_LESS_THAN(0, 82, 0)
+
 using facebook::jsi::Runtime;
 using ReactTestApp::ReactInstance;
 
@@ -40,7 +42,9 @@ namespace
     winrt::hstring const kBundlerPort = L"bundlerPort";
     winrt::hstring const kUseDirectDebugger = L"useDirectDebugger";
     winrt::hstring const kUseFastRefresh = L"useFastRefresh";
+#if USE_WEB_DEBUGGER
     winrt::hstring const kUseWebDebugger = L"useWebDebugger";
+#endif  // USE_WEB_DEBUGGER
 
     std::optional<winrt::hstring> GetBundleName(std::optional<winrt::hstring> const &bundleRoot)
     {
@@ -171,7 +175,9 @@ void ReactInstance::Reload()
 {
     auto instanceSettings = reactNativeHost_.InstanceSettings();
 
+#if USE_WEB_DEBUGGER
     instanceSettings.UseWebDebugger(UseWebDebugger());
+#endif  // USE_WEB_DEBUGGER
     instanceSettings.UseDirectDebugger(UseDirectDebugger());
 
     auto useFastRefresh = UseFastRefresh();
@@ -249,10 +255,12 @@ bool ReactInstance::UseDirectDebugger() const
 
 void ReactInstance::UseDirectDebugger(bool useDirectDebugger)
 {
+#if USE_WEB_DEBUGGER
     if (useDirectDebugger) {
         // Remote debugging is incompatible with direct debugging
         StoreLocalSetting(kUseWebDebugger, false);
     }
+#endif  // USE_WEB_DEBUGGER
     StoreLocalSetting(kUseDirectDebugger, useDirectDebugger);
     Reload();
 }
@@ -270,17 +278,23 @@ void ReactInstance::UseFastRefresh(bool useFastRefresh)
 
 bool ReactInstance::UseWebDebugger() const
 {
+#if USE_WEB_DEBUGGER
     return IsWebDebuggerAvailable() && RetrieveLocalSetting(kUseWebDebugger, false);
+#else
+    return false;
+#endif  // USE_WEB_DEBUGGER
 }
 
 void ReactInstance::UseWebDebugger(bool useWebDebugger)
 {
+#if USE_WEB_DEBUGGER
     if (useWebDebugger) {
         // Remote debugging is incompatible with direct debugging
         StoreLocalSetting(kUseDirectDebugger, false);
     }
     StoreLocalSetting(kUseWebDebugger, useWebDebugger);
     Reload();
+#endif  // USE_WEB_DEBUGGER
 }
 
 winrt::IAsyncOperation<bool> ReactTestApp::IsDevServerRunning()
diff --git a/packages/app/windows/Win32/pch.h b/packages/app/windows/Win32/pch.h
@@ -18,6 +18,7 @@
 // clang-format on
 
 #include <CppWinRTIncludes.h>
+#include <VersionMacros.h>
 
 #include <winrt/Microsoft.ReactNative.Composition.h>
 #include <winrt/Microsoft.ReactNative.h>
diff --git a/packages/example-windows/package.json b/packages/example-windows/package.json
@@ -16,19 +16,19 @@
   },
   "dependencies": {
     "@react-native-webapis/web-storage": "^0.4.5",
-    "react": "19.1.4",
-    "react-native": "^0.81.6",
+    "react": "19.1.1",
+    "react-native": "^0.82.0",
     "react-native-safe-area-context": "^5.6.0",
-    "react-native-windows": "^0.81.0"
+    "react-native-windows": "^0.82.0"
   },
   "devDependencies": {
     "@babel/core": "catalog:",
     "@babel/preset-env": "catalog:",
     "@react-native-community/cli": "^20.0.0",
     "@react-native-community/cli-platform-android": "^20.0.0",
     "@react-native-community/cli-platform-ios": "^20.0.0",
-    "@react-native/babel-preset": "^0.81.0",
-    "@react-native/metro-config": "^0.81.0",
+    "@react-native/babel-preset": "^0.82.0",
+    "@react-native/metro-config": "^0.82.0",
     "@rnx-kit/cli": "catalog:",
     "@rnx-kit/metro-config": "catalog:",
     "@rnx-kit/polyfills": "catalog:",
@@ -67,7 +67,7 @@
     ],
     "alignDeps": {
       "requirements": [
-        "react-native@0.81"
+        "react-native@0.82"
       ],
       "capabilities": [
         "core-windows",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,6 @@`
`109`	`109`	`"lockfile": {`
`110`	`110`	`"noDuplicates": {`
`111`	`111`	`"packages": [`
`112`		`- "#react-native",`
`113`	`112`	`"@babel/core"`
`114`	`113`	`]`
`115`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`#endif // __has_include("AppRegistry.h")`
`18`	`18`	`#include "AutolinkedNativeModules.g.h"`
`19`	`19`
	`20`	`+#define USE_WEB_DEBUGGER RNW_VERSION_LESS_THAN(0, 82, 0)`
	`21`	`+`
`20`	`22`	`using facebook::jsi::Runtime;`
`21`	`23`	`using ReactTestApp::ReactInstance;`
`22`	`24`
`@@ -40,7 +42,9 @@ namespace`
`40`	`42`	`winrt::hstring const kBundlerPort = L"bundlerPort";`
`41`	`43`	`winrt::hstring const kUseDirectDebugger = L"useDirectDebugger";`
`42`	`44`	`winrt::hstring const kUseFastRefresh = L"useFastRefresh";`
	`45`	`+#if USE_WEB_DEBUGGER`
`43`	`46`	`winrt::hstring const kUseWebDebugger = L"useWebDebugger";`
	`47`	`+#endif // USE_WEB_DEBUGGER`
`44`	`48`
`45`	`49`	`std::optional<winrt::hstring> GetBundleName(std::optional<winrt::hstring> const &bundleRoot)`
`46`	`50`	`{`
`@@ -171,7 +175,9 @@ void ReactInstance::Reload()`
`171`	`175`	`{`
`172`	`176`	`auto instanceSettings = reactNativeHost_.InstanceSettings();`
`173`	`177`
	`178`	`+#if USE_WEB_DEBUGGER`
`174`	`179`	`instanceSettings.UseWebDebugger(UseWebDebugger());`
	`180`	`+#endif // USE_WEB_DEBUGGER`
`175`	`181`	`instanceSettings.UseDirectDebugger(UseDirectDebugger());`
`176`	`182`
`177`	`183`	`auto useFastRefresh = UseFastRefresh();`
`@@ -249,10 +255,12 @@ bool ReactInstance::UseDirectDebugger() const`
`249`	`255`
`250`	`256`	`void ReactInstance::UseDirectDebugger(bool useDirectDebugger)`
`251`	`257`	`{`
	`258`	`+#if USE_WEB_DEBUGGER`
`252`	`259`	`if (useDirectDebugger) {`
`253`	`260`	`// Remote debugging is incompatible with direct debugging`
`254`	`261`	`StoreLocalSetting(kUseWebDebugger, false);`
`255`	`262`	`}`
	`263`	`+#endif // USE_WEB_DEBUGGER`
`256`	`264`	`StoreLocalSetting(kUseDirectDebugger, useDirectDebugger);`
`257`	`265`	`Reload();`
`258`	`266`	`}`
`@@ -270,17 +278,23 @@ void ReactInstance::UseFastRefresh(bool useFastRefresh)`
`270`	`278`
`271`	`279`	`bool ReactInstance::UseWebDebugger() const`
`272`	`280`	`{`
	`281`	`+#if USE_WEB_DEBUGGER`
`273`	`282`	`return IsWebDebuggerAvailable() && RetrieveLocalSetting(kUseWebDebugger, false);`
	`283`	`+#else`
	`284`	`+ return false;`
	`285`	`+#endif // USE_WEB_DEBUGGER`
`274`	`286`	`}`
`275`	`287`
`276`	`288`	`void ReactInstance::UseWebDebugger(bool useWebDebugger)`
`277`	`289`	`{`
	`290`	`+#if USE_WEB_DEBUGGER`
`278`	`291`	`if (useWebDebugger) {`
`279`	`292`	`// Remote debugging is incompatible with direct debugging`
`280`	`293`	`StoreLocalSetting(kUseDirectDebugger, false);`
`281`	`294`	`}`
`282`	`295`	`StoreLocalSetting(kUseWebDebugger, useWebDebugger);`
`283`	`296`	`Reload();`
	`297`	`+#endif // USE_WEB_DEBUGGER`
`284`	`298`	`}`
`285`	`299`
`286`	`300`	`winrt::IAsyncOperation<bool> ReactTestApp::IsDevServerRunning()`