[pull] main from microsoft:main

.ado/apple-pr.yml

@@ -26,12 +26,12 @@ stages:
     dependsOn: []
     jobs:
       - template: /.ado/jobs/test-javascript.yml@self
-
       - template: /.ado/jobs/npm-publish-dry-run.yml@self
 
-  - stage: Integration
-    dependsOn: []
-    jobs:
-      - template: /.ado/jobs/test-react-native-macos-init.yml@self
-
-      # - template: /.ado/jobs/react-native-test-app-integration.yml@self
+  # https://github.com/microsoft/react-native-macos/issues/2344
+  # The Verdaccio server consistently hangs on creation, which is required for the integration tests
+  # - stage: Integration
+  #   dependsOn: []
+  #   jobs:
+  #     - template: /.ado/jobs/test-react-native-macos-init.yml@self
+  #     - template: /.ado/jobs/react-native-test-app-integration.yml@self

.ado/jobs/build-test-rntester.yml

@@ -2,163 +2,83 @@ parameters:
   - name: appleBuildMatrix
     type: object
     default:
-      - name: macos_oldarch_jsc 
+      - name: macos_debug_oldarch_jsc
         friendly_name: 'macOS, Old Arch, JSC'
         sdk: macosx
+        configuration: Debug
         scheme: RNTester-macOS
         packager_platform: 'macos'
         new_arch_enabled: '0'
         use_hermes: '0'
-      - name: macos_newarch_jsc
+      - name: macos_debug_newarch_jsc
         friendly_name: 'macOS, New Arch, JSC'
         sdk: macosx
+        configuration: Debug
         scheme: RNTester-macOS
         packager_platform: 'macos'
         new_arch_enabled: '1'
         use_hermes: '0'
-      # - name: macos_oldarch_hermes
-      #   friendly_name: 'macOS, Old Arch, Hermes'
-      #   sdk: macosx
-      #   scheme: RNTester-macOS
-      #   packager_platform: 'macos'
-      #   new_arch_enabled: '1'
-      #   use_hermes: '1'
-      # - name: macos_newarch_hermes
-      #   friendly_name: 'macOS, New Arch, Hermes'
-      #   sdk: macosx
-      #   scheme: RNTester-macOS
-      #   packager_platform: 'macos'
-      #   new_arch_enabled: '1'
-      #   use_hermes: '1'
-      - name: ios_oldarch_jsc 
+      - name: ios_debug_oldarch_jsc
         friendly_name: 'iOS, Old Arch, JSC'
         sdk: iphonesimulator
+        configuration: Debug
         scheme: RNTester
         packager_platform: 'ios'
         new_arch_enabled: '0'
         use_hermes: '0'
-      - name: ios_newarch_jsc
+      - name: ios_debug_newarch_jsc
         friendly_name: 'iOS, New Arch, JSC'
         sdk: iphonesimulator
+        configuration: Debug
         scheme: RNTester
         packager_platform: 'ios'
         new_arch_enabled: '1'
         use_hermes: '0'
-      # - name: ios_oldarch_hermes
-      #   friendly_name: 'iOS, Old Arch, Hermes'
-      #   sdk: iphonesimulator
-      #   scheme: RNTester
-      #   packager_platform: 'ios'
-      #   new_arch_enabled: '1'
-      #   use_hermes: '1'
-      # - name: ios_newarch_hermes
-      #   friendly_name: 'iOS, New Arch, Hermes'
-      #   sdk: iphonesimulator
-      #   scheme: RNTester
-      #   packager_platform: 'ios'
-      #   new_arch_enabled: '1'
-      #   use_hermes: '1'
-      - name: xros_oldarch_jsc 
+      - name: xros_debug_oldarch_jsc
         friendly_name: 'xrOS, Old Arch, JSC'
         sdk: xrsimulator
+        configuration: Debug
         scheme: RNTester-visionOS
         packager_platform: 'ios'
         new_arch_enabled: '0'
         use_hermes: '0'
-      - name: xros_newarch_jsc
+      - name: xros_debug_newarch_jsc
         friendly_name: 'xrOS, New Arch, JSC'
         sdk: xrsimulator
+        configuration: Debug
         scheme: RNTester-visionOS
         packager_platform: 'ios'
         new_arch_enabled: '1'
         use_hermes: '0'
-      # - name: xros_oldarch_hermes
-      #   friendly_name: 'xrOS, Old Arch, Hermes'
-      #   sdk: xrsimulator
-      #   scheme: RNTester-visionOS
-      #   packager_platform: 'ios'
-      #   new_arch_enabled: '1'
-      #   use_hermes: '1'
-      # - name: xros_newarch_hermes
-      #   friendly_name: 'xrOS, New Arch, Hermes'
-      #   sdk: xrsimulator
-      #   scheme: RNTester-visionOS
-      #   packager_platform: 'ios'
-      #   new_arch_enabled: '1'
-      #   use_hermes: '1'
 
 jobs:
   - ${{ each slice in parameters.appleBuildMatrix }}:
-      - job: ${{ slice.name }}
-        displayName: ${{ slice.friendly_name }}
-        pool:
-          vmImage: $(vmImageApple)
-        timeoutInMinutes: 90
-        cancelTimeoutInMinutes: 5
-        steps:
+    - job: ${{ slice.name }}
+      displayName: ${{ slice.friendly_name }}
+      pool:
+        vmImage: $(vmImageApple)
+      timeoutInMinutes: 90
+      cancelTimeoutInMinutes: 5
+      steps:
         - template: /.ado/templates/apple-tools-setup.yml@self
 
-        - task: CmdLine@2
+        - script: |
+            yarn install
           displayName: yarn install
-          inputs:
-            script: |
-              set -eox pipefail
-              yarn install --immutable
-
-        - task: CmdLine@2
-          displayName: pod install
-          inputs:
-            script: |
-              set -eox pipefail
-              cd packages/rn-tester
-              bundle install
-              bundle exec pod install --verbose
-          env:
-            RCT_NEW_ARCH_ENABLED: ${{ slice.new_arch_enabled }}
-            USE_HERMES: ${{ slice.use_hermes }}
-
-        - task: CmdLine@2
-          displayName: Build ${{ slice.scheme }}
-          inputs:
-            script: |
-              set -eox pipefail
-              ./.ado/scripts/xcodebuild.sh packages/rn-tester/RNTesterPods.xcworkspace ${{ slice.sdk }} ${{ slice.scheme }} build
-          env:
-            CCACHE_DISABLE: 1
-
-        # Skip testing on visionOS via the conditions below
-
-        - ${{ if ne(slice.scheme, 'RNTester-visionOS') }}:
-          - task: ShellScript@2
-            displayName: 'Setup packager and WebSocket test server'
-            inputs:
-              scriptPath: '.ado/scripts/ado-test-setup.sh'
-              disableAutoCwd: true
-              cwd: ''
-
-          - bash: |
-              echo Preparing the packager for platform $PLATFORM
-              curl --retry-connrefused --connect-timeout 5 --max-time 10 --retry 10 --retry-delay 5 --retry-max-time 120 "http://localhost:8081/packages/rn-tester/js/RNTesterApp.${PLATFORM}.bundle?platform=${PLATFORM}&dev=true" -o /dev/null
-              curl --retry-connrefused --connect-timeout 5 --max-time 10 --retry 10 --retry-delay 5 --retry-max-time 120 "http://localhost:8081/packages/rn-tester/js/RNTesterApp.${PLATFORM}.bundle?platform=${PLATFORM}&dev=true&minify=false" -o /dev/null
-              curl --retry-connrefused --connect-timeout 5 --max-time 10 --retry 10 --retry-delay 5 --retry-max-time 120 "http://localhost:8081/IntegrationTests/IntegrationTestsApp.bundle?platform=${PLATFORM}&dev=true" -o /dev/null
-              curl --retry-connrefused --connect-timeout 5 --max-time 10 --retry 10 --retry-delay 5 --retry-max-time 120 "http://localhost:8081/IntegrationTests/RCTRootViewIntegrationTestApp.bundle?platform=${PLATFORM}&dev=true" -o /dev/null
-            env:
-              PLATFORM: ${{ slice.packager_platform }}
-            displayName: 'curl the packager'
-
-          - task: CmdLine@2
-            displayName: Test ${{ slice.scheme }}
-            inputs:
-              script: |
-                set -eox pipefail
-                ./.ado/scripts/xcodebuild.sh packages/rn-tester/RNTesterPods.xcworkspace ${{ slice.sdk }} ${{ slice.scheme }} test
-            env:
-              CCACHE_DISABLE: 1
-
-          - task: ShellScript@2
-            displayName: 'Cleanup packager and WebSocket test server'
-            inputs:
-              scriptPath: '.ado/scripts/ado-test-cleanup.sh'
-              disableAutoCwd: true
-              cwd: ''
-            condition: always()
+
+        - template: /.ado/templates/build-rntester-steps.yml@self
+          parameters:
+            sdk: ${{ slice.sdk }}
+            configuration: ${{ slice.configuration }}
+            scheme: ${{ slice.scheme }}
+            new_arch_enabled: ${{ slice.new_arch_enabled }}
+            use_hermes: ${{ slice.use_hermes }}
+
+        # https://github.com/microsoft/react-native-macos/issues/2297
+        # Skip native tests as they tend to be flaky
+        # - template: /.ado/templates/test-rntester-steps.yml@self
+        #   parameters:
+        #     sdk: ${{ slice.sdk }}
+        #     configuration: ${{ slice.configuration }}
+        #     scheme: ${{ slice.scheme }}
+        #     packager_platform: ${{ slice.packager_platform }}

.ado/jobs/npm-publish-dry-run.yml

@@ -3,16 +3,8 @@ jobs:
   displayName: NPM Publish Dry Run
   pool:
     vmImage: $(VmImageApple)
-  timeoutInMinutes: 60 # 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
+  timeoutInMinutes: 60
+  cancelTimeoutInMinutes: 5
   steps:
-    - checkout: self # self represents the repo where the initial Pipelines YAML file was found
-      clean: true # whether to fetch clean each time
-      # fetchDepth: 2 # the depth of commits to ask Git to fetch
-      lfs: false # whether to download Git-LFS files
-      submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
-      persistCredentials: true # set to 'true' to leave the OAuth token in the Git config after the initial fetch
+    - template: /.ado/templates/npm-publish-steps.yml@self
 
-    - template: /.ado/templates/apple-steps-publish.yml@self
-      parameters:
-        build_type: 'dry-run'

.ado/jobs/npm-publish.yml

@@ -0,0 +1,19 @@
+jobs:
+- job: NPMPublish
+  displayName: NPM Publish
+  pool:
+    name: cxeiss-ubuntu-20-04-large
+    image: cxe-ubuntu-20-04-1es-pt
+    os: linux
+  variables:
+    - name: BUILDSECMON_OPT_IN
+      value: true
+  timeoutInMinutes: 90
+  cancelTimeoutInMinutes: 5
+  templateContext:
+    outputs:
+      - output: pipelineArtifact
+        targetPath: $(System.DefaultWorkingDirectory)
+        artifactName: github-npm-js-publish
+  steps:
+    - template: /.ado/templates/npm-publish-steps.yml@self

.ado/jobs/react-native-test-app-integration.yml

@@ -9,83 +9,50 @@ jobs:
     cancelTimeoutInMinutes: 5
     steps:
       - template: /.ado/templates/apple-tools-setup.yml@self
-      - bash: |
-          echo "##vso[task.setvariable variable=package_version]$(cat package.json | jq .version | awk '{ print substr($0, 2, length($0) - 2) }')"
-          echo "##vso[task.setvariable variable=react_version]$(cat package.json | jq .peerDependencies.react)"
-          echo "##vso[task.setvariable variable=rncli_version]$(cat package.json | jq '.dependencies."@react-native-community/cli"')"
-          echo "##vso[task.setvariable variable=rncli_android_version]$(cat package.json | jq '.dependencies."@react-native-community/cli-platform-android"')"
-          echo "##vso[task.setvariable variable=rncli_ios_version]$(cat package.json | jq '.dependencies."@react-native-community/cli-platform-ios"')"
-        displayName: 'Determine react-native-macos version'
-        workingDirectory: packages/react-native
-      - bash: |
-          npm pack ./packages/react-native
-        displayName: 'Pack react-native-macos'
-      - bash: |
-          git clone --progress https://github.com/microsoft/react-native-test-app.git
-        displayName: Checkout react-native-test-app
-      - bash: |
-          set -eo pipefail
-          cat package.json |
-            jq '.devDependencies["react"] = $(react_version)' |
-            jq '.devDependencies["react-native"] = "^0.71"' |
-            jq '.devDependencies["react-native-macos"] = "../react-native-macos-$(package_version).tgz"' |
-            jq 'del(.devDependencies["@react-native-community/cli"])' |
-            jq 'del(.devDependencies["@react-native-community/cli-platform-android"])' |
-            jq 'del(.devDependencies["@react-native-community/cli-platform-ios"])' |
-            jq 'del(.devDependencies["react-native-windows"])' > .package.json
-          mv .package.json package.json
-          cat package.json | jq .devDependencies
-        displayName: Modify react-native-test-app dependencies
+
+      - template: /.ado/templates/verdaccio-publish.yml@self
+
+      - script: |
+          git clone --filter=blob:none --progress https://github.com/microsoft/react-native-test-app.git
+        displayName: Clone react-native-test-app
+
+      - script: |
+          node .ado/scripts/export-versions.mjs
+        displayName: Determine react-native version
+
+      - script: |
+          npm run set-react-version $(react_native_version) -- --overrides '{ "react-native-macos": "1000.0.0" }'
+        displayName: Configure react-native-test-app dependencies
         workingDirectory: react-native-test-app
-      - bash: |
+
+      - script: |
           set -eo pipefail
-          cat package.json |
-            jq '.devDependencies["@react-native-community/cli"] = $(rncli_version)' |
-            jq '.devDependencies["@react-native-community/cli-platform-android"] = $(rncli_android_version)' |
-            jq '.devDependencies["@react-native-community/cli-platform-ios"] = $(rncli_ios_version)' |
-            jq '.devDependencies["react"] = $(react_version)' |
-            jq '.devDependencies["react-native"] = "^0.71"' |
-            jq '.devDependencies["react-native-macos"] = "../../react-native-macos-$(package_version).tgz"' |
-            jq 'del(.devDependencies["react-native-windows"])' > .package.json
-          mv .package.json package.json
-          cat package.json | jq .devDependencies
-        displayName: Modify example app dependencies
-        workingDirectory: react-native-test-app/example
-      - template: /.ado/templates/verdaccio-init.yml@self
-      - bash: |
-          npx beachball publish --branch origin/$(System.PullRequest.TargetBranch) --no-push --registry http://localhost:4873 --yes --access public
-        displayName: Publish beachball packages to verdaccio
-      - bash: |
-          cat .yarnrc.yml | sed 's_^npmRegistryServer: ".*"$_npmRegistryServer: "http://localhost:4873"_' > .yarnrc.yml.copy
-          rm .yarnrc.yml
-          mv .yarnrc.yml.copy .yarnrc.yml
-          echo -e '\nunsafeHttpWhitelist: ["localhost"]' >> .yarnrc.yml
-        displayName: Point react-native-test-app registry to verdaccio server
-        workingDirectory: react-native-test-app
-      - bash: |
+          $(Build.Repository.LocalPath)/.ado/scripts/verdaccio.sh configure
           yarn --no-immutable
         displayName: Install npm dependencies
         workingDirectory: react-native-test-app
-      - bash: |
+
+      - script: |
           yarn build:macos || yarn build:macos
         displayName: Bundle JavaScript
         workingDirectory: react-native-test-app/example
-      - bash: |
+
+      - script: |
           rm macos/Podfile.lock
           pod install --project-directory=macos
         displayName: Install Pods
         workingDirectory: react-native-test-app/example
-      - bash: |
-          set -eo pipefail
-          ../scripts/xcodebuild.sh macos/Example.xcworkspace build | xcbeautify
-        displayName: Build Intel
+
+      - script: |
+          ../scripts/build/xcodebuild.sh macos/Example.xcworkspace build
+        displayName: Build x86
         workingDirectory: react-native-test-app/example
         env:
           CCACHE_DISABLE: 1
-      - bash: |
-          set -eo pipefail
-          ../scripts/xcodebuild.sh macos/Example.xcworkspace clean
-          ../scripts/xcodebuild.sh macos/Example.xcworkspace build ARCHS=arm64 | xcbeautify
+
+      - script: |
+          ../scripts/build/xcodebuild.sh macos/Example.xcworkspace clean
+          ../scripts/build/xcodebuild.sh macos/Example.xcworkspace build ARCHS=arm64
         displayName: Build ARM
         workingDirectory: react-native-test-app/example
         env: