From 99a54d989dabba6f9616eefe5f68b705deccfdac Mon Sep 17 00:00:00 2001 From: Mohsin Ul Haq Date: Mon, 7 Oct 2019 02:09:36 +0530 Subject: [PATCH 1/4] fix firebase get method not returning its promise --- store/firebase.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/store/firebase.js b/store/firebase.js index 5c598bd4..86345443 100644 --- a/store/firebase.js +++ b/store/firebase.js @@ -31,17 +31,19 @@ const set = (repo, values, sha, token) => { const get = (repo, token) => { authenticate(token) const ref = `${token}/${repo}` - database + return database .ref(ref) .limitToLast(1) .once('value') .then(snapshot => { + logout() const object = snapshot.val() if (!object) return [] - const values = Object.values(object)[0] - return values + return Object.values(object)[0] + }) + .catch(() => { + logout() }) - logout() } module.exports = { set, get } From 9f2f66f3716e2a80251ddf7d7b35745da71c9daa Mon Sep 17 00:00:00 2001 From: mohsinulhaq Date: Mon, 7 Oct 2019 03:05:59 +0530 Subject: [PATCH 2/4] fix master filesize read not respecting bundlesize config glob --- package.json | 1 + src/files.js | 2 +- src/reporter.js | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 08ad538a..1d32b04c 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "github-build": "^1.2.0", "glob": "^7.1.4", "gzip-size": "^4.0.0", + "minimatch": "^3.0.4", "prettycli": "^1.4.3" }, "lint-staged": { diff --git a/src/files.js b/src/files.js index 586231fc..f52a05b4 100644 --- a/src/files.js +++ b/src/files.js @@ -18,7 +18,7 @@ config.map(file => { const maxSize = bytes(file.maxSize) || Infinity const compression = file.compression || 'gzip' const size = compressedSize(fs.readFileSync(path, 'utf8'), compression) - files.push({ maxSize, path, size, compression }) + files.push({ maxSize, path, size, compression, globPath: file.path }) }) } }) diff --git a/src/reporter.js b/src/reporter.js index 816c1a3a..62ff0148 100644 --- a/src/reporter.js +++ b/src/reporter.js @@ -1,6 +1,7 @@ const bytes = require('bytes') const { error, warn, info } = require('prettycli') const { event, repo, branch, commit_message, sha } = require('ci-env') +const minimatch = require('minimatch') const build = require('./build') const api = require('./api') const debug = require('./debug') @@ -74,7 +75,7 @@ const getGlobalMessage = ({ const analyse = ({ files, masterValues }) => { return files.map(file => { let fail = false - file.master = masterValues[file.path] + file.master = masterValues[Object.keys(masterValues).find((key) => minimatch(key, file.globPath))] const { path, size, master, maxSize, compression = 'gzip' } = file let compressionText = '(no compression)' From bf104ba160bd57e11a98bbaff99272e5003c0bcb Mon Sep 17 00:00:00 2001 From: mohsinulhaq Date: Mon, 7 Oct 2019 19:30:30 +0530 Subject: [PATCH 3/4] upgrade now.sh node version, use Promise.prototype.finally to trigger logout --- store/firebase.js | 3 +-- store/package.json | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/store/firebase.js b/store/firebase.js index 86345443..db1cae42 100644 --- a/store/firebase.js +++ b/store/firebase.js @@ -36,12 +36,11 @@ const get = (repo, token) => { .limitToLast(1) .once('value') .then(snapshot => { - logout() const object = snapshot.val() if (!object) return [] return Object.values(object)[0] }) - .catch(() => { + .finally(() => { logout() }) } diff --git a/store/package.json b/store/package.json index 51e4c3b2..9cf8b8ad 100644 --- a/store/package.json +++ b/store/package.json @@ -31,5 +31,8 @@ }, "devDependencies": { "pug-lint": "^2.5.0" + }, + "engines": { + "node": "10.x" } } From f390b384b8e6aca0a4dcaaadee33c2b626a79770 Mon Sep 17 00:00:00 2001 From: mohsinulhaq Date: Thu, 2 Jan 2020 12:48:54 +0600 Subject: [PATCH 4/4] upgrade store node.js version --- store/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store/package.json b/store/package.json index 9cf8b8ad..0f611d72 100644 --- a/store/package.json +++ b/store/package.json @@ -33,6 +33,6 @@ "pug-lint": "^2.5.0" }, "engines": { - "node": "10.x" + "node": "12.x" } }