Cleanup old script files and packagejson scripts commands (#1986)

* Cleanup old script files and packagejson scripts commands

* Rename script file name

* Update bkRelease to release

Author: ethanshar

.buildkite/pipeline.yml

@@ -12,5 +12,5 @@ steps:
     - "npm install"
     - "npm run test"
     - "npm run build"
-    - "[[ $BUILDKITE_PULL_REQUEST == 'false' ]] && npm run bkRelease && npm run demo || true"
+    - "[[ $BUILDKITE_PULL_REQUEST == 'false' ]] && npm run release && npm run demo || true"
     timeout_in_minutes: 15

package.json

@@ -15,32 +15,23 @@
   },
   "scripts": {
     "start": "watchman watch-del-all && export DEV_MODE=true && react-native start",
-    "start-ios": "node ./scripts/cliStuff.js",
     "ios": "react-native run-ios",
-    "iPad": "react-native run-ios --simulator='iPad Pro (9.7 inch)'",
     "android": "react-native run-android",
+    "iPad": "react-native run-ios --simulator='iPad Pro (9.7 inch)'",
     "pretest": "npm run lint",
     "test": "jest",
     "test:watch": "jest --watch",
     "lint": "eslint src -c .eslintrc.js --ext .tsx,.ts,.js",
     "lint:fix": "eslint src -c .eslintrc.js --fix",
-    "lint:test": "mocha --compilers js:babel-core/register eslint-rules/tests/lib/rules",
     "xcode": "xed ios",
     "build:dev": "tsc --p tsconfig.dev.json",
-    "build:src": "./node_modules/.bin/babel src --out-dir src --config-file ./src/.babelrc.json --extensions '.ts,.tsx' --ignore 'src/index.ts'",
-    "build:lib": "./node_modules/.bin/babel lib --out-dir lib --config-file ./src/.babelrc.json --extensions '.ts,.tsx'",
-    "build:exports": "npm run build:src && npm run build:lib",
-    "build:packages": "node scripts/buildPackages.js",
     "build": "node scripts/build.js",
     "prepush": "npm run build:dev && npm run test",
-    "log": "react-native log-ios | grep 'ethan -'",
     "docs:deploy": "./scripts/deployDocs.sh",
-    "docs:build": "node scripts/build-docs.js",
+    "docs:build": "node scripts/buildDocs.js",
     "snippets:build": "node scripts/generateSnippets.js",
-    "bump:patch": "npm version patch",
     "demo": "./scripts/demo.sh",
-    "release": "node ./scripts/release.js",
-    "bkRelease": "node ./scripts/bkRelease.js"
+    "release": "node ./scripts/release.js"
   },
   "dependencies": {
     "babel-plugin-transform-inline-environment-variables": "^0.0.2",

scripts/bkRelease.js

@@ -1,77 +1,93 @@
+const exec = require('shell-utils').exec;
 const cp = require('child_process');
-const p = require('path');
 const semver = require('semver');
+const _ = require('lodash');
+const p = require('path');
 
-function execSync(cmd) {
-  cp.execSync(cmd, { stdio: ['inherit', 'inherit', 'inherit'] });
-}
+// Workaround JS
 
-function execSyncRead(cmd) {
-  return String(cp.execSync(cmd, { stdio: ['inherit', 'pipe', 'inherit'] })).trim();
+// Export buildkite variables for Release build
+// We cast toString() because function returns 'object'
+const isRelease = process.env.BUILDKITE_MESSAGE.match(/^release$/i);
+let VERSION;
+if (isRelease) {
+  VERSION = cp.execSync(`buildkite-agent meta-data get version`).toString();
 }
 
-function execSyncSilently(cmd) {
-  cp.execSync(cmd, { stdio: ['ignore', 'ignore', 'ignore'] });
+const VERSION_TAG = isRelease ? 'latest' : 'snapshot';
+const VERSION_INC = 'patch';
+function run() {
+  if (!validateEnv()) {
+    return;
+  }
+  setupGit();
+  createNpmRc();
+  versionTagAndPublish();
 }
 
 function validateEnv() {
-  if (!process.env.CI || !process.env.TRAVIS) {
-    throw new Error(`releasing is only available from Travis CI`);
-  }
-
-  if (process.env.TRAVIS_BRANCH !== 'master') {
-    console.error(`not publishing on branch ${process.env.TRAVIS_BRANCH}`);
-    return false;
+  if (!process.env.CI) {
+    throw new Error('releasing is only available from CI');
   }
-
-  if (process.env.TRAVIS_PULL_REQUEST !== 'false') {
-    console.error(`not publishing as triggered by pull request ${process.env.TRAVIS_PULL_REQUEST}`);
-    return false;
-  }
-
   return true;
 }
 
 function setupGit() {
-  execSyncSilently(`git config --global push.default simple`);
-  execSyncSilently(`git config --global user.email "${process.env.GIT_EMAIL}"`);
-  execSyncSilently(`git config --global user.name "${process.env.GIT_USERNAME}"`);
-  const remoteUrl = new RegExp(`https?://(\\S+)`).exec(execSyncRead(`git remote -v`))[1];
-  execSyncSilently(`git remote add deploy "https://${process.env.GIT_USERNAME}:${process.env.GIT_TOKEN}@${remoteUrl}"`);
-  execSync(`git checkout master`);
+  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 calcNewVersion() {
-  const latestVersion = execSyncRead(`npm view ${process.env.npm_package_name}@latest version`);
-  console.log(`latest version is: ${latestVersion}`);
-  console.log(`package version is: ${process.env.npm_package_version}`);
-  if (semver.gt(process.env.npm_package_version, latestVersion)) {
-    return semver.inc(process.env.npm_package_version, 'patch');
-  } else {
-    return semver.inc(latestVersion, 'patch');
-  }
+function createNpmRc() {
+  exec.execSync('rm -f package-lock.json');
+  const npmrcPath = p.resolve(`${__dirname}/.npmrc`);
+  exec.execSync(`cp -rf ${npmrcPath} .`);
 }
 
-function copyNpmRc() {
-  execSync(`rm -f package-lock.json`);
-  const npmrcPath = p.resolve(`${__dirname}/.npmrc`);
-  execSync(`cp -rf ${npmrcPath} .`);
+function versionTagAndPublish() {
+  const currentPublished = findCurrentPublishedVersion();
+  console.log(`current published version: ${currentPublished}`);
+
+  const version = isRelease ? VERSION : `${currentPublished}-snapshot.${process.env.BUILDKITE_BUILD_NUMBER}`;
+  console.log(`Publishing version: ${version}`);
+
+  tryPublishAndTag(version);
 }
 
-function tagAndPublish(newVersion) {
-  console.log(`new version is: ${newVersion}`);
-  execSync(`npm version ${newVersion} -m "v${newVersion} [ci skip]"`);
-  execSync(`npm publish --tag latest`);
-  execSyncSilently(`git push deploy --tags`);
+function findCurrentPublishedVersion() {
+  return exec.execSyncRead(`npm view ${process.env.npm_package_name} dist-tags.latest`);
 }
 
-function run() {
-  if (!validateEnv()) {
-    return;
+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);
+    }
   }
-  setupGit();
-  copyNpmRc();
-  tagAndPublish(calcNewVersion());
+}
+
+
+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}`);
+  if (isRelease) {
+    exec.execSync(`git tag -a ${newVersion} -m "${newVersion}"`);
+  }
+  exec.execSyncSilent(`git push deploy ${newVersion} || true`);
 }
 
 run();