Merge branch 'main' into dependabot/bundler/packages/helloworld/rexml…

…-3.3.6
microsoft · Sep 20, 2024 · cad3588 · cad3588
2 parents a0d230c + a87ddb5
commit cad3588
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 15 deletions.
diff --git a/.ado/publish.yml b/.ado/publish.yml
@@ -1,5 +1,3 @@
-# It is expected that a `latestStableBranch` variable is set in the pipeline's settings:
-
 # This file defines the build steps to publish a release
 name: $(Date:yyyyMMdd).$(Rev:.r)
 
@@ -21,6 +19,9 @@ variables:
   - group: InfoSec-SecurityResults
   - name: tags
     value: production,externalfacing
+  # Remember to update this in previous stable branches when creating a new stable branch
+  - name : latestStableBranch
+    value: '0.75-stable'
 
 resources:
   repositories:
@@ -137,7 +138,6 @@ extends:
              os: linux
            timeoutInMinutes: 90 # how long to run the job before automatically cancelling
            cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
-           condition: eq(variables['Build.SourceBranchName'], 'main')
            templateContext:
              outputs:
                - output: pipelineArtifact

diff --git a/.ado/templates/apple-steps-publish.yml b/.ado/templates/apple-steps-publish.yml
@@ -29,13 +29,11 @@ steps:
     # Note, This won't do the actual `git tag` and `git push` as we're doing a dry run.
     # We do that as a separate step in `.ado/publish.yml`.
     - task: CmdLine@2
-      displayName: Prepare package for release
+      displayName: Prepare React Native macOS release
       inputs:
         script: |
-          node ./scripts/prepare-package-for-release.js -v "$RNM_PACKAGE_VERSION" --dry-run
-      env:
-        # Map the corresponding CircleCI variable since `prepare-package-for-release.js` depends on it.
-        CIRCLE_BRANCH: $(Build.SourceBranchName)
+          set -eox pipefail
+          node scripts/releases/set-rn-version.js -v $RNM_PACKAGE_VERSION --build-type "release"
 
   # Note: This won't actually publish to NPM as we've commented that bit out.
   # We do that as a separate step in `.ado/publish.yml`. 

diff --git a/change/react-native-macos-init-f8ea158b-582a-420c-8fb7-8a1f75eb2cbe.json b/change/react-native-macos-init-f8ea158b-582a-420c-8fb7-8a1f75eb2cbe.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: Properly import `npm-registry-fetch` in `react-native-macos-init`",
+  "packageName": "react-native-macos-init",
+  "email": "sanajmi@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/react-native-macos-init/package.json b/packages/react-native-macos-init/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-macos-init",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "CLI to add react-native-macos to an existing react-native project",
   "main": "index.js",
   "repository": "https://github.com/microsoft/react-native-macos",

diff --git a/packages/react-native-macos-init/src/cli.ts b/packages/react-native-macos-init/src/cli.ts
@@ -13,8 +13,7 @@ import * as validUrl from 'valid-url';
 import * as prompts from 'prompts';
 import * as findUp from 'find-up';
 import * as chalk from 'chalk';
-// @ts-ignore
-import npmFetch from 'npm-registry';
+import * as npmFetch from 'npm-registry-fetch';
 
 const npmConfReg = execSync('npm config get registry').toString().trim();
 const NPM_REGISTRY_URL = validUrl.isUri(npmConfReg)

diff --git a/packages/react-native/React/Views/RCTShadowView.h b/packages/react-native/React/Views/RCTShadowView.h
@@ -17,7 +17,7 @@
 @class RCTRootShadowView;
 @class RCTSparseArray;
 
-typedef void (^RCTApplierBlock)(NSDictionary<NSNumber *, RCTPlatformView *> *viewRegistry); // [macOS]
+typedef void (^RCTApplierBlock)(NSDictionary<NSNumber *, __kindof RCTPlatformView *> *viewRegistry); // [macOS]
 
 /**
  * ShadowView tree mirrors RCT view tree. Every node is highly stateful.

diff --git a/packages/react-native/React/Views/RCTViewManager.h b/packages/react-native/React/Views/RCTViewManager.h
@@ -19,7 +19,7 @@
 @class RCTSparseArray;
 @class RCTUIManager;
 
-typedef void (^RCTViewManagerUIBlock)(RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTPlatformView *> *viewRegistry); // [macOS]
+typedef void (^RCTViewManagerUIBlock)(RCTUIManager *uiManager, NSDictionary<NSNumber *, __kindof RCTPlatformView *> *viewRegistry); // [macOS]
 
 @interface RCTViewManager : NSObject <RCTBridgeModule>
 

diff --git a/packages/react-native/local-cli/generator-macos/templates/macos/Podfile b/packages/react-native/local-cli/generator-macos/templates/macos/Podfile
@@ -14,8 +14,6 @@ target 'HelloWorld-macOS' do
     :path => '../node_modules/react-native-macos',
     :hermes_enabled => false,
     :fabric_enabled => ENV['RCT_NEW_ARCH_ENABLED'] == '1',
-    # Flipper is not compatible w/ macOS
-    :flipper_configuration => FlipperConfiguration.disabled,
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )

diff --git a/packages/react-native/package.json b/packages/react-native/package.json
@@ -44,6 +44,7 @@
     "jest",
     "Libraries",
     "LICENSE",
+    "local-cli",
     "React-Core.podspec",
     "react-native.config.js",
     "React.podspec",