Bump version to 2.2.1 and change release versiosing method

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "2.0.0",
+  "version": "2.2.1",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,

scripts/release.js

@@ -3,6 +3,7 @@ const exec = require('shell-utils').exec;
 const semver = require('semver');
 const fs = require('fs');
 const _ = require('lodash');
+const path = require('path');
 
 // Workaround JS
 const isRelease = process.env.RELEASE_BUILD === 'true';
@@ -12,88 +13,120 @@ const VERSION_TAG = isRelease ? 'latest' : 'snapshot';
 const VERSION_INC = 'patch';
 
 function run() {
-  if (!validateEnv()) {
-    return;
-  }
-  setupGit();
-  createNpmRc();
-  versionTagAndPublish();
+    if (!validateEnv()) {
+        return;
+    }
+    setupGit();
+    createNpmRc();
+    versionTagAndPublish();
 }
 
 function validateEnv() {
-  if (!process.env.JENKINS_CI) {
-    throw new Error(`releasing is only available from CI`);
-  }
+    if (!process.env.JENKINS_CI) {
+        throw new Error(`releasing is only available from CI`);
+    }
 
-  if (!process.env.JENKINS_MASTER) {
-    console.log(`not publishing on a different build`);
-    return false;
-  }
+    if (!process.env.JENKINS_MASTER) {
+        console.log(`not publishing on a different build`);
+        return false;
+    }
 
-  if (process.env.GIT_BRANCH !== ONLY_ON_BRANCH) {
-    console.log(`not publishing on branch ${process.env.GIT_BRANCH}`);
-    return false;
-  }
+    if (process.env.GIT_BRANCH !== ONLY_ON_BRANCH) {
+        console.log(`not publishing on branch ${process.env.GIT_BRANCH}`);
+        return false;
+    }
 
-  return true;
+    return true;
 }
 
 function setupGit() {
-  exec.execSyncSilent(`git config --global push.default simple`);
-  exec.execSyncSilent(`git config --global user.email "${process.env.GIT_EMAIL}"`);
-  exec.execSyncSilent(`git config --global user.name "${process.env.GIT_USER}"`);
-  const remoteUrl = new RegExp(`https?://(\\S+)`).exec(exec.execSyncRead(`git remote -v`))[1];
-  exec.execSyncSilent(`git remote add deploy "https://${process.env.GIT_USER}:${process.env.GIT_TOKEN}@${remoteUrl}"`);
-  // exec.execSync(`git checkout ${ONLY_ON_BRANCH}`);
+    exec.execSyncSilent(`git config --global push.default simple`);
+    exec.execSyncSilent(`git config --global user.email "${process.env.GIT_EMAIL}"`);
+    exec.execSyncSilent(`git config --global user.name "${process.env.GIT_USER}"`);
+    const remoteUrl = new RegExp(`https?://(\\S+)`).exec(exec.execSyncRead(`git remote -v`))[1];
+    exec.execSyncSilent(`git remote add deploy "https://${process.env.GIT_USER}:${process.env.GIT_TOKEN}@${remoteUrl}"`);
+    // exec.execSync(`git checkout ${ONLY_ON_BRANCH}`);
 }
 
 function createNpmRc() {
-  exec.execSync(`rm -f package-lock.json`);
-  const content = `
+    exec.execSync(`rm -f package-lock.json`);
+    const content = `
 email=\${NPM_EMAIL}
 //registry.npmjs.org/:_authToken=\${NPM_TOKEN}
 `;
-  fs.writeFileSync(`.npmrc`, content);
+    fs.writeFileSync(`.npmrc`, content);
 }
 
 function versionTagAndPublish() {
-  const currentPublished = findCurrentPublishedVersion();
-  console.log(`current published version: ${currentPublished}`);
+    const packageVersion = semver.clean(process.env.npm_package_version);
+    console.log(`package version: ${packageVersion}`);
 
-  const version = isRelease ? process.env.VERSION : `${currentPublished}-snapshot.${process.env.BUILD_ID}`;
-  console.log(`Publishing version: ${version}`);
+    const currentPublished = findCurrentPublishedVersion();
+    console.log(`current published version: ${currentPublished}`);
 
-  tryPublishAndTag(version);
+    const version = isRelease
+        ? process.env.VERSION
+        : semver.gt(packageVersion, currentPublished)
+            ? `${packageVersion}-snapshot.${process.env.BUILD_ID}`
+            : `${currentPublished}-snapshot.${process.env.BUILD_ID}`;
+
+    console.log(`Publishing version: ${version}`);
+
+    tryPublishAndTag(version);
 }
 
 function findCurrentPublishedVersion() {
-  return exec.execSyncRead(`npm view ${process.env.npm_package_name} dist-tags.latest`);
+    return exec.execSyncRead(`npm view ${process.env.npm_package_name} dist-tags.latest`);
 }
 
 function tryPublishAndTag(version) {
-  let theCandidate = version;
-  for (let retry = 0; retry < 5; retry++) {
-    try {
-      tagAndPublish(theCandidate);
-      console.log(`Released ${theCandidate}`);
-      return;
-    } catch (err) {
-      const alreadyPublished = _.includes(err.toString(), 'You cannot publish over the previously published version');
-      if (!alreadyPublished) {
-        throw err;
-      }
-      console.log(`previously published. retrying with increased ${VERSION_INC}...`);
-      theCandidate = semver.inc(theCandidate, VERSION_INC);
+    let theCandidate = version;
+    for (let retry = 0; retry < 5; retry++) {
+        try {
+            tagAndPublish(theCandidate);
+            console.log(`Released ${theCandidate}`);
+            return;
+        } catch (err) {
+            const alreadyPublished = _.includes(err.toString(), 'You cannot publish over the previously published version');
+            if (!alreadyPublished) {
+                throw err;
+            }
+            console.log(`previously published. retrying with increased ${VERSION_INC}...`);
+            theCandidate = semver.inc(theCandidate, VERSION_INC);
+        }
     }
-  }
 }
 
 function tagAndPublish(newVersion) {
-  console.log(`trying to publish ${newVersion}...`);
-  exec.execSync(`npm --no-git-tag-version version ${newVersion}`);
-  exec.execSync(`npm publish --tag ${VERSION_TAG}`);
-  exec.execSync(`git tag -a ${newVersion} -m "${newVersion}"`);
-  exec.execSyncSilent(`git push deploy ${newVersion} || true`);
+    console.log(`trying to publish ${newVersion}...`);
+    exec.execSync(`npm --no-git-tag-version version ${newVersion}`);
+    exec.execSync(`npm publish --tag ${VERSION_TAG}`);
+    exec.execSync(`git tag -a ${newVersion} -m "${newVersion}"`);
+    exec.execSyncSilent(`git push deploy ${newVersion} || true`);
+    if (isRelease) {
+      updatePackageJsonGit(newVersion);
+    }
+}
+
+function getPackageJsonPath() {
+    return `${process.cwd()}/package.json`;
+}
+
+function writePackageJson(packageJson) {
+    fs.writeFileSync(getPackageJsonPath(), JSON.stringify(packageJson, null, 2));
+}
+
+function readPackageJson() {
+    return JSON.parse(fs.readFileSync(getPackageJsonPath()));
+}
+
+function updatePackageJsonGit(version) {
+    const packageJson = readPackageJson();
+    packageJson.version = version;
+    writePackageJson(packageJson);
+    exec.execSync(`git add package.json`);
+    exec.execSync(`git commit -m"Update package.json version to ${version} [ci skip]"`);
+    exec.execSync(`git push`);
 }
 
 run();