Merge branch 'master' of github.com:microsoft/react-native-macos into upstream-pressable-hover

Author: Saadnajmi

.ado/android-pr.yml

@@ -74,10 +74,24 @@ jobs:
           SYSTEM_ACCESSTOKEN: $(System.AccessToken)
           githubApiToken: $(githubApiToken)
 
-      - task: CmdLine@2
-        displayName: gradlew clean
-        inputs:
-          script: ./gradlew clean
+#     In RN64 "clean" task tries to run the build again. It is reproing in 0.64-stable branch but fixed in 0.65-stable.
+#     I can't zero on the exact cause .. but turns out the issue is with rntester clean task.
+#     
+#     mganandraj@RNDroid:~/github/rnm-64$ ./gradlew :packages:rn-tester:android:app:clean --dry-run
+#     :packages:react-native-codegen:android:buildCodegenCLI SKIPPED
+#     :packages:rn-tester:android:app:generateCodegenSchemaFromJavaScript SKIPPED
+#     :packages:rn-tester:android:app:generateCodegenArtifactsFromSchema SKIPPED
+#     :ReactAndroid:extractAARHeaders SKIPPED
+#     :ReactAndroid:extractJNIFiles SKIPPED
+#     :ReactAndroid:generateCodegenSchemaFromJavaScript SKIPPED
+#     :ReactAndroid:generateCodegenArtifactsFromSchema SKIPPED
+#     :ReactAndroid:prepareBoost SKIPPED
+#     :ReactAndroid:createNativeDepsDirectories SKIPPED
+#     ..
+#      - task: CmdLine@2
+#        displayName: gradlew clean
+#        inputs:
+#          script: ./gradlew clean
 
       - task: PublishBuildArtifacts@1
         displayName: 'Publish final artifacts'

.ado/apple-integration.yml

@@ -0,0 +1,97 @@
+name: Integrate $(Date:yyyyMMdd).$(Rev:.r)
+variables:
+  - template: variables/mac.yml
+trigger:
+  branches:
+    include:
+      - master
+      - '*-stable'
+  paths:
+    exclude:
+      - '*.md'
+pr:
+  branches:
+    include:
+      - master
+      - '*-stable'
+  paths:
+    exclude:
+      - '*.md'
+jobs:
+  - job: react_native_test_app
+    displayName: react-native-test-app
+    pool:
+      vmImage: $(VmImage)
+      demands: ['npm', 'sh', 'xcode']
+    workspace:
+      clean: all
+    timeoutInMinutes: 60
+    cancelTimeoutInMinutes: 5
+    steps:
+      - template: templates/apple-node-setup.yml
+      - template: templates/apple-xcode-select.yml
+        parameters:
+          slice_name: $(slice_name)
+          xcode_version: $(xcode_version)
+      - 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"')"
+        displayName: 'Determine react-native-macos version'
+      - bash: |
+          npm pack
+        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.64"' |
+            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
+        workingDirectory: react-native-test-app
+      - bash: |
+          set -eo pipefail
+          cat package.json |
+            jq '.devDependencies["@react-native-community/cli"] = $(rncli_version)' |
+            jq '.devDependencies["@react-native-community/cli-platform-android"] = $(rncli_version)' |
+            jq '.devDependencies["@react-native-community/cli-platform-ios"] = $(rncli_version)' |
+            jq '.devDependencies["react"] = $(react_version)' |
+            jq '.devDependencies["react-native"] = "^0.64"' |
+            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
+      - bash: |
+          yarn --no-immutable
+        displayName: Install npm dependencies
+        workingDirectory: react-native-test-app
+      - bash: |
+          yarn build:macos || yarn build:macos
+        displayName: Bundle JavaScript
+        workingDirectory: react-native-test-app/example
+      - bash: |
+          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
+        displayName: Build Intel
+        workingDirectory: react-native-test-app/example
+      - bash: |
+          set -eo pipefail
+          ../scripts/xcodebuild.sh macos/Example.xcworkspace clean
+          ../scripts/xcodebuild.sh macos/Example.xcworkspace build ARCHS=arm64
+        displayName: Build ARM
+        workingDirectory: react-native-test-app/example

.ado/gitTagRelease.js

@@ -28,7 +28,7 @@ function doPublish() {
   exec(`git config --global user.email "53619745+rnbot@users.noreply.github.com"`);
   exec(`git config --global user.name "React-Native Bot"`);
 
-  exec(`git add ${pkgJsonPath}`);
+  exec(`git add .`);
   exec(`git commit -m "Applying package update to ${releaseVersion} ***NO_CI***"`);
   exec(`git tag v${releaseVersion}`);
   exec(`git push origin HEAD:${tempPublishBranch} --follow-tags --verbose`);

.ado/npmOfficePack.js

@@ -28,7 +28,7 @@ function doPublish(fakeMode) {
   if (!onlyTagSource) {
     // -------- Generating Android Artifacts with JavaDoc
     const depsEnvPrefix = "REACT_NATIVE_BOOST_PATH=" + path.join(process.env.BUILD_SOURCESDIRECTORY, "build_deps");
-    const gradleCommand = path.join(process.env.BUILD_SOURCESDIRECTORY, "gradlew") + " installArchives";
+    const gradleCommand = path.join(process.env.BUILD_SOURCESDIRECTORY, "gradlew") + " installArchives -Pparam=\"excludeLibs\"";
     exec( depsEnvPrefix + " " + gradleCommand );
 
     // undo uncommenting javadoc setting

.ado/publish.yml

@@ -16,11 +16,14 @@ trigger:
 
 pr: none
 
+variables:
+  - template: variables/mac.yml
+
 jobs:
   - job: RNGithubNpmJSPublish
     displayName: React-Native GitHub Publish to npmjs.org
     pool:
-      vmImage: vs2017-win2016
+      vmImage: $(VmImage)
     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
     steps:
@@ -47,6 +50,8 @@ jobs:
         displayName: Set dist-tag to v0.x-stable
         condition: and(ne(variables['Build.SourceBranchName'], 'master'), ne(variables['Build.SourceBranchName'], variables.latestStableBranch))
 
+      - template: templates/apple-node-setup.yml
+
       - task: CmdLine@2
         displayName: yarn install
         inputs:
@@ -56,17 +61,37 @@ jobs:
         displayName: Bump stable package version
         inputs:
           script: node .ado/bumpFileVersions.js
-        condition: ne(variables['Build.SourceBranchName'], 'master')
+        condition: and(succeeded(), ne(variables['Build.SourceBranchName'], 'master'))
+
+      - task: CmdLine@2
+        displayName: pod update React-TurboModuleCxx-RNW
+        inputs:
+          script: |
+            cd packages/rn-tester
+            pod update React-TurboModuleCxx-RNW
+        condition: and(succeeded(), ne(variables['Build.SourceBranchName'], 'master'))
 
       - task: CmdLine@2
         displayName: Bump canary package version
         inputs:
           script: node scripts/bump-oss-version.js --nightly
-        condition: eq(variables['Build.SourceBranchName'], 'master')
+        condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'master'))
+
+      # Publish will fail if package.json is marked as private
+      - task: CmdLine@2
+        displayName: Remove workspace config from package.json
+        inputs:
+          script: node .ado/removeWorkspaceConfig.js
 
       - script: npm publish --tag $(npmDistTag) --registry https://registry.npmjs.org/ --//registry.npmjs.org/:_authToken=$(npmAuthToken)
         displayName: Publish react-native-macos to npmjs.org
 
+      # Put the private flag back so that the removal does not get committed by the tag release step
+      - task: CmdLine@2
+        displayName: Restore package.json workspace config
+        inputs:
+          script: node .ado/restoreWorkspaceConfig.js
+
       - task: CmdLine@2
         displayName: 'Tag published release'
         inputs:
@@ -76,7 +101,7 @@ jobs:
           BUILD_SOURCEBRANCH: $(Build.SourceBranch)
           SYSTEM_ACCESSTOKEN: $(System.AccessToken)
           githubApiToken: $(githubApiToken)
-        condition: ne(variables['Build.SourceBranchName'], 'master')
+        condition: and(succeeded(), ne(variables['Build.SourceBranchName'], 'master'))
 
 
   - job: RNMacOSInitNpmJSPublish
@@ -137,6 +162,12 @@ jobs:
         inputs:
           script: node .ado/bumpOfficeFileVersions.js
 
+      # Publish will fail if package.json is marked as private
+      - task: CmdLine@2
+        displayName: Remove workspace config from package.json
+        inputs:
+          script: node .ado/removeWorkspaceConfig.js
+
       - task: CmdLine@2
         displayName: gradlew installArchives
         inputs:

.ado/removeWorkspaceConfig.js

@@ -0,0 +1,3 @@
+// @ts-check
+const {removeWorkspaceConfig} = require('./versionUtils');
+removeWorkspaceConfig(); 

.ado/restoreWorkspaceConfig.js

@@ -0,0 +1,3 @@
+// @ts-check
+const {restoreWorkspaceConfig} = require('./versionUtils');
+restoreWorkspaceConfig(); 

.ado/templates/android-build-office.yml

@@ -30,12 +30,29 @@ steps:
     inputs:
       script: yarn install --frozen-lockfile
 
+  # scripts/bump-oss-version.js
+  #
+  # update the following files to the commit id.
+  # package.json (-> npm package version)
+  # gradle.properties (-> aar version)
+  # gradle.properties (-> aar version)
+  #
+  # The following files are updated for runtime version checking.
+  # ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+  # React/Base/RCTVersion.m
+  # ReactCommon/cxxreact/ReactNativeVersion.h
+  # Libraries/Core/ReactNativeVersion.js
+  #
+  # --nightly => version = `0.0.0-${currentCommit.slice(0, 9)}`;
+  # When on master branch or non-stable branch.
   - task: CmdLine@2
     displayName: Bump canary package version
     inputs:
       script: node scripts/bump-oss-version.js --nightly
-    condition: eq(variables['Build.SourceBranchName'], 'master')
-  
+    condition: or(eq(variables['Build.SourceBranchName'], 'master'), not(contains(variables['Build.SourceBranchName'], '-stable')))
+
+  # TODO: We don't seem to be running bump-oss-version.js for stable branches, hence we would end up publishing using the values in the repository.
+
   - task: CmdLine@2
     displayName: nuget restore
     inputs:

.ado/templates/apple-droid-node-patching.yml

@@ -5,4 +5,4 @@ steps:
   - task: CmdLine@2
     displayName: Apply Android specific patches for Office consumption
     inputs:
-      script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) Build OfficeRNHost V8 Focus --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }}
+      script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) Build OfficeRNHost V8 Focus MAC ImageColor --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }}

.ado/versionUtils.js

@@ -2,6 +2,7 @@
 const fs = require("fs");
 const path = require("path");
 const semver = require('semver');
+const {execSync} = require('child_process');
 
 const pkgJsonPath = path.resolve(__dirname, "../package.json");
 let publishBranchName = '';
@@ -41,15 +42,34 @@ function updateVersionsInFiles(patchVersionPrefix) {
     }
 
     pkgJson.version = releaseVersion;
-    fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
-    console.log(`Updating package.json to version ${releaseVersion}`);
-  
+    console.log(`Bumping files to version ${releaseVersion}`);
+    execSync(`node ./scripts/bump-oss-version.js --rnmpublish ${releaseVersion}`, {stdio: 'inherit', env: process.env});
+
     return {releaseVersion, branchVersionSuffix};
 }
 
+const workspaceJsonPath = path.resolve(require('os').tmpdir(), 'rnpkg.json');
+
+function removeWorkspaceConfig() {
+  let {pkgJson} = gatherVersionInfo();
+  fs.writeFileSync(workspaceJsonPath, JSON.stringify(pkgJson, null, 2));
+  delete pkgJson.private;
+  delete pkgJson.workspaces;
+  fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
+  console.log(`Removing workspace config from package.json to prepare to publish.`);
+}
+
+function restoreWorkspaceConfig() {
+  let pkgJson = JSON.parse(fs.readFileSync(workspaceJsonPath, "utf8"));
+  fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
+  console.log(`Restoring workspace config from package.json`);
+}
+
 module.exports = {
     gatherVersionInfo,
     publishBranchName,
     pkgJsonPath,
+    removeWorkspaceConfig,
+    restoreWorkspaceConfig,
     updateVersionsInFiles
 }