Fix react-native-macos package name and version (#333)

* Update scripts to publish react-native-macos-init

* Clean up merge markers

* Restored ios:macos RNTester parity except for InputAccessoryView.

* Revert "Restored ios:macos RNTester parity except for InputAccessoryView."

This reverts commit 5a67ae0.

* Fix package name and version scheme

* Actually rename the package.
Rename arg from minorVersionPrefix to patchVersionPrefix because that's what it actually is.

* Rename package before install

* Fix metro bundler.

* Fix Jest tests.

* Try CmdLine@2 instead of script

* Rename repo for jest tests

Author: tom-un

.ado/android-pr.yml

@@ -35,6 +35,11 @@ jobs:
         inputs:
           versionSpec: '>=4.6.4'
 
+      - task: CmdLine@2
+        displayName: "Rename package to react-native"
+        inputs:
+          script: node .ado/renamePackageForOffice.js
+
       - task: CmdLine@2
         displayName: npm install
         inputs:

.ado/bumpFileVersions.js

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

.ado/bumpOfficeFileVersions.js

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

.ado/publish.yml

@@ -38,11 +38,6 @@ jobs:
         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:
@@ -109,6 +104,11 @@ jobs:
         inputs:
           versionSpec: '>=4.6.4'
 
+      - task: CmdLine@2
+        displayName: "Rename package to react-native"
+        inputs:
+          script: node .ado/renamePackageForOffice.js
+
       - task: CmdLine@2
         displayName: npm install
         inputs:
@@ -117,7 +117,7 @@ jobs:
       - task: CmdLine@2
         displayName: Bump package version
         inputs:
-          script: node .ado/bumpFileVersions.js
+          script: node .ado/bumpOfficeFileVersions.js
 
       - task: NuGetCommand@2
         displayName: NuGet restore

.ado/renamePackageToMac.js renamed to .ado/renamePackageForOffice.js

@@ -1,3 +1,3 @@
 // @ts-check
 const {updatePackageName} = require('./versionUtils');
-updatePackageName('react-native-macos');
+updatePackageName('react-native');

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

@@ -14,12 +14,19 @@ steps:
     parameters:
       apply_office_patches: $(apply_office_patches)
 
+  - task: CmdLine@2
+    displayName: "Rename package to react-native"
+    inputs:
+      script: node .ado/renamePackageForOffice.js
+
   - script: 'yarn install'
     displayName: 'yarn install'
 
-  - script: 'yarn test-ci'
-    displayName: 'yarn test-ci'
-
+  - task: CmdLine@2
+    displayName: yarn test-ci
+    inputs:
+      script: 'yarn test-ci'
+  
   - script: 'yarn flow-check-ios'
     displayName: 'yarn flow-check-ios'
 

.ado/templates/react-native-macos-init.yml

@@ -65,11 +65,6 @@ steps:
     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
-
   - script: |
       npm publish --registry http://localhost:4873
     displayName: Publish react-native-macos to verdaccio

.ado/versionUtils.js

@@ -17,21 +17,17 @@ function gatherVersionInfo() {
     return {pkgJson, releaseVersion, branchVersionSuffix};
 }
 
-function updateVersionsInFiles() {
+function updateVersionsInFiles(patchVersionPrefix) {
 
     let {pkgJson, releaseVersion, branchVersionSuffix} = gatherVersionInfo();
 
-    const versionStringRegEx = new RegExp(`(.*-microsoft)(-${publishBranchName})?\\.([0-9]*)`);
+    const versionStringRegEx = new RegExp(`(.*)(-${publishBranchName})?\\.([0-9]*)`);
     const versionGroups = versionStringRegEx.exec(releaseVersion);
     if (versionGroups) {
-      releaseVersion = versionGroups[1] + branchVersionSuffix + '.' + (parseInt(versionGroups[3]) + 1);
+      releaseVersion = versionGroups[1] + patchVersionPrefix + branchVersionSuffix + '.' + (parseInt(versionGroups[3]) + 1);
     } else {
-      if (releaseVersion.indexOf("-") === -1) {
-        releaseVersion = releaseVersion + `-microsoft${branchVersionSuffix}.0`;
-      } else {
-        console.log("Invalid version to publish");
-        process.exit(1);
-      }
+      console.log("Invalid version to publish");
+      process.exit(1);
     }
 
     pkgJson.version = releaseVersion;