From 0fbfb7ebf6f4ee435eebb520bcb20648c20c753f Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Mon, 5 Jul 2021 16:36:41 +0300 Subject: [PATCH 01/10] Get grenache-grape from github --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a63118c2..3d5be505 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "extract-zip": "^2.0.1", "find-free-port": "^2.0.0", "github-markdown-css": "^4.0.0", - "grenache-grape": "^0.9.8", + "grenache-grape": "git+https://github.com/bitfinexcom/grenache-grape.git", "js-yaml": "^4.0.0", "lodash": "^4.17.15", "new-github-issue-url": "^0.2.1", From 040204d445a0d1d6d46ef4f0607cd8c0c991c19e Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Mon, 5 Jul 2021 17:15:45 +0300 Subject: [PATCH 02/10] Bump standart up to 16.* --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3d5be505..085f4418 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "electron-builder": "22.11.7", "node-gyp": "7.1.2", "node-pre-gyp": "^0.11.0", - "standard": "^14.3.1" + "standard": "^16.0.3" }, "standard": { "globals": [ From 184d004eae3fd0a0fee17af94707244da80cbd55 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Mon, 5 Jul 2021 17:16:24 +0300 Subject: [PATCH 03/10] Fix code style --- src/change-sync-frequency.js | 9 ++++++--- src/error-manager/render-markdown-template.js | 2 +- src/window-creators.js | 14 +++++++------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/change-sync-frequency.js b/src/change-sync-frequency.js index c937c4e5..36a3dbd5 100644 --- a/src/change-sync-frequency.js +++ b/src/change-sync-frequency.js @@ -176,7 +176,8 @@ module.exports = () => { ...alertOptions, text, inputValue: timeFormat.value === timeData.timeFormat - ? timeData.value : 1, + ? timeData.value + : 1, inputAttributes: { min: 1, max: 31, @@ -189,7 +190,8 @@ module.exports = () => { ...alertOptions, text, inputValue: timeFormat.value === timeData.timeFormat - ? timeData.value : 2, + ? timeData.value + : 2, inputAttributes: { min: 1, max: 23, @@ -202,7 +204,8 @@ module.exports = () => { ...alertOptions, text, inputValue: timeFormat.value === timeData.timeFormat - ? timeData.value : 20, + ? timeData.value + : 20, inputAttributes: { min: 10, max: 59, diff --git a/src/error-manager/render-markdown-template.js b/src/error-manager/render-markdown-template.js index b715cebd..9d78f91c 100644 --- a/src/error-manager/render-markdown-template.js +++ b/src/error-manager/render-markdown-template.js @@ -10,7 +10,7 @@ const templateByDefault = fs.readFileSync( path.join(__dirname, 'github-issue-template.md'), 'utf8' ) -const placeholderPattern = new RegExp(/\$\{[a-zA-Z0-9]+\}/, 'g') +const placeholderPattern = /\$\{[a-zA-Z0-9]+\}/g // The GitHub GET endpoint for opening a new issue // has a restriction for maximum length of a URL: 8192 bytes diff --git a/src/window-creators.js b/src/window-creators.js index 992a03b5..07d75f36 100644 --- a/src/window-creators.js +++ b/src/window-creators.js @@ -56,9 +56,9 @@ const _createWindow = async ( manage } = isMainWindow ? windowStateKeeper({ - defaultWidth, - defaultHeight - }) + defaultWidth, + defaultHeight + }) : {} const _props = { autoHideMenuBar: true, @@ -82,10 +82,10 @@ const _createWindow = async ( const startUrl = pathname ? url.format({ - pathname, - protocol: 'file:', - slashes: true - }) + pathname, + protocol: 'file:', + slashes: true + }) : 'app://-' if (!pathname) { From ca60307445bc6cb4cbf96ace1fadb8c32dd08b8b Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Mon, 5 Jul 2021 20:10:10 +0300 Subject: [PATCH 04/10] Disable react preflight check --- scripts/build-ui.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build-ui.sh b/scripts/build-ui.sh index b88b5136..6256216f 100755 --- a/scripts/build-ui.sh +++ b/scripts/build-ui.sh @@ -3,6 +3,7 @@ set -x export CI_ENVIRONMENT_NAME=production +export SKIP_PREFLIGHT_CHECK=true ROOT="$PWD" frontendFolder="$ROOT/bfx-report-ui" From aa6e06e4a208da4fbe4c20de4e098dccfbce5d0b Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Tue, 6 Jul 2021 11:49:45 +0300 Subject: [PATCH 05/10] Fix app update config for dev mode --- src/helpers/get-debug-info.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/helpers/get-debug-info.js b/src/helpers/get-debug-info.js index aa941ec7..6b0cd2f7 100644 --- a/src/helpers/get-debug-info.js +++ b/src/helpers/get-debug-info.js @@ -9,11 +9,18 @@ const productName = 'Bitfinex Report' const { getAppUpdateConfigSync } = require('../auto-updater') -const appUpdateConfig = getAppUpdateConfigSync() const packageJson = require(path.join(appDir, 'package.json')) let lastCommit = { hash: '-', date: '-' } +let appUpdateConfig = {} +try { + appUpdateConfig = getAppUpdateConfigSync() +} catch (err) { + console.debug(err) + + appUpdateConfig = packageJson.build.publish +} try { lastCommit = require(path.join(appDir, 'lastCommit.json')) } catch (err) { From 54f646edcf1a1bfc2be4e8e349f682e8c40c6de3 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Tue, 6 Jul 2021 12:04:16 +0300 Subject: [PATCH 06/10] Fix ui build for dev mode --- docker-compose.yaml | 4 ++++ scripts/build-ui.sh | 7 ++++++- scripts/init.sh | 8 +++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index c282fc13..2242e863 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -8,6 +8,7 @@ services: dockerfile: Dockerfile.ui-builder environment: BRANCH: ${BRANCH} + UI_BUILD_FOLDER: /ui-build volumes: - ui-build:/ui-build @@ -20,6 +21,7 @@ services: ELECTRON_CACHE: /root/.cache/electron ELECTRON_BUILDER_CACHE: /root/.cache/electron-builder BRANCH: ${BRANCH} + UI_BUILD_FOLDER: /ui-build volumes: - ui-build:/ui-build - ./dist:/dist @@ -35,6 +37,7 @@ services: ELECTRON_CACHE: /root/.cache/electron ELECTRON_BUILDER_CACHE: /root/.cache/electron-builder BRANCH: ${BRANCH} + UI_BUILD_FOLDER: /ui-build volumes: - ui-build:/ui-build - ./dist:/dist @@ -50,6 +53,7 @@ services: ELECTRON_CACHE: /root/.cache/electron ELECTRON_BUILDER_CACHE: /root/.cache/electron-builder BRANCH: ${BRANCH} + UI_BUILD_FOLDER: /ui-build volumes: - ui-build:/ui-build - ./dist:/dist diff --git a/scripts/build-ui.sh b/scripts/build-ui.sh index 6256216f..7abff118 100755 --- a/scripts/build-ui.sh +++ b/scripts/build-ui.sh @@ -9,7 +9,7 @@ ROOT="$PWD" frontendFolder="$ROOT/bfx-report-ui" pathToTriggerElectronLoad="$frontendFolder/src/utils/triggerElectronLoad.js" pathToFonts="$frontendFolder/src/styles/fonts" -uiBuildFolder=/ui-build +uiBuildFolder="$frontendFolder/build" uiReadyFile="$uiBuildFolder/READY" branch=master @@ -23,7 +23,12 @@ if [ "$BRANCH" != "" ] then branch=$BRANCH fi +if [ "$UI_BUILD_FOLDER" != "" ] +then + uiBuildFolder=$UI_BUILD_FOLDER +fi +mkdir $uiBuildFolder 2>/dev/null rm -rf $uiBuildFolder/* function usage { diff --git a/scripts/init.sh b/scripts/init.sh index 06cbafe5..e2050b98 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -62,7 +62,13 @@ expressFolder="$frontendFolder/bfx-report-express" backendFolder="$ROOT/bfx-reports-framework" linuxLauncherFolder="$ROOT/build/linux-launcher" -uiBuildFolder=/ui-build + +uiBuildFolder="$frontendFolder/build" +if [ "$UI_BUILD_FOLDER" != "" ] +then + uiBuildFolder=$UI_BUILD_FOLDER +fi +mkdir $uiBuildFolder 2>/dev/null uiReadyFile="$uiBuildFolder/READY" mkdir $ROOT/dist 2>/dev/null From 9c7c0a967cef02cfd50b69638ff26f692daf5981 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Tue, 6 Jul 2021 15:41:36 +0300 Subject: [PATCH 07/10] Fix setting bfx staging url for dev mode --- scripts/init.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/init.sh b/scripts/init.sh index e2050b98..90963acb 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -7,6 +7,7 @@ branch=master dbDriver=better-sqlite lastCommitFileName=lastCommit.json isZipReleaseFile="isZipRelease" +bfxStagingUrl="https://api.staging.bitfinex.com" source $ROOT/scripts/get-conf-value.sh source $ROOT/scripts/escape-string.sh @@ -110,8 +111,9 @@ sed -i -e \ $backendFolder/config/service.report.json if [ $isDevEnv != 0 ]; then + escapedBfxStagingUrl=$(escapeString $bfxStagingUrl) sed -i -e \ - "s/\"restUrl\": \".*\"/\"restUrl\": \"https:\/\/test.bitfinex.com\"/g" \ + "s/\"restUrl\": \".*\"/\"restUrl\": \"$escapedBfxStagingUrl\"/g" \ $backendFolder/config/service.report.json fi From 4409a9d3d5b19e5487e7bcfdc49c2c38f144b150 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Tue, 6 Jul 2021 15:57:09 +0300 Subject: [PATCH 08/10] Fix eslint config for dev mode --- scripts/build-ui.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build-ui.sh b/scripts/build-ui.sh index 7abff118..b0901997 100755 --- a/scripts/build-ui.sh +++ b/scripts/build-ui.sh @@ -95,10 +95,10 @@ sed -i -e \ "s/showFrameworkMode: false/showFrameworkMode: true/g" \ $frontendFolder/src/config.js -rm -f "$ROOT/.eslintrc" - +mv -f "$ROOT/.eslintrc" "$ROOT/eslint-conf-disabled-for-ui" npm i --no-audit npm run build +mv -f "$ROOT/eslint-conf-disabled-for-ui" "$ROOT/.eslintrc" if ! [ -s "$frontendFolder/build/index.html" ]; then exit 1 From 12e721b2655bc25c704edd8079419f7a5c70b2b5 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Tue, 6 Jul 2021 16:18:29 +0300 Subject: [PATCH 09/10] Fix ui ready state --- scripts/build-ui.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-ui.sh b/scripts/build-ui.sh index b0901997..77520f16 100755 --- a/scripts/build-ui.sh +++ b/scripts/build-ui.sh @@ -10,7 +10,6 @@ frontendFolder="$ROOT/bfx-report-ui" pathToTriggerElectronLoad="$frontendFolder/src/utils/triggerElectronLoad.js" pathToFonts="$frontendFolder/src/styles/fonts" uiBuildFolder="$frontendFolder/build" -uiReadyFile="$uiBuildFolder/READY" branch=master source $ROOT/scripts/update-submodules.sh @@ -29,6 +28,7 @@ then fi mkdir $uiBuildFolder 2>/dev/null +uiReadyFile="$uiBuildFolder/READY" rm -rf $uiBuildFolder/* function usage { From 07cbc608765218f2137f1078fdf4ee9950856baf Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Tue, 6 Jul 2021 16:18:48 +0300 Subject: [PATCH 10/10] Bump electron up to 13.1.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 085f4418..7fda3dfd 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "app-builder-bin": "^3.5.13", - "electron": "13.1.2", + "electron": "13.1.6", "electron-builder": "22.11.7", "node-gyp": "7.1.2", "node-pre-gyp": "^0.11.0",