Merge branch 'main' into textInput-15168

protikbiswas100 · web-flow · commit 3f9b801125c8 · 2025-11-05T08:43:34.000+05:30
diff --git a/change/@react-native-windows-cli-b07e800a-e3e5-401f-8510-5cf8c5d4c934.json b/change/@react-native-windows-cli-b07e800a-e3e5-401f-8510-5cf8c5d4c934.json
@@ -0,0 +1,7 @@
+{
+  "type": "none",
+  "comment": "Fix PowerShell Export-ModuleMember error",
+  "packageName": "@react-native-windows/cli",
+  "email": "nitchaudhary@microsoft.com",
+  "dependentChangeType": "none"
+}
diff --git a/change/react-native-windows-aacc7ef4-594c-4ea4-8eae-de46a476dd90.json b/change/react-native-windows-aacc7ef4-594c-4ea4-8eae-de46a476dd90.json
@@ -0,0 +1,7 @@
+{
+  "type": "none",
+  "comment": "Fix metro config property name in cpp-lib template",
+  "packageName": "react-native-windows",
+  "email": "nitchaudhary@microsoft.com",
+  "dependentChangeType": "none"
+}
diff --git a/packages/@react-native-windows/cli/src/powershell/WindowsStoreAppUtils.psm1 b/packages/@react-native-windows/cli/src/powershell/WindowsStoreAppUtils.psm1
diff --git a/packages/@react-native-windows/cli/src/utils/deploy.ts b/packages/@react-native-windows/cli/src/utils/deploy.ts
@@ -181,7 +181,7 @@ function getWindowsStoreAppUtils(options: RunWindowsOptions) {
     '..',
     'src',
     'powershell',
-    'WindowsStoreAppUtils.ps1',
+    'WindowsStoreAppUtils.psm1',
   );
   execSync(
     `${powershell} -NoProfile Unblock-File '${windowsStoreAppUtilsPath}'`,
diff --git a/packages/playground/windows/playground-composition/Playground-Composition.cpp b/packages/playground/windows/playground-composition/Playground-Composition.cpp
diff --git a/packages/playground/windows/playground-composition/Playground-Composition.rc b/packages/playground/windows/playground-composition/Playground-Composition.rc
@@ -103,24 +103,21 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,201,96,50,14,WS_GROUP
 END
 
-IDD_SETTINGSBOX DIALOGEX 0, 0, 192, 178
+IDD_SETTINGSBOX DIALOGEX 0, 0, 192, 138
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Settings"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    CONTROL         "&Lifted Composition",IDC_LIFTEDCOMPOSITION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,8,104,10
-    CONTROL         "&Fast Refresh",IDC_FASTREFRESH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,26,104,10
-    CONTROL         "&Direct Debugger",IDC_DIRECTDEBUGGER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,44,104,10
-    CONTROL         "&Break On Next Line",IDC_BREAKONNEXTLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,63,104,10
-    CONTROL         "&Size Window To React Content",IDC_SIZETOCONTENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,82,104,10
-    LTEXT           "Debugger Port",IDC_DEBUGGERPORTLABEL,8,100,50,10
-    EDITTEXT        IDC_DEBUGGERPORT,59,98,28,14,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "JS Engine",IDC_JSENGINELABEL,8,119,50,10
-    COMBOBOX        IDC_JSENGINE,59,116,104,10,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP
-    COMBOBOX        IDC_THEME,59,136,104,10,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP
-    LTEXT           "Theme",IDC_THEMELABEL,8,138,50,10
-    DEFPUSHBUTTON   "OK",IDOK,75,157,50,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,130,157,50,14
+    CONTROL         "&Fast Refresh",IDC_FASTREFRESH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,8,104,10
+    CONTROL         "&Direct Debugger",IDC_DIRECTDEBUGGER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,26,104,10
+    CONTROL         "&Break On Next Line",IDC_BREAKONNEXTLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,44,104,10
+    CONTROL         "&Size Window To React Content",IDC_SIZETOCONTENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,63,104,10
+    LTEXT           "Debugger Port",IDC_DEBUGGERPORTLABEL,8,80,50,10
+    EDITTEXT        IDC_DEBUGGERPORT,59,78,28,14,ES_AUTOHSCROLL | ES_NUMBER
+    COMBOBOX        IDC_THEME,59,98,104,10,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP
+    LTEXT           "Theme",IDC_THEMELABEL,8,100,50,10
+    DEFPUSHBUTTON   "OK",IDOK,75,118,50,14,WS_GROUP
+    PUSHBUTTON      "Cancel",IDCANCEL,130,118,50,14
 END
 
 IDD_OPENJSBUNDLEBOX DIALOGEX 0, 0, 256, 177
diff --git a/packages/playground/windows/playground-composition/resource.h b/packages/playground/windows/playground-composition/resource.h
@@ -4,7 +4,6 @@
 //
 #define IDC_PLAYGROUND_COMPOSITION 100
 #define IDD_ABOUTBOX 100
-#define IDC_LIFTEDCOMPOSITION 100
 #define IDC_JSBUNDLELIST 100
 #define IDM_ABOUT 100
 #define IDD_SETTINGSBOX 101
@@ -16,13 +15,11 @@
 #define IDM_SETTINGS 103
 #define IDC_BREAKONNEXTLINE 104
 #define IDM_REFRESH 104
-#define IDC_JSENGINE 105
 #define IDM_NEWWINDOW 105
 #define IDC_DEBUGGERPORT 106
 #define IDC_DEBUGGERPORTLABEL 107
 #define IDC_THEME 109
 #define IDC_THEMELABEL 110
-#define IDC_JSENGINELABEL 111
 #define IDC_SIZETOCONTENT 112
 #define IDM_UNLOAD 113
 #define IDM_TOGGLE_LAYOUT_DIRECTION 114
diff --git a/vnext/templates/cpp-lib/example/metro.config.js b/vnext/templates/cpp-lib/example/metro.config.js
@@ -33,7 +33,7 @@ const config = {
   // We need to make sure that only one version is loaded for peerDependencies
   // So we block them at the root, and alias them to the versions in example's node_modules
   resolver: {
-    blocklistRE: exclusionList(
+    blockList: exclusionList(
       modules.map(
         (m) =>
           new RegExp(`^${escape(path.join(root, 'node_modules', m))}\\/.*$`)
diff --git a/yarn.lock b/yarn.lock
@@ -2858,9 +2858,9 @@
     form-data "^4.0.4"
 
 "@types/node@*", "@types/node@^22.0.0", "@types/node@^22.14.0":
-  version "22.18.13"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.18.13.tgz#a037c4f474b860be660e05dbe92a9ef945472e28"
-  integrity sha512-Bo45YKIjnmFtv6I1TuC8AaHBbqXtIo+Om5fE4QiU1Tj8QR/qt+8O3BAtOimG5IFmwaWiPmB3Mv3jtYzBA4Us2A==
+  version "22.19.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.19.0.tgz#849606ef3920850583a4e7ee0930987c35ad80be"
+  integrity sha512-xpr/lmLPQEj+TUnHmR+Ab91/glhJvsqcjB+yY0Ix9GO70H6Lb4FHH5GeqdOE5btAx7eIMwuHkp4H2MSkLcqWbA==
   dependencies:
     undici-types "~6.21.0"
 
