From 67ad59b80eb0167d5827a160eb32a14d301d62da Mon Sep 17 00:00:00 2001 From: Liyas Thomas Date: Tue, 19 May 2020 19:50:27 +0530 Subject: [PATCH] :bug: Fixed #883 --- build.js | 25 +++++++++++-------------- package-lock.json | 12 ++++++------ 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/build.js b/build.js index 293817879..23be963cb 100644 --- a/build.js +++ b/build.js @@ -1,10 +1,7 @@ const axios = require("axios") const fs = require("fs") const { spawnSync } = require("child_process") -const runCommand = (command, args) => - spawnSync(command, args) - .stdout.toString() - .replace(/\n/g, "") +const runCommand = (command, args) => spawnSync(command, args).stdout.toString().replace(/\n/g, "") const FAIL_ON_ERROR = false const PW_BUILD_DATA_DIR = "./.postwoman" @@ -28,7 +25,7 @@ try { await axios .get("https://api.github.com/repos/liyasthomas/postwoman/releases") // If we can't get it from GitHub, we'll resort to getting it from package.json - .catch(ex => ({ + .catch((ex) => ({ data: [ { tag_name: require("./package.json").version, @@ -39,16 +36,16 @@ try { } // Get the current version hash as the short hash from Git. - version.hash = runCommand("git", ["rev-parse", "--short", "HEAD"]) + // version.hash = runCommand("git", ["rev-parse", "--short", "HEAD"]) // Get the 'variant' name as the branch, if it's not master. - version.variant = - process.env.TRAVIS_BRANCH || - runCommand("git", ["branch"]) - .split("* ")[1] - .split(" ")[0] + (IS_DEV_MODE ? " - DEV MODE" : "") - if (["", "master"].includes(version.variant)) { - delete version.variant - } + // version.variant = + // process.env.TRAVIS_BRANCH || + // runCommand("git", ["branch"]) + // .split("* ")[1] + // .split(" ")[0] + (IS_DEV_MODE ? " - DEV MODE" : "") + // if (["", "master"].includes(version.variant)) { + // delete version.variant + // } // Write version data into a file fs.writeFileSync(`${PW_BUILD_DATA_DIR}/version.json`, JSON.stringify(version)) diff --git a/package-lock.json b/package-lock.json index 159b535ba..3e19b6419 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5804,9 +5804,9 @@ "dev": true }, "eventemitter3": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", - "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz", + "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==" }, "events": { "version": "3.1.0", @@ -7636,9 +7636,9 @@ "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=" }, "http-proxy": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz", - "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "requires": { "eventemitter3": "^4.0.0", "follow-redirects": "^1.0.0",