Version map, check only major and minor

facebook · Sep 9, 2017 · 2e69a0e · 2e69a0e
1 parent 04a9905
commit 2e69a0e
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 20 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -13,3 +13,4 @@ website/core/metadata-blog.js
 website/src/react-native/docs/
 website/src/react-native/blog/
 danger/
+scripts/versiontemplates/*
diff --git a/.flowconfig b/.flowconfig
@@ -25,6 +25,9 @@
 ; Ignore polyfills
 .*/Libraries/polyfills/.*
 
+; Version templates contain invalid JS.
+<PROJECT_ROOT>/scripts/versiontemplates/.*
+
 [include]
 
 [libs]

diff --git a/Libraries/Core/InitializeCore.js b/Libraries/Core/InitializeCore.js
@@ -116,12 +116,18 @@ if (!global.__fbDisableExceptionsManager) {
   ErrorUtils.setGlobalHandler(handleError);
 }
 
+const formatVersion = version =>
+  `${version.major}.${version.minor}.${version.patch}` +
+  (version.prerelease !== null ? `-rc.${version.prerelease}` : '');
+
 const NativeModules = require('NativeModules');
 const ReactNativeVersion = require('./ReactNativeVersion');
-if (ReactNativeVersion.version !== NativeModules.PlatformConstants.reactNativeVersion) {
+const nativeVersion = NativeModules.PlatformConstants.reactNativeVersion;
+if (ReactNativeVersion.version.major !== nativeVersion.major ||
+    ReactNativeVersion.version.minor !== nativeVersion.minor) {
   throw new Error(
-    `React Native version mismatch.\n\nJavaScript version: ${ReactNativeVersion.version}\n` +
-    `Native version: ${NativeModules.PlatformConstants.reactNativeVersion}\n\n` +
+    `React Native version mismatch.\n\nJavaScript version: ${formatVersion(ReactNativeVersion.version)}\n` +
+    `Native version: ${formatVersion(nativeVersion)}\n\n` +
     'Make sure that you have rebuilt the native code. If the problem persists ' +
     'try clearing the watchman and packager caches with `watchman watch-del-all ' +
     '&& react-native start --reset-cache`.'

diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js
@@ -11,4 +11,9 @@
  * @flow
  */
 
-exports.version = 'master';
+exports.version = {
+  major: 0,
+  minor: 0,
+  patch: 0,
+  prerelease: null,
+};
diff --git a/React/Base/RCTVersion.h b/React/Base/RCTVersion.h
@@ -9,4 +9,9 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#define REACT_NATIVE_VERSION @"master"
+#define REACT_NATIVE_VERSION @{ \
+  @"major": @(0), \
+  @"minor": @(0), \
+  @"patch": @(0), \
+  @"prerelease": @(nil), \
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeVersion.java
@@ -11,6 +11,14 @@
 
 package com.facebook.react;
 
+import com.facebook.react.common.MapBuilder;
+
+import java.util.Map;
+
 public class ReactNativeVersion {
-  public static final String VERSION = "master";
+  public static final Map<String, Integer> VERSION = MapBuilder.of(
+      "major", 0,
+      "minor", 0,
+      "patch", 0,
+      "prerelease", null);
 }
diff --git a/scripts/bump-oss-version.js b/scripts/bump-oss-version.js
@@ -46,22 +46,37 @@ let versionMajor = branch.slice(0, branch.indexOf(`-stable`));
 // e.g. 0.33.1 or 0.33.0-rc4
 let version = argv._[0];
 if (!version || version.indexOf(versionMajor) !== 0) {
-  echo(`You must pass a tag like ${versionMajor}.[X]-rc[Y] to bump a version`);
+  echo(`You must pass a tag like 0.${versionMajor}.[X]-rc[Y] to bump a version`);
   exit(1);
 }
 
 // Generate version files to detect mismatches between JS and native.
-cat('scripts/versiontemplates/ReactNativeVersion.java')
-  .replace('${version}', version)
-  .to('ReactAndroid/src/main/java/com/facebook/react/ReactNativeVersion.java');
-
-cat('scripts/versiontemplates/RCTVersion.h')
-  .replace('${version}', version)
-  .to('React/Base/RCTVersion.h');
+let [, major, minor, patch, prerelease] = version.match(/^(\d+)\.(\d+)\.(\d+)(?:-rc\.(\d+))?$/);
+
+function processVersionFile(from, to, nullValue) {
+  cat(from)
+    .replace('${major}', major)
+    .replace('${minor}', minor)
+    .replace('${patch}', patch)
+    .replace('${prerelease}', prerelease !== undefined ? prerelease : nullValue)
+    .to(to);
+}
 
-cat('scripts/versiontemplates/ReactNativeVersion.js')
-  .replace('${version}', version)
-  .to('Libraries/Core/ReactNativeVersion.js');
+processVersionFile(
+  'scripts/versiontemplates/ReactNativeVersion.java',
+  'ReactAndroid/src/main/java/com/facebook/react/ReactNativeVersion.java',
+  'null'
+);
+processVersionFile(
+  'scripts/versiontemplates/RCTVersion.h',
+  'React/Base/RCTVersion.h',
+  'nil'
+);
+processVersionFile(
+  'scripts/versiontemplates/ReactNativeVersion.js',
+  'Libraries/Core/ReactNativeVersion.js',
+  'null'
+);
 
 let packageJson = JSON.parse(cat(`package.json`));
 packageJson.version = version;

diff --git a/scripts/versiontemplates/RCTVersion.h b/scripts/versiontemplates/RCTVersion.h
@@ -9,4 +9,9 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#define REACT_NATIVE_VERSION @"${version}"
+#define REACT_NATIVE_VERSION @{ \
+  @"major": @(${major}), \
+  @"minor": @(${minor}), \
+  @"patch": @(${patch}), \
+  @"prerelease": @(${prerelease}), \
+}
diff --git a/scripts/versiontemplates/ReactNativeVersion.java b/scripts/versiontemplates/ReactNativeVersion.java
@@ -11,6 +11,14 @@
 
 package com.facebook.react;
 
+import com.facebook.react.common.MapBuilder;
+
+import java.util.Map;
+
 public class ReactNativeVersion {
-  public static final String VERSION = "${version}";
+  public static final Map<String, Integer> VERSION = MapBuilder.of(
+      "major", ${major},
+      "minor", ${minor},
+      "patch", ${patch},
+      "prerelease", ${prerelease});
 }
diff --git a/scripts/versiontemplates/ReactNativeVersion.js b/scripts/versiontemplates/ReactNativeVersion.js
@@ -11,4 +11,9 @@
  * @flow
  */
 
-exports.version = '${version}';
+exports.version = {
+  major: ${major},
+  minor: ${minor},
+  patch: ${patch},
+  prerelease: ${prerelease},
+};