Moving the android specific changes to patch files and reverting them… (#254)

* Moving the android specific changes to patch files and reverting them from the repo.

* Apply patches immediately after cloning

* Fixing the webpack config for the bundle to run correctly

* Removing an unwanted hunk from folly makefile hwich might be causing a build failure

* Reverting src/main/jni/third-party/folly/Android.mk hoping for the best. If this doesn't work then will look deeper

* Fixing the patch scripts

* Fixing a patch file with integrity failure.. and tightening the error handling.

* Adding more diagnostics

* More diagnostics

* Fixing line splitting of patch and source files while patching

* Cleaning up the diagnostics.. Patching should work this time.

* Reverting the change needed for MAC/iOS

* More diagnostics printed out ..

* Fixing MAC/iOS build

* yarn test -u

* Update .eslintignore

Update .eslintignore to ignore patching code and patch files.

* Fixing a couple of linking errors in JS'

* Adding prettierignore and making some fixes to the patches

* More fixes to the path

* Making required changes in Apple PR/Publish build pipelines to valiate/publish patched as well as unpatched code

* A fix in the patch application condition

* More fixes in the patch application condition

* Another attempt to fix the patching condition

* Yet Another attempt to fix the patching condition

* Yet Another attempt to fix the patching condition.. forcing the parameter to be strings

* Yet Another attempt to fix the patching condition.. forcing the parameter to be strings

* Making patches work on non-windows.. and more fixes for the condition in yaml

* Diagnostics for debugging conditions

* Diagnostics for debugging conditions 2

* Diagnostics for debugging conditions 3

* Diagnostics for debugging conditions 3

* Diagnostics for debugging conditions 3

* Diagnostics for debugging conditions 3

* Diagnostics for debugging conditions 3

* Diagnostics for debugging conditions 3

* Diagnostics for debugging conditions 3

* Diagnostics for debugging conditions 3

* Diagnostics for debugging conditions 3

* Diagnostics for debugging conditions 3

* Diagnostics for debugging conditions 3

* Diagnostics for debugging conditions 3

* Diagnostics for debugging conditions 3

* Diagnostics for debugging conditions 3

* Diagnostics for debugging conditions 3

* Workaround

* Workaround

* Workaround

* Workaround

* Fixing Apple build failure with patch applied ..

* Refactoring the patch application to template

* Fixing the template file relative URL when referenced from another template

* Fixing a mistake introduced while refactoring the patch creating steps.

* Fixing some formatting

* Fixing some formatting

Co-authored-by: Anandraj <[email protected]>

Author: mganandraj

.ado/android-pr.yml

@@ -22,10 +22,14 @@ jobs:
         submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
         persistCredentials: false # set to 'true' to leave the OAuth token in the Git config after the initial fetch
 
+      - template: templates/apple-droid-node-patching.yml
+        parameters:
+          apply_office_patches: true
+
       - task: UseNode@1
         inputs:
           version: '10.x'
-      
+
       # Install NuGet v4.6.4+
       - task: NuGetToolInstaller@1
         inputs:

.ado/apple-pr.yml

@@ -10,11 +10,19 @@ pr:
 jobs:
   - job: JavaScriptRNPR
     displayName: JavaScript React Native PR
+    strategy:
+      matrix:
+        office:
+          apply_office_patches: 'true'
+        public:
+          apply_office_patches: 'false'
     pool:
       vmImage: macOS-10.14
       demands: ['xcode', 'sh', 'npm']
     steps:
       - template: templates/apple-job-javascript.yml
+        parameters:
+            apply_office_patches: $(apply_office_patches)
 
   - job: AppleRNPR
     displayName: Apple React Native PR
@@ -27,6 +35,7 @@ jobs:
           xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 8'
           xcode_actions_debug: 'build test'
           xcode_actions_release: 'build'
+          apply_office_patches: 'false'
         # Microsoft- We don't use tvOS, so don't bother maintaining the infra
         # tvos:
         #   packager_platform: 'ios'
@@ -40,6 +49,23 @@ jobs:
           xcode_destination: 'platform=macOS,arch=x86_64'
           xcode_actions_debug: 'build test'
           xcode_actions_release: 'build'
+          apply_office_patches: 'false'
+        ios-office:
+          packager_platform: 'ios'
+          xcode_sdk: iphonesimulator
+          xcode_scheme: 'RNTester'
+          xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 8'
+          xcode_actions_debug: 'build test'
+          xcode_actions_release: 'build'
+          apply_office_patches: 'true'
+        macos-office:
+          packager_platform: 'macos'
+          xcode_sdk: macosx
+          xcode_scheme: 'RNTester-macOS'
+          xcode_destination: 'platform=macOS,arch=x86_64'
+          xcode_actions_debug: 'build test'
+          xcode_actions_release: 'build'
+          apply_office_patches: 'true'
     pool:
       vmImage: macOS-10.14
       demands: ['xcode', 'sh', 'npm']
@@ -55,3 +81,4 @@ jobs:
           xcode_actions_debug: $(xcode_actions_debug)
           xcode_actions_release: $(xcode_actions_release)
           xcode_destination: $(xcode_destination)
+          apply_office_patches: $(apply_office_patches)

.ado/publish-npmjs.yml

@@ -0,0 +1,50 @@
+# This file defines the build steps to publish a release
+name: $(Date:yyyyMMdd).$(Rev:.r)
+
+trigger: 
+  batch: true
+  branches:
+    include:
+      - master
+      - fabric
+  paths:
+    exclude:
+      - package.json
+
+pr: none
+
+jobs:
+  - job: RNGithubPublish
+    displayName: React-Native GitHub Publish
+    pool:
+      vmImage: vs2017-win2016
+    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:
+      - 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
+
+      - task: CmdLine@2
+        displayName: npm install
+        inputs:
+          script: npm install
+
+      - task: CmdLine@2
+        displayName: Bump package version
+        inputs:
+          script: node .ado/bumpFileVersions.js
+
+      - task: CmdLine@2
+        displayName: "Prepare package.json for npm publishing as react-native-macos"
+        inputs:
+          script: node .ado/renamePackageToMac.js
+
+      - task: Npm@1
+        displayName: "Publish react-native-macos to npmjs.org"
+        inputs:
+          command: 'publish'
+          publishEndpoint: 'npmjs'

.ado/publish.yml

@@ -28,6 +28,10 @@ jobs:
         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: templates/apple-droid-node-patching.yml
+        parameters:
+          apply_office_patches: true
+
       # Install NuGet v4.6.4+
       - task: NuGetToolInstaller@1
         inputs:
@@ -139,14 +143,3 @@ jobs:
         inputs:
           PathtoPublish: '$(Build.StagingDirectory)\final'
           ArtifactName: 'ReactNative-Final'
-
-      - task: CmdLine@2
-        displayName: "Prepare package.json for npm publishing as react-native-macos"
-        inputs:
-          script: node .ado/renamePackageToMac.js
-
-      - task: Npm@1
-        displayName: "Publish react-native-macos to npmjs.org"
-        inputs:
-          command: 'publish'
-          publishEndpoint: 'npmjs'

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

@@ -0,0 +1,8 @@
+parameters:
+  apply_office_patches: ''
+
+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) BuildAndThirdPartyFixes DialogModule UIEditText UIScroll UITextFont Accessibility OfficeRNHost SecurityFixes V8Integration AnnotationProcessing --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches-droid-office-grouped --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }}

.ado/templates/apple-job-javascript.yml

@@ -1,3 +1,6 @@
+parameters:
+  apply_office_patches: ''
+
 steps:
   - script: 'brew bundle'
     displayName: 'brew bundle'
@@ -7,6 +10,10 @@ steps:
 
   - template: apple-xcode-select.yml
 
+  - template: apple-droid-node-patching.yml
+    parameters:
+      apply_office_patches: $(apply_office_patches)
+
   - script: 'yarn install'
     displayName: 'yarn install'
 

.ado/templates/apple-job-react-native.yml

@@ -6,6 +6,7 @@ parameters:
   xcode_actions_debug: ''
   xcode_actions_release: ''
   xcode_destination: ''
+  apply_office_patches: ''
 
 steps:
   # Clean DerivedData
@@ -22,6 +23,10 @@ steps:
   # Task Group: XCode select proper version
   - template: apple-xcode-select.yml
 
+  - template: apple-droid-node-patching.yml
+    parameters:
+      apply_office_patches: $(apply_office_patches)
+
   - task: CmdLine@2
     displayName: yarn install
     inputs:

.eslintignore

@@ -8,4 +8,5 @@ packages/*/node_modules
 pr-inactivity-bookmarklet.js
 question-bookmarklet.js
 flow/
-bots/node_modules
+bots/node_modules
+android-patches/

.gitignore

@@ -31,6 +31,8 @@ project.xcworkspace/*
 /RNTester/android/app/gradlew
 /RNTester/android/app/gradlew.bat
 /ReactAndroid/build/
+/build_deps/
+/ReactAndroid/packages/
 
 # Buck
 .buckd

.prettierignore

@@ -0,0 +1 @@
+android-patches/