[0.62] Provide information to metro to redirect to rn-macos when buil…

…ding macos (#596) * Provide information to metro to redirect to rn-macos when building macos (#587) * Provide information to metro to redirect to rn-macos when building macos * Update version of cli we are using * more config Co-authored-by: Andrew Coates <acoates-ms@noreply.github.com> * Enable PR builds on 0.62 branch * Fix CI * fix ci take 2 * take3 Co-authored-by: Andrew Coates <acoates-ms@noreply.github.com>
microsoft · Sep 15, 2020 · f59ede3 · f59ede3
1 parent 113efa7
commit f59ede3
Show file tree

Hide file tree

Showing 6 changed files with 232 additions and 90 deletions.
diff --git a/.ado/android-pr.yml b/.ado/android-pr.yml
@@ -8,6 +8,7 @@ pr:
     include:
       - master
       - 0.59-stable
+      - 0.62-stable
   paths:
     exclude:
       - '*.md'

diff --git a/.ado/apple-pr.yml b/.ado/apple-pr.yml
@@ -11,6 +11,7 @@ pr:
     include:
       - master
       - 0.59-stable
+      - 0.62-stable
   paths:
     exclude:
       - '*.md'

diff --git a/.ado/templates/react-native-macos-init.yml b/.ado/templates/react-native-macos-init.yml
@@ -63,7 +63,7 @@ steps:
   - task: CmdLine@2
     displayName: Bump package version
     inputs:
-      script: node scripts/bump-oss-version.js --nightly
+      script: node scripts/bump-oss-version.js --ci 0.62.1000
 
   - script: |
       npm publish --registry http://localhost:4873

diff --git a/react-native.config.js b/react-native.config.js
@@ -32,6 +32,42 @@ module.exports = {
       projectConfig: android.projectConfig,
       dependencyConfig: android.dependencyConfig,
     },
+    macos: {
+      linkConfig: () => {
+        return {
+          isInstalled: (
+            _projectConfig /*ProjectConfig*/,
+            _package /*string*/,
+            _dependencyConfig /*DependencyConfig*/,
+          ) => false /*boolean*/,
+          register: (
+            _package /*string*/,
+            _dependencyConfig /*DependencyConfig*/,
+            _obj /*Object*/,
+            _projectConfig /*ProjectConfig*/,
+          ) => {},
+          unregister: (
+            _package /*string*/,
+            _dependencyConfig /*DependencyConfig*/,
+            _projectConfig /*ProjectConfig*/,
+            _dependencyConfigs /*Array<DependencyConfig>*/,
+          ) => {},
+          copyAssets: (
+            _assets /*string[]*/,
+            _projectConfig /*ProjectConfig*/,
+          ) => {},
+          unlinkAssets: (
+            _assets /*string[]*/,
+            _projectConfig /*ProjectConfig*/,
+          ) => {},
+        };
+      },
+      projectConfig: () => null,
+      dependencyConfig: () => null,
+      npmPackageName: isReactNativeMacOS
+        ? 'react-native-macos'
+        : 'react-native',
+    },
   },
   /**
    * Used when running RNTester (with React Native from source)

diff --git a/scripts/bump-oss-version.js b/scripts/bump-oss-version.js
@@ -24,13 +24,18 @@ let argv = yargs.option('r', {
   alias: 'remote',
   default: 'origin',
 })
+.option('ci', {
+  type: 'boolean',
+  default: false,
+})
 .option('n', {
   alias: 'nightly',
   type: 'boolean',
   default: false,
 }).argv;
 
 const nightlyBuild = argv.nightly;
+const ci = argv.ci;
 
 let version, branch;
 if (nightlyBuild) {
@@ -42,7 +47,7 @@ if (nightlyBuild) {
     silent: true,
   }).stdout.trim();
 
-  if (branch.indexOf('-stable') === -1) {
+  if (!ci && branch.indexOf('-stable') === -1) {
     echo('You must be in 0.XX-stable branch to bump a version');
     exit(1);
   }